summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/SystemUI/res/drawable/rounded_bg_full.xml3
-rw-r--r--packages/SystemUI/res/layout/notif_half_shelf.xml17
-rw-r--r--packages/SystemUI/res/layout/notif_half_shelf_row.xml113
3 files changed, 73 insertions, 60 deletions
diff --git a/packages/SystemUI/res/drawable/rounded_bg_full.xml b/packages/SystemUI/res/drawable/rounded_bg_full.xml
index e0d3f63e8f40..967c57b0c370 100644
--- a/packages/SystemUI/res/drawable/rounded_bg_full.xml
+++ b/packages/SystemUI/res/drawable/rounded_bg_full.xml
@@ -1,7 +1,8 @@
<?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"
diff --git a/packages/SystemUI/res/layout/notif_half_shelf.xml b/packages/SystemUI/res/layout/notif_half_shelf.xml
index 42f14f30da00..6bc01389e3c3 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf.xml
@@ -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"
diff --git a/packages/SystemUI/res/layout/notif_half_shelf_row.xml b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
index 87de28650662..245d1579d5a3 100644
--- a/packages/SystemUI/res/layout/notif_half_shelf_row.xml
+++ b/packages/SystemUI/res/layout/notif_half_shelf_row.xml
@@ -21,61 +21,76 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:clickable="true"
- android:orientation="horizontal"
- android:foreground="?android:attr/selectableItemBackground" >
-
- <!-- This is where an icon would go *if we wanted one* **wink** -->
- <Space
- android:id="@+id/icon"
- android:layout_height="48dp"
- android:layout_width="48dp"
- android:layout_gravity="center_vertical"
- android:padding="8dp"
- />
+ android:orientation="vertical"
+ android:foreground="?android:attr/selectableItemBackground"
+ >
- <RelativeLayout
- android:id="@+id/description_container"
+ <LinearLayout
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
- android:gravity="left|center_vertical"
- android:orientation="vertical"
- >
- <TextView
- 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:textSize="14sp"
- android:ellipsize="end"
- android:maxLines="1"
- style="@style/TextAppearance.NotificationImportanceChannel"
+ android:orientation="horizontal">
+
+ <!-- This is where an icon would go *if we wanted one* **wink** -->
+ <Space
+ android:id="@+id/icon"
+ android:layout_height="48dp"
+ android:layout_width="48dp"
+ android:layout_gravity="center_vertical"
+ android:padding="8dp"
/>
- <TextView
- android:id="@+id/channel_description"
+ <RelativeLayout
+ android:id="@+id/description_container"
android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical"
+ android:gravity="left|center_vertical"
+ android:orientation="vertical"
+ >
+ <TextView
+ 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="@*android:string/config_headlineFontFamily"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="16sp"
+ />
+
+ <TextView
+ 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="@*android:string/config_bodyFontFamily"
+ android:textColor="?android:attr/textColorSecondary"
+ android:textSize="14sp"
+ />
+ </RelativeLayout>
+
+ <Switch
+ android:id="@+id/toggle"
+ android:layout_height="48dp"
android:layout_width="wrap_content"
- 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:layout_gravity="center_vertical"
+ android:padding="8dp"
/>
- </RelativeLayout>
-
- <Switch
- android:id="@+id/toggle"
- android:layout_height="48dp"
- android:layout_width="wrap_content"
- 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>
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-09 19:17:34 +0000