Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update notification blocking ui theming" into sc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2021-06-21 13:36:25 +00:00
committed by Android (Google) Code Review
parent 5c095fbc28 2b40f44dfe
commit d6f7eb33e3
3 changed files with 75 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/drawable/rounded_bg_full.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="?android:attr/colorBackgroundFloating" /> <solid android:color="?androidprv:attr/colorSurface" />
<corners <corners
android:bottomLeftRadius="?android:attr/dialogCornerRadius" android:bottomLeftRadius="?android:attr/dialogCornerRadius"
android:topLeftRadius="?android:attr/dialogCornerRadius" android:topLeftRadius="?android:attr/dialogCornerRadius"

17
packages/SystemUI/res/layout/notif_half_shelf.xml
View File

@@ -64,10 +64,12 @@
android:layout_gravity="center" android:layout_gravity="center"
android:padding="8dp" android:padding="8dp"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:textSize="15sp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="2"
style="@style/TextAppearance.NotificationImportanceChannel" /> android:textColor="?android:attr/textColorPrimary"
android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:textSize="16sp"
/>
<Switch <Switch
android:id="@+id/toggle" android:id="@+id/toggle"
@@ -80,18 +82,13 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?android:attr/colorAccent" android:background="@*android:color/background_device_default_light"
/> />
<!-- ChannelRows get added dynamically --> <!-- ChannelRows get added dynamically -->
</com.android.systemui.statusbar.notification.row.ChannelEditorListView> </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 <RelativeLayout
android:id="@+id/bottom_actions" android:id="@+id/bottom_actions"
android:layout_width="match_parent" android:layout_width="match_parent"

117
packages/SystemUI/res/layout/notif_half_shelf_row.xml
View File

@@ -21,61 +21,76 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:padding="8dp"
android:clickable="true" android:clickable="true"
android:orientation="horizontal" android:orientation="vertical"
android:foreground="?android:attr/selectableItemBackground" > 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"
/>
<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" <LinearLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="0dp" android:orientation="horizontal">
android:paddingStart="8dp"
android:paddingEnd="8dp" <!-- This is where an icon would go *if we wanted one* **wink** -->
android:gravity="center_vertical|start" <Space
android:textSize="14sp" android:id="@+id/icon"
android:ellipsize="end" android:layout_height="48dp"
android:maxLines="1" android:layout_width="48dp"
style="@style/TextAppearance.NotificationImportanceChannel" android:layout_gravity="center_vertical"
android:padding="8dp"
/> />
<TextView <RelativeLayout
android:id="@+id/channel_description" android:id="@+id/description_container"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="0dp"
android:paddingStart="8dp" android:layout_weight="1"
android:paddingEnd="8dp" android:layout_gravity="center_vertical"
android:gravity="center_vertical|start" android:gravity="left|center_vertical"
android:textSize="14sp" android:orientation="vertical"
android:ellipsize="end" >
android:maxLines="1" <TextView
android:layout_below="@id/channel_name" android:id="@+id/channel_name"
style="@style/TextAppearance.NotificationImportanceApp" android:layout_height="wrap_content"
/> android:layout_width="wrap_content"
</RelativeLayout> 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"
/>
<Switch <TextView
android:id="@+id/toggle" android:id="@+id/channel_description"
android:layout_height="48dp" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical" android:paddingStart="8dp"
android:padding="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: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> </com.android.systemui.statusbar.notification.row.ChannelRow>