Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d331f1 authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Automerger Merge Worker
Browse files

Merge "Change inactive button to surfaceBright and headerProtection to... 

Merge "Change inactive button to surfaceBright and headerProtection to scHighest on LT and scLow on DT" into udc-qpr-dev am: 7f347e93

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24472448



Change-Id: I97aafcf82e9641c2c85f57851f3cd6815e27c830
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9c4592c 7f347e93

res/drawable/all_apps_tabs_background.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/values/styles.xml

+3 −1
Original line number Diff line number Diff line
@@ -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="popupColorPrimary">@color/popup_color_primary_light</item>

        <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
@@ -149,6 +150,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="popupColorPrimary">@color/popup_color_primary_dark</item>

        <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>