Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11a0b653 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Stop using ?attr/notificationHeaderTextAppearance 

"Headers" are not what they used to be, so this attribute (which was used inconsistently) was a weird vestige.

Bug: 179415446
Test: manual
Change-Id: Ide94b639cd0450a5de6bbd5ff9170facf8d1aa16
parent 3bec8336

core/res/res/layout/notification_template_conversation_header.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout/notification_top_line_views.xml

+6 −6
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java

+1 −5
Original line number Diff line number Diff line
@@ -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(