diff options
9 files changed, 21 insertions, 20 deletions
diff --git a/core/res/res/layout/notification_template_material_big_text.xml b/core/res/res/layout/notification_template_material_big_text.xml index 3a6f57335fed..d1861d9383d6 100644 --- a/core/res/res/layout/notification_template_material_big_text.xml +++ b/core/res/res/layout/notification_template_material_big_text.xml @@ -53,10 +53,10 @@ android:layout_marginTop="@dimen/notification_progress_margin_top" android:layout_marginBottom="6dp"/> <com.android.internal.widget.ImageFloatingTextView android:id="@+id/big_text" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/notification_text_margin_top" - android:textAppearance="@style/TextAppearance.Material.Notification" android:singleLine="false" android:gravity="top" android:visibility="gone" diff --git a/core/res/res/layout/notification_template_material_inbox.xml b/core/res/res/layout/notification_template_material_inbox.xml index 23d879912ddd..d6f0e1df430e 100644 --- a/core/res/res/layout/notification_template_material_inbox.xml +++ b/core/res/res/layout/notification_template_material_inbox.xml @@ -53,7 +53,7 @@ android:layout_marginTop="@dimen/notification_progress_margin_top" android:layout_marginBottom="2dp"/> <TextView android:id="@+id/inbox_text0" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -62,7 +62,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text1" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -71,7 +71,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text2" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -80,7 +80,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text3" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -89,7 +89,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text4" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -98,7 +98,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text5" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" @@ -107,7 +107,7 @@ android:layout_weight="1" /> <TextView android:id="@+id/inbox_text6" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="0dp" android:singleLine="true" diff --git a/core/res/res/layout/notification_template_messaging_group.xml b/core/res/res/layout/notification_template_messaging_group.xml index d2fd467c3e00..9bdc495d574e 100644 --- a/core/res/res/layout/notification_template_messaging_group.xml +++ b/core/res/res/layout/notification_template_messaging_group.xml @@ -41,6 +41,7 @@ android:id="@+id/group_message_container" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/notification_text_margin_top" android:spacing="2dp" android:layout_weight="1"/> </com.android.internal.widget.RemeasuringLinearLayout> diff --git a/core/res/res/layout/notification_template_part_line1.xml b/core/res/res/layout/notification_template_part_line1.xml index ca35de3922ed..6459bb8019b4 100644 --- a/core/res/res/layout/notification_template_part_line1.xml +++ b/core/res/res/layout/notification_template_part_line1.xml @@ -31,7 +31,7 @@ android:textAlignment="viewStart" /> <TextView android:id="@+id/text_line_1" - android:textAppearance="@style/TextAppearance.Material.Notification" + style="@style/Widget.Material.Notification.Text" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="end|bottom" diff --git a/core/res/res/layout/notification_template_text.xml b/core/res/res/layout/notification_template_text.xml index 68f34c8e5b52..3b27666ef6ff 100644 --- a/core/res/res/layout/notification_template_text.xml +++ b/core/res/res/layout/notification_template_text.xml @@ -15,6 +15,7 @@ ~ limitations under the License --> <com.android.internal.widget.ImageFloatingTextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/Widget.Material.Notification.Text" android:id="@+id/text" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -25,5 +26,4 @@ android:gravity="top" android:singleLine="true" android:textAlignment="viewStart" - android:textAppearance="@style/TextAppearance.Material.Notification" /> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index b8a046f79371..2d97db03d152 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -500,11 +500,15 @@ please see styles_device_defaults.xml. <style name="Widget.Material.Notification.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal" /> - <style name="Widget.Material.Notification.MessagingText" parent="Widget.Material.Light.TextView"> + <style name="Widget.Material.Notification.Text" parent="Widget.Material.Light.TextView"> + <item name="lineHeight">20sp</item> + <item name="textAppearance">@style/TextAppearance.Material.Notification</item> + </style> + + <style name="Widget.Material.Notification.MessagingText" parent="Widget.Material.Notification.Text"> <item name="layout_width">wrap_content</item> <item name="layout_height">wrap_content</item> - <item name="ellipsize">end</item> - <item name="textAppearance">@style/TextAppearance.Material.Notification</item> + <item name="ellipsize">end</item>z </style> <style name="Widget.Material.Notification.MessagingName" parent="Widget.Material.Light.TextView"> diff --git a/packages/SystemUI/res/layout/hybrid_notification.xml b/packages/SystemUI/res/layout/hybrid_notification.xml index f4501da944e2..bccf2077567a 100644 --- a/packages/SystemUI/res/layout/hybrid_notification.xml +++ b/packages/SystemUI/res/layout/hybrid_notification.xml @@ -34,7 +34,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:singleLine="true" - android:textAppearance="@*android:style/TextAppearance.Material.Notification" style="?attr/hybridNotificationTextStyle" /> </com.android.systemui.statusbar.notification.HybridNotificationView>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/hybrid_overflow_number.xml b/packages/SystemUI/res/layout/hybrid_overflow_number.xml index 792f4242d28d..08f8f940102c 100644 --- a/packages/SystemUI/res/layout/hybrid_overflow_number.xml +++ b/packages/SystemUI/res/layout/hybrid_overflow_number.xml @@ -16,10 +16,10 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" + style="@*android:style/Widget.Material.Notification.Text" android:id="@+id/notification_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="@*android:style/TextAppearance.Material.Notification" android:paddingEnd="@dimen/group_overflow_number_padding" android:gravity="end" android:singleLine="true" diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 804ca2cf1db7..1e195344a6d3 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -137,7 +137,8 @@ <item name="android:layout_marginTop">4dp</item> </style> - <style name="hybrid_notification_text"> + <style name="hybrid_notification_text" + parent="@*android:style/Widget.Material.Notification.Text"> <item name="android:paddingEnd">4dp</item> </style> @@ -360,10 +361,6 @@ parent="@*android:style/TextAppearance.Material.Notification.Info"> </style> - <style name="TextAppearance.Material.Notification.HybridNotificationDivider" - parent="@*android:style/TextAppearance.Material.Notification"> - </style> - <style name="SearchPanelCircle"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> |