diff options
3 files changed, 9 insertions, 13 deletions
diff --git a/core/res/res/layout/notification_template_conversation_header.xml b/core/res/res/layout/notification_template_conversation_header.xml index 46f88b3391d9..b018676e68f0 100644 --- a/core/res/res/layout/notification_template_conversation_header.xml +++ b/core/res/res/layout/notification_template_conversation_header.xml @@ -38,7 +38,7 @@ android:id="@+id/app_name_divider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:text="@string/notification_header_divider_symbol" @@ -66,7 +66,7 @@ android:id="@+id/time_divider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_marginStart="@dimen/notification_conversation_header_separating_margin" android:layout_marginEnd="@dimen/notification_conversation_header_separating_margin" android:text="@string/notification_header_divider_symbol" diff --git a/core/res/res/layout/notification_top_line_views.xml b/core/res/res/layout/notification_top_line_views.xml index 7cda03f8fc4f..7656dd50b2d4 100644 --- a/core/res/res/layout/notification_top_line_views.xml +++ b/core/res/res/layout/notification_top_line_views.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/notification_header_separating_margin" android:singleLine="true" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:visibility="?attr/notificationHeaderAppNameVisibility" /> @@ -34,7 +34,7 @@ android:id="@+id/header_text_secondary_divider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_marginStart="@dimen/notification_header_separating_margin" android:layout_marginEnd="@dimen/notification_header_separating_margin" android:text="@string/notification_header_divider_symbol" @@ -45,7 +45,7 @@ android:id="@+id/header_text_secondary" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_marginStart="@dimen/notification_header_separating_margin" android:layout_marginEnd="@dimen/notification_header_separating_margin" android:visibility="gone" @@ -56,7 +56,7 @@ android:id="@+id/header_text_divider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_marginStart="@dimen/notification_header_separating_margin" android:layout_marginEnd="@dimen/notification_header_separating_margin" android:text="@string/notification_header_divider_symbol" @@ -67,7 +67,7 @@ android:id="@+id/header_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_marginStart="@dimen/notification_header_separating_margin" android:layout_marginEnd="@dimen/notification_header_separating_margin" android:visibility="gone" @@ -78,7 +78,7 @@ android:id="@+id/time_divider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?attr/notificationHeaderTextAppearance" + android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Info" android:layout_marginStart="@dimen/notification_header_separating_margin" android:layout_marginEnd="@dimen/notification_header_separating_margin" android:text="@string/notification_header_divider_symbol" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java index a89f7ec5ae85..34bc5370e8f1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java @@ -36,7 +36,6 @@ import android.widget.TextView; import com.android.internal.widget.CachingIconView; import com.android.internal.widget.NotificationExpandButton; -import com.android.settingslib.Utils; import com.android.systemui.Interpolators; import com.android.systemui.statusbar.TransformableView; import com.android.systemui.statusbar.ViewTransformationHelper; @@ -205,11 +204,8 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper { public void clearConversationSkin() { if (mAppNameText != null) { final ColorStateList colors = mAppNameText.getTextColors(); - final int textAppearance = Utils.getThemeAttr( - mAppNameText.getContext(), - com.android.internal.R.attr.notificationHeaderTextAppearance, + mAppNameText.setTextAppearance( com.android.internal.R.style.TextAppearance_DeviceDefault_Notification_Info); - mAppNameText.setTextAppearance(textAppearance); mAppNameText.setTextColor(colors); MarginLayoutParams layoutParams = (MarginLayoutParams) mAppNameText.getLayoutParams(); final int marginStart = mAppNameText.getResources().getDimensionPixelSize( |