Merge "Implement custom PiP close action on TV." into tm-dev am: 3c5b9738c7 (d2a5274d) · Commits · e / os / android_frameworks_base

core/java/android/view/IPinnedTaskListener.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ oneway interface IPinnedTaskListener {
		* Called when the set of actions for the current PiP activity changes, or when the listener
		* is first registered to allow the listener to synchronize its state with the controller.
		*/
		void onActionsChanged(in ParceledListSlice<RemoteAction> actions);
		void onActionsChanged(in ParceledListSlice<RemoteAction> actions, in RemoteAction closeAction);

		/**
		* Called by the window manager to notify the listener that Activity (was or is in pinned mode)

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2022 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="@color/tv_pip_menu_icon_unfocused" />
		</selector>
		No newline at end of file

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2022 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_focused="true"
		android:color="@color/tv_pip_menu_close_icon_bg_focused" />
		<item android:color="@color/tv_pip_menu_close_icon_bg_unfocused" />
		</selector>
		No newline at end of file

+4 −0

Original line number	Diff line number	Diff line
		@@ -39,4 +39,8 @@

		<!-- Duration (in milliseconds) the PiP stays stashed before automatically unstashing. -->
		<integer name="config_pipStashDuration">5000</integer>

		<!-- Time (duration in milliseconds) that the shell waits for an app to close the PiP by itself
		if a custom action is present before closing it. -->
		<integer name="config_pipForceCloseDelay">5000</integer>
		</resources>

+3 −1

Original line number	Diff line number	Diff line
		@@ -16,8 +16,10 @@
		-->
		<resources>
		<color name="tv_pip_menu_icon_focused">#0E0E0F</color>
		<color name="tv_pip_menu_icon_unfocused">#E8EAED</color>
		<color name="tv_pip_menu_icon_unfocused">#F8F9FA</color>
		<color name="tv_pip_menu_icon_disabled">#80868B</color>
		<color name="tv_pip_menu_close_icon_bg_focused">#D93025</color>
		<color name="tv_pip_menu_close_icon_bg_unfocused">#D69F261F</color>
		<color name="tv_pip_menu_icon_bg_focused">#E8EAED</color>
		<color name="tv_pip_menu_icon_bg_unfocused">#990E0E0F</color>
		<color name="tv_pip_menu_focus_border">#E8EAED</color>