| commit e6ed5e38f3c5b9bc53ba4560c37f081ee8fad25c
|
| Author: John Galt <johngaltfirstrun@gmail.com>
|
| Date: Sat Dec 6 08:48:09 2025 -0500
|
|
|
| Revert "All Apps: make header protection transparent"
|
|
|
| This reverts commit c7baff986d064cc633404186f792e5c95f0509e6.
|
|
|
| diff --git a/res/values/styles.xml b/res/values/styles.xml
|
| index 3896c21c55..9183a9c142 100644
|
| --- a/res/values/styles.xml
|
| +++ b/res/values/styles.xml
|
| @@ -40,8 +40,8 @@
|
| <style name="LauncherTheme" parent="@style/DynamicColorsBaseLauncherTheme">
|
| <item name="android:textColorSecondary">@*android:color/system_neutral2_800</item>
|
| <item name="groupHighlight">@color/materialColorSurfaceContainerHigh</item>
|
| - <item name="allAppsScrimColor">@*android:color/system_neutral1_50</item>
|
| - <item name="allappsHeaderProtectionColor">@*android:color/transparent</item>
|
| + <item name="allAppsScrimColor">@color/materialColorSurfaceDim</item>
|
| + <item name="allappsHeaderProtectionColor">@color/materialColorSurfaceContainerHighest</item>
|
| <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
|
| <item name="allAppsSurfaceLow">@color/materialColorSurfaceContainerLow</item>
|
| <item name="allAppsSurfaceHighest">@color/materialColorSurfaceContainerHighest</item>
|
| @@ -124,8 +124,8 @@
|
| <item name="android:textColorHint">#A0FFFFFF</item>
|
| <item name="android:colorControlHighlight">#19FFFFFF</item>
|
| <item name="android:colorPrimary">#FF212121</item>
|
| - <item name="allAppsScrimColor">@*android:color/system_neutral1_900</item>
|
| - <item name="allappsHeaderProtectionColor">@*android:color/transparent</item>
|
| + <item name="allAppsScrimColor">@color/materialColorSurfaceDim</item>
|
| + <item name="allappsHeaderProtectionColor">@color/materialColorSurfaceContainerLow</item>
|
| <item name="allAppsNavBarScrimColor">#80000000</item>
|
| <item name="popupColorPrimary">@color/popup_color_primary_dark</item>
|
| <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
|
| diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
|
| index 6e6e778531..9dab482923 100644
|
| --- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
|
| +++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
|
| @@ -826,7 +826,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
| : (int) (Utilities.boundToRange(
|
| (scrolledOffset + mHeader.mSnappedScrolledY) / mHeaderThreshold, 0f, 1f)
|
| * 255);
|
| - if (mTabsProtectionAlpha != tabsAlpha) {
|
| + if (headerColor != mHeaderColor || mTabsProtectionAlpha != tabsAlpha) {
|
| + mHeaderColor = headerColor;
|
| mTabsProtectionAlpha = tabsAlpha;
|
| invalidateHeader();
|
| }
|