Initial unified commit for Android 12, syncing up to v400.a
This commit is contained in:
@@ -0,0 +1,93 @@
|
||||
From deccbf542c72d5e1f78e83b3e895eb1f9480ac75 Mon Sep 17 00:00:00 2001
|
||||
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
|
||||
Date: Thu, 28 Oct 2021 02:30:59 +0000
|
||||
Subject: [PATCH] Trebuchet: Make overview scrim transparent again
|
||||
|
||||
Also revert texts/buttons to workspace color
|
||||
|
||||
Change-Id: I78c84865eb06b8e59c9c271cd2e267ae4cd7cc08
|
||||
---
|
||||
quickstep/res/values/styles.xml | 4 ++--
|
||||
quickstep/src/com/android/quickstep/views/RecentsView.java | 2 +-
|
||||
res/color-v31/overview_scrim.xml | 2 +-
|
||||
res/color-v31/overview_scrim_dark.xml | 2 +-
|
||||
res/color/overview_button.xml | 6 +++---
|
||||
5 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
|
||||
index 07c448df9e..c3a3bb8375 100644
|
||||
--- a/quickstep/res/values/styles.xml
|
||||
+++ b/quickstep/res/values/styles.xml
|
||||
@@ -130,7 +130,7 @@
|
||||
parent="@android:style/Widget.DeviceDefault.Button.Borderless">
|
||||
<item name="android:textColor">@color/overview_button</item>
|
||||
<item name="android:drawableTint">@color/overview_button</item>
|
||||
- <item name="android:tint">?android:attr/textColorPrimary</item>
|
||||
+ <item name="android:tint">?attr/workspaceTextColor</item>
|
||||
<item name="android:drawablePadding">8dp</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
</style>
|
||||
@@ -139,4 +139,4 @@
|
||||
<style name="BaseIcon.Workspace.Taskbar" >
|
||||
<item name="iconDisplay">taskbar</item>
|
||||
</style>
|
||||
-</resources>
|
||||
\ No newline at end of file
|
||||
+</resources>
|
||||
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
|
||||
index b447166d6e..d94a93a909 100644
|
||||
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
|
||||
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
|
||||
@@ -606,7 +606,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
|
||||
mEmptyIcon.setCallback(this);
|
||||
mEmptyMessage = context.getText(R.string.recents_empty_message);
|
||||
mEmptyMessagePaint = new TextPaint();
|
||||
- mEmptyMessagePaint.setColor(Themes.getAttrColor(context, android.R.attr.textColorPrimary));
|
||||
+ mEmptyMessagePaint.setColor(Themes.getAttrColor(context, R.attr.workspaceTextColor));
|
||||
mEmptyMessagePaint.setTextSize(getResources()
|
||||
.getDimension(R.dimen.recents_empty_message_text_size));
|
||||
mEmptyMessagePaint.setTypeface(Typeface.create(Themes.getDefaultBodyFont(context),
|
||||
diff --git a/res/color-v31/overview_scrim.xml b/res/color-v31/overview_scrim.xml
|
||||
index 80799957ff..894997c59a 100644
|
||||
--- a/res/color-v31/overview_scrim.xml
|
||||
+++ b/res/color-v31/overview_scrim.xml
|
||||
@@ -14,5 +14,5 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
- <item android:color="@android:color/system_neutral2_500" android:lStar="87" />
|
||||
+ <item android:color="@android:color/transparent" />
|
||||
</selector>
|
||||
diff --git a/res/color-v31/overview_scrim_dark.xml b/res/color-v31/overview_scrim_dark.xml
|
||||
index b8ed7747e0..894997c59a 100644
|
||||
--- a/res/color-v31/overview_scrim_dark.xml
|
||||
+++ b/res/color-v31/overview_scrim_dark.xml
|
||||
@@ -14,5 +14,5 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
- <item android:color="@android:color/system_neutral1_800" />
|
||||
+ <item android:color="@android:color/transparent" />
|
||||
</selector>
|
||||
diff --git a/res/color/overview_button.xml b/res/color/overview_button.xml
|
||||
index aa48b78604..e638ac2d4a 100644
|
||||
--- a/res/color/overview_button.xml
|
||||
+++ b/res/color/overview_button.xml
|
||||
@@ -2,10 +2,10 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:alpha="1"
|
||||
- android:color="?android:attr/textColorPrimary"
|
||||
+ android:color="?attr/workspaceTextColor"
|
||||
android:state_enabled="true" />
|
||||
<item
|
||||
android:alpha="?android:disabledAlpha"
|
||||
- android:color="?android:attr/textColorPrimary"
|
||||
+ android:color="?attr/workspaceTextColor"
|
||||
android:state_enabled="false" />
|
||||
-</selector>
|
||||
\ No newline at end of file
|
||||
+</selector>
|
||||
--
|
||||
2.25.1
|
||||
|
||||
Reference in New Issue
Block a user