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

Commit 15e6f796 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Notif redesign] Update fonts in half shelf" into main

parents 337c3cd6 4939015f

packages/SystemUI/res/layout/notif_half_shelf.xml

+18 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
  ~ limitations under the License

  -->



<!-- The bottom sheet that appears when editing notification channel preferences from the shade. -->

<FrameLayout

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

        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
@@ -57,6 +58,22 @@ 
                    android:padding="8dp" />



                <TextView

                    android:featureFlag="android.app.notifications_redesign_fonts"

                    android:id="@+id/app_name"

                    android:layout_height="wrap_content"

                    android:layout_width="0dp"

                    android:layout_weight="1"

                    android:layout_gravity="center"

                    android:padding="8dp"

                    android:gravity="center_vertical|start"

                    android:ellipsize="end"

                    android:maxLines="2"

                    android:textColor="@androidprv:color/materialColorOnSurface"

                    android:fontFamily="variable-title-medium"

                    android:textSize="16sp"

                />

                <TextView

                    android:featureFlag="!android.app.notifications_redesign_fonts"

                    android:id="@+id/app_name"

                    android:layout_height="wrap_content"

                    android:layout_width="0dp"

packages/SystemUI/res/layout/notif_half_shelf_row.xml

+34 −2
Original line number Diff line number Diff line
@@ -50,6 +50,22 @@ 
            android:orientation="vertical"

        >

            <TextView

                android:featureFlag="android.app.notifications_redesign_fonts"

                android:id="@+id/channel_name"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:paddingBottom="0dp"

                android:paddingStart="8dp"

                android:paddingEnd="8dp"

                android:gravity="center_vertical|start"

                android:ellipsize="end"

                android:maxLines="1"

                android:fontFamily="variable-title-medium"

                android:textColor="@androidprv:color/materialColorOnSurface"

                android:textSize="16sp"

            />

            <TextView

                android:featureFlag="!android.app.notifications_redesign_fonts"

                android:id="@+id/channel_name"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"
@@ -65,6 +81,22 @@ 
                />



            <TextView

                android:featureFlag="android.app.notifications_redesign_fonts"

                android:id="@+id/channel_description"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:paddingStart="8dp"

                android:paddingEnd="8dp"

                android:gravity="center_vertical|start"

                android:ellipsize="end"

                android:maxLines="1"

                android:layout_below="@id/channel_name"

                android:fontFamily="variable-body-medium"

                android:textColor="@androidprv:color/materialColorOnSurfaceVariant"

                android:textSize="14sp"

            />

            <TextView

                android:featureFlag="!android.app.notifications_redesign_fonts"

                android:id="@+id/channel_description"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"