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

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

Merge "Add support for popup dark theme" into ub-launcher3-dorval-polish

parents 9be3585f 90038eba

res/layout/deep_shortcut.xml

+3 −2
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_height="@dimen/bg_popup_item_height" >

    android:layout_height="@dimen/bg_popup_item_height"

    android:theme="@style/PopupItem" >



    <com.android.launcher3.shortcuts.DeepShortcutTextView

        style="@style/BaseIcon"
@@ -50,6 +51,6 @@ 
        android:layout_height="@dimen/popup_item_divider_height"

        android:layout_gravity="end|bottom"

        android:visibility="gone"

        android:background="?android:attr/listDivider" />

        android:background="?attr/popupColorTertiary" />



</com.android.launcher3.shortcuts.DeepShortcutView>

res/layout/horizontal_divider.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ 
<View xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/popup_item_divider_height"

    android:background="?android:attr/listDivider"/>
 
 No newline at end of file
 
    android:background="?attr/popupColorTertiary" />
 
 No newline at end of file

res/layout/notification.xml

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    android:id="@+id/notification_view"

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_height="wrap_content"

    android:theme="@style/PopupItem"

    android:elevation="@dimen/deep_shortcuts_elevation">



    <RelativeLayout
@@ -33,7 +34,7 @@ 
            android:layout_height="@dimen/notification_header_height"

            android:paddingStart="@dimen/notification_padding_start"

            android:paddingEnd="@dimen/notification_padding_end"

            android:background="@color/popup_background_color"

            android:background="?attr/popupColorPrimary"

            android:elevation="@dimen/notification_elevation">

            <TextView

                android:id="@+id/notification_text"
@@ -65,7 +66,7 @@ 
            android:id="@+id/divider"

            android:layout_width="match_parent"

            android:layout_height="@dimen/popup_item_divider_height"

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

            android:background="?attr/popupColorTertiary"

            android:layout_below="@id/main_view"

            android:visibility="gone" />

res/layout/notification_footer.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:elevation="@dimen/notification_elevation"

    android:clipChildren="false"

    android:layout_gravity="center_vertical"

    android:background="@color/popup_background_color">

    android:background="?attr/popupColorPrimary">



    <LinearLayout

        android:id="@+id/icon_row"

res/layout/notification_main.xml

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

        android:orientation="vertical"

        android:gravity="center_vertical"

        android:background="@color/popup_background_color"

        android:background="?attr/popupColorPrimary"

        android:paddingStart="@dimen/notification_padding_start"

        android:paddingEnd="@dimen/notification_main_text_padding_end">

        <TextView