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

Commit 7a0ec3f2 authored by Tony Wickham's avatar Tony Wickham Committed by Android (Google) Code Review
Browse files

Merge "Add dark widgets theme" into ub-launcher3-dorval-polish

parents 3ed30765 093c3ac7

res/layout/widgets_bottom_sheet.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
    android:paddingTop="28dp"

    android:background="?android:attr/colorPrimary"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:layout_gravity="bottom">

    android:layout_gravity="bottom"

    android:theme="?attr/widgetsTheme">



    <TextView

        style="@style/TextTitle"

res/layout/widgets_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:layout_height="match_parent"

    android:descendantFocusability="afterDescendants"

    launcher:revealBackground="@drawable/round_rect_primary"

    android:theme="@style/WidgetContainerTheme">

    android:theme="?attr/widgetsTheme">



    <View

        android:id="@+id/reveal_view"

res/values-v26/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ 
    <style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">

        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>

    </style>

    <style name="WidgetContainerTheme.Dark" parent="LauncherThemeDark">

        <item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>

        <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">

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
    <attr name="workspaceAmbientShadowColor" format="color"/>

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

    <attr name="workspaceStatusBarScrim" format="reference" />

    <attr name="widgetsTheme" format="reference" />



    <!-- BubbleTextView specific attributes. -->

    <declare-styleable name="BubbleTextView">

res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
        <item name="workspaceAmbientShadowColor">#33000000</item>

        <item name="workspaceKeyShadowColor">#44000000</item>

        <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>

        <item name="widgetsTheme">@style/WidgetContainerTheme</item>

    </style>



    <style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"></style>
@@ -64,6 +65,7 @@ 
        <item name="popupColorPrimary">?android:attr/colorPrimary</item>

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

        <item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->

        <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>

        <item name="isMainColorDark">true</item>

    </style>
@@ -85,6 +87,8 @@ 
        <item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>

    </style>



    <style name="WidgetContainerTheme.Dark" />



    <style name="FastScrollerPopup" >

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

        <item name="android:minWidth">@dimen/fastscroll_popup_width</item>