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

Fix some layout issues in notification guts

Browse Source 
Test: manual
Fixes: 158679747
Fixes: 158517790
Change-Id: I14c7630c578967130b492796275475f9bff79f9a
This commit is contained in:
Julia Reynolds
2020-06-10 16:20:11 -04:00
parent e61758adc8
commit f870a114f0
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/res/layout/notification_conversation_info.xml
View File

@@ -84,14 +84,6 @@
android:layout_weight="1"
style="@style/TextAppearance.NotificationImportanceChannel"/>
</LinearLayout>
<TextView
android:id="@+id/pkg_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.NotificationImportanceChannelGroup"
android:ellipsize="end"
android:textDirection="locale"
android:maxLines="1"/>
<TextView
android:id="@+id/group_name"
android:layout_width="match_parent"
@@ -99,6 +91,14 @@
android:ellipsize="end"
android:textDirection="locale"
style="@style/TextAppearance.NotificationImportanceChannelGroup"/>
<TextView
android:id="@+id/pkg_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.NotificationImportanceApp"
android:ellipsize="end"
android:textDirection="locale"
android:maxLines="1"/>
<TextView
android:id="@+id/delegate_name"
android:layout_width="match_parent"

16
packages/SystemUI/res/layout/notification_info.xml
View File

@@ -58,14 +58,6 @@
android:layout_height="wrap_content"
android:textDirection="locale"
style="@style/TextAppearance.NotificationImportanceChannel"/>
<TextView
android:id="@+id/pkg_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.NotificationImportanceChannelGroup"
android:ellipsize="end"
android:textDirection="locale"
android:maxLines="1"/>
<TextView
android:id="@+id/group_name"
android:layout_width="match_parent"
@@ -73,6 +65,14 @@
android:textDirection="locale"
android:ellipsize="end"
style="@style/TextAppearance.NotificationImportanceChannelGroup"/>
<TextView
android:id="@+id/pkg_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.NotificationImportanceApp"
android:ellipsize="end"
android:textDirection="locale"
android:maxLines="1"/>
<TextView
android:id="@+id/delegate_name"
android:layout_width="match_parent"

5
packages/SystemUI/res/layout/partial_conversation_info.xml
View File

@@ -113,18 +113,21 @@
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:layout_centerVertical="true"
android:orientation="horizontal">
<ImageView
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_width="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_info"
android:layout_centerVertical="true"
android:tint="?android:attr/textColorPrimary"
android:layout_marginEnd="8dp"/>
<TextView
android:id="@+id/non_configurable_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
style="@style/TextAppearance.NotificationImportanceChannelGroup" />
</LinearLayout>
</com.android.systemui.statusbar.notification.row.ButtonLinearLayout>

7
packages/SystemUI/res/values/styles.xml
View File

@@ -547,6 +547,13 @@
</style>
<style name="TextAppearance.NotificationImportanceChannelGroup">
<item name="android:textSize">@dimen/notification_importance_channel_group_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textColor">@color/notification_guts_header_text_color</item>
<item name="android:textSize">@dimen/notification_importance_channel_group_text</item>
</style>
<style name="TextAppearance.NotificationImportanceApp">
<item name="android:textSize">@dimen/notification_importance_channel_group_text</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textColor">@color/notification_guts_sub_text_color</item>