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

Commit 867454e7 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Update notification blocking ui theming" into sc-dev am: d6f7eb33 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15030176

Change-Id: I697136cd98235f07762f08e4ff2afa7e1521bb1c
parents 36336e0d d6f7eb33

packages/SystemUI/res/drawable/rounded_bg_full.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android"

       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

       android:shape="rectangle">

    <solid android:color="?android:attr/colorBackgroundFloating" />

    <solid android:color="?androidprv:attr/colorSurface" />

    <corners

        android:bottomLeftRadius="?android:attr/dialogCornerRadius"

        android:topLeftRadius="?android:attr/dialogCornerRadius"

packages/SystemUI/res/layout/notif_half_shelf.xml

+7 −10
Original line number Diff line number Diff line
@@ -64,10 +64,12 @@ 
                    android:layout_gravity="center"

                    android:padding="8dp"

                    android:gravity="center_vertical|start"

                    android:textSize="15sp"

                    android:ellipsize="end"

                    android:maxLines="1"

                    style="@style/TextAppearance.NotificationImportanceChannel" />

                    android:maxLines="2"

                    android:textColor="?android:attr/textColorPrimary"

                    android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

                    android:textSize="16sp"

                />



                <Switch

                    android:id="@+id/toggle"
@@ -80,18 +82,13 @@ 
            <View

                android:layout_width="match_parent"

                android:layout_height="1dp"

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

                android:background="@*android:color/background_device_default_light"

            />



            <!-- ChannelRows get added dynamically -->



        </com.android.systemui.statusbar.notification.row.ChannelEditorListView>

        <!-- divider view -->

        <View

            android:layout_width="match_parent"

            android:layout_height="1dp"

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

        />



        <RelativeLayout

            android:id="@+id/bottom_actions"

            android:layout_width="match_parent"

packages/SystemUI/res/layout/notif_half_shelf_row.xml

+64 −49
Original line number Diff line number Diff line
@@ -21,8 +21,14 @@ 
    android:layout_height="wrap_content"

    android:padding="8dp"

    android:clickable="true"

    android:orientation="horizontal"

    android:foreground="?android:attr/selectableItemBackground" >

    android:orientation="vertical"

    android:foreground="?android:attr/selectableItemBackground"

    >



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal">



        <!-- This is where an icon would go *if we wanted one* **wink** -->

        <Space
@@ -50,10 +56,11 @@ 
                android:paddingStart="8dp"

                android:paddingEnd="8dp"

                android:gravity="center_vertical|start"

            android:textSize="14sp"

                android:ellipsize="end"

                android:maxLines="1"

            style="@style/TextAppearance.NotificationImportanceChannel"

                android:fontFamily="@*android:string/config_headlineFontFamily"

                android:textColor="?android:attr/textColorPrimary"

                android:textSize="16sp"

            />



            <TextView
@@ -63,11 +70,12 @@ 
                android:paddingStart="8dp"

                android:paddingEnd="8dp"

                android:gravity="center_vertical|start"

            android:textSize="14sp"

                android:ellipsize="end"

                android:maxLines="1"

                android:layout_below="@id/channel_name"

            style="@style/TextAppearance.NotificationImportanceApp"

                android:fontFamily="@*android:string/config_bodyFontFamily"

                android:textColor="?android:attr/textColorSecondary"

                android:textSize="14sp"

            />

        </RelativeLayout>
@@ -78,4 +86,11 @@ 
            android:layout_gravity="center_vertical"

            android:padding="8dp"

        />

    </LinearLayout>

    <!-- divider view -->

    <View

        android:layout_width="match_parent"

        android:layout_height=".5dp"

        android:background="@*android:color/background_device_default_light"

    />

</com.android.systemui.statusbar.notification.row.ChannelRow>