Merge "Add a common TvWindowMenuActionButton" (723ce143) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/res/animator/tv_pip_menu_action_button_animator.xml→libs/WindowManager/Shell/res/animator/tv_window_menu_action_button_animator.xml

+0 −0

File moved.

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,5 +15,5 @@
		~ limitations under the License.
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:color="@color/tv_pip_menu_icon_unfocused" />
		<item android:color="@color/tv_window_menu_icon_unfocused" />
		</selector>
		No newline at end of file

+3 −3

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2021 The Android Open Source Project
		~ 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.
		@@ -16,6 +16,6 @@
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_focused="true"
		android:color="@color/tv_pip_menu_icon_bg_focused" />
		<item android:color="@color/tv_pip_menu_icon_bg_unfocused" />
		android:color="@color/tv_window_menu_close_icon_bg_focused" />
		<item android:color="@color/tv_window_menu_close_icon_bg_unfocused" />
		</selector>
		No newline at end of file

+4 −4

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2021 The Android Open Source Project
		~ 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.
		@@ -16,8 +16,8 @@
		-->
		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item android:state_focused="true"
		android:color="@color/tv_pip_menu_icon_focused" />
		android:color="@color/tv_window_menu_icon_focused" />
		<item android:state_enabled="false"
		android:color="@color/tv_pip_menu_icon_disabled" />
		<item android:color="@color/tv_pip_menu_icon_unfocused" />
		android:color="@color/tv_window_menu_icon_disabled" />
		<item android:color="@color/tv_window_menu_icon_unfocused" />
		</selector>
		No newline at end of file

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@
		-->
		<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" />
		android:color="@color/tv_window_menu_icon_bg_focused" />
		<item android:color="@color/tv_window_menu_icon_bg_unfocused" />
		</selector>
		No newline at end of file