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

Commit a12666a3 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Restyle notif history to beter match shade" into sc-dev

parents 0ba20b96 9a238e51

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ 
        <activity

            android:name=".notification.history.NotificationHistoryActivity"

            android:exported="true"

            android:theme="@style/Theme.SubSettings"

            android:theme="@android:style/Theme.DeviceDefault.DayNight"

            android:label="@string/notification_history_title">

            <intent-filter android:priority="1">

                <action android:name="android.settings.NOTIFICATION_HISTORY" />

res/drawable/rounded_bg.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 
     limitations under the License.

-->

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

res/layout/notification_history.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<androidx.core.widget.NestedScrollView

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

    android:id="@+id/scroll"

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

res/layout/notification_history_app_layout.xml

+15 −13
Original line number Diff line number Diff line
@@ -24,23 +24,26 @@ 
        android:id="@+id/app_header"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:clipChildren="true"

        android:background="@drawable/button_ripple_radius"

        android:paddingTop="12dp"

        android:paddingTop="24dp"

        android:orientation="horizontal"

        android:paddingBottom="12dp"

        android:paddingBottom="22dp"

        android:paddingStart="16dp">

        <ImageView

            android:id="@+id/icon"

            android:layout_height="24dp"

            android:layout_width="24dp"

            android:layout_marginTop="12dp"

            android:layout_marginEnd="14dp"

            android:layout_gravity="center_vertical|start"

            android:scaleType="centerInside"/>



        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="32dp"

            android:id="@+id/text"

            android:layout_toEndOf="@+id/icon"

            android:orientation="vertical">

            <TextView

                android:id="@+id/label"
@@ -54,18 +57,17 @@ 
                android:layout_width="wrap_content"

                android:layout_gravity="start|center_vertical"

                android:textDirection="locale"

                android:paddingTop="8dp"

                android:paddingTop="4dp"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>

        </LinearLayout>

        <ImageView

            android:id="@+id/expand"



        <include layout="@*android:layout/notification_expand_button"

                 android:layout_width="wrap_content"

                 android:layout_height="wrap_content"

                 android:layout_alignParentEnd="true"

                 android:layout_centerVertical="true"

            android:layout_height="48dp"

            android:layout_width="48dp"

            android:scaleType="center"

            android:contentDescription="@null"

            android:src="@*android:drawable/ic_expand_more"/>

        />



    </RelativeLayout>



    <View

res/layout/notification_history_log_row.xml

+8 −7
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
    android:paddingTop="16dp"

    android:paddingBottom="16dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingEnd="16dp"

    android:orientation="vertical"

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

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



    <LinearLayout
@@ -40,7 +39,7 @@ 
            android:layout_marginStart="32dp"

            android:ellipsize="end"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.NotificationHistory.Title"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"

            android:layout_toStartOf="@id/alerted_icon"

            android:textAlignment="viewStart"/>
@@ -66,7 +65,8 @@ 
            android:layout_centerVertical="true"

            android:ellipsize="end"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.NotificationHistory.AppName"

            android:textSize="12sp"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"

            android:textAlignment="viewEnd"

        />

    </LinearLayout>
@@ -78,9 +78,10 @@ 
        android:layout_gravity="left|center_vertical"

        android:ellipsize="end"

        android:layout_marginStart="32dp"

        android:maxLines="3"

        android:paddingTop="3dp"

        android:textAppearance="@style/TextAppearance.NotificationHistory.Text"

        android:maxLines="7"

        android:paddingTop="4dp"

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

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"

        android:textAlignment="viewStart" />



</LinearLayout>