Change inactive button to surfaceBright and headerProtection to scHighest on LT and scLow on DT
bug:294291021
bug:275087095
flag: n/a
test: Manual photos:
before: https://screenshot.googleplex.com/5sDvwGUebY3BtLo
before: https://screenshot.googleplex.com/BSmjETXYbBqXXxG
after: https://screenshot.googleplex.com/8nGCqHEuxQKKpiQ
after: https://screenshot.googleplex.com/AWALHXZAsuLq8b6
Change-Id: I2dd8eff2c56618a143c10fa4e7533265dde3f0b8
diff --git a/res/drawable/all_apps_tabs_background.xml b/res/drawable/all_apps_tabs_background.xml
index 8471cd4..1e7cff2 100644
--- a/res/drawable/all_apps_tabs_background.xml
+++ b/res/drawable/all_apps_tabs_background.xml
@@ -30,7 +30,7 @@
android:state_selected="false">
<shape android:shape="rectangle">
<corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
- <solid android:color="@color/all_apps_tabs_background" />
+ <solid android:color="@color/material_color_surface_bright" />
</shape>
</item>
@@ -39,7 +39,7 @@
android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="@dimen/all_apps_header_pill_corner_radius" />
- <solid android:color="@color/all_apps_tab_background_selected" />
+ <solid android:color="@color/material_color_primary" />
</shape>
</item>
</selector>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3a723eb..de29a95 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,7 +32,8 @@
<style name="LauncherTheme" parent="@style/BaseLauncherTheme">
<item name="android:textColorSecondary">#DE000000</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
- <item name="allappsHeaderProtectionColor">@color/popup_color_tertiary_light</item>
+ <item name="allappsHeaderProtectionColor">
+ @color/material_color_surface_container_highest</item>
<item name="allAppsNavBarScrimColor">#66FFFFFF</item>
<item name="allAppsSearchTextColor">@color/widget_picker_search_text_color_light</item>
<item name="popupColorPrimary">@color/popup_color_primary_light</item>
@@ -152,6 +153,7 @@
<item name="android:colorControlHighlight">#19FFFFFF</item>
<item name="android:colorPrimary">#FF212121</item>
<item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
+ <item name="allappsHeaderProtectionColor">@color/material_color_surface_container_low</item>
<item name="allAppsNavBarScrimColor">#80000000</item>
<item name="allAppsSearchTextColor">@color/widget_picker_search_text_color_dark</item>
<item name="popupColorPrimary">@color/popup_color_primary_dark</item>