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

Commit 81a70e5d authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Adding scrim in all-apps scrim 

Bug: 64692527
Change-Id: Ib8262ad0cc3c95cd419eb9fa1dee3bbbc2d25a27
parent 9b745a82

res/layout/all_apps.xml

+2 −3
Original line number Diff line number Diff line
@@ -68,11 +68,10 @@ 


    </com.android.launcher3.allapps.AllAppsRecyclerViewContainerView>

    <View

        style="@style/AllAppsNavBarProtection"

        android:id="@+id/nav_bar_bg"

        android:background="?attr/allAppsNavBarScrimColor"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_gravity="bottom"

        android:focusable="false"

        android:visibility="invisible" />

        android:focusable="false"  />

</com.android.launcher3.allapps.AllAppsContainerView>
 
 No newline at end of file

res/values-v26/styles.xml

+0 −6
Original line number Diff line number Diff line
@@ -26,10 +26,4 @@ 
        <item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->

    </style>



    <!-- From O and above, we show a dark nav bar in all-apps -->

    <style name="AllAppsNavBarProtection">

        <item name="android:alpha">0.6</item>

        <item name="android:background">?android:attr/colorPrimary</item>

    </style>



</resources>

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


    <!-- Attributes used for launcher theme -->

    <attr name="allAppsScrimColor" format="color" />

    <attr name="allAppsNavBarScrimColor" format="color" />

    <attr name="popupColorPrimary" format="color" />

    <attr name="popupColorSecondary" format="color" />

    <attr name="popupColorTertiary" format="color" />

res/values/styles.xml

+2 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


    <style name="BaseLauncherThemeWithCustomAttrs" parent="@style/BaseLauncherTheme">

        <item name="allAppsScrimColor">#CCFFFFFF</item>

        <item name="allAppsNavBarScrimColor">#66FFFFFF</item>

        <item name="popupColorPrimary">#FFF</item>

        <item name="popupColorSecondary">#F5F5F5</item> <!-- Gray 100 -->

        <item name="popupColorTertiary">#E0E0E0</item> <!-- Gray 300 -->
@@ -62,6 +63,7 @@ 
        <item name="android:colorControlHighlight">#A0FFFFFF</item>

        <item name="android:colorPrimary">#FF333333</item>

        <item name="allAppsScrimColor">#7A000000</item>

        <item name="allAppsNavBarScrimColor">#80000000</item>

        <item name="popupColorPrimary">?android:attr/colorPrimary</item>

        <item name="popupColorSecondary">#424242</item> <!-- Gray 800 -->

        <item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->
@@ -103,12 +105,6 @@ 
        <item name="android:includeFontPadding">false</item>

    </style>



    <!-- Style for nav bar background in all-apps screen -->

    <style name="AllAppsNavBarProtection">

        <item name="android:alpha">?android:attr/spotShadowAlpha</item>

        <item name="android:background">@color/default_shadow_color_no_alpha</item>

    </style>



    <!-- Base theme for BubbleTextView and sub classes -->

    <style name="BaseIcon">

        <item name="android:layout_width">match_parent</item>

src/com/android/launcher3/allapps/AllAppsContainerView.java

+0 −2
Original line number Diff line number Diff line
@@ -349,8 +349,6 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc 
            ViewGroup.LayoutParams navBarBgLp = navBarBg.getLayoutParams();

            navBarBgLp.height = insets.bottom;

            navBarBg.setLayoutParams(navBarBgLp);

            navBarBg.setVisibility(FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS

                    ? View.INVISIBLE : View.VISIBLE);

        }

    }