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

Commit 0ed02298 authored by Dan Sandler's avatar Dan Sandler
Browse files

Revert to basic icons in notification info. 

Also:
 - hide subtext---just show icon + label.
 - Revert to "Alerting" / "Silent" language for labels.

Bug: 132689331
Test: manual
Change-Id: I3f672d9197663b56cc7f6bd489e3363c1895b7fe
parent 0ef7b0d4

packages/SystemUI/res/layout/notification_info.xml

+4 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ asked for it --> 
                android:focusable="true">

                <ImageView

                    android:id="@+id/alert_icon"

                    android:src="@drawable/ic_notification_interruptive"

                    android:src="@drawable/ic_notifications_alert"

                    android:background="@android:color/transparent"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"
@@ -249,6 +249,7 @@ asked for it --> 
                    android:text="@string/notification_alert_title"/>

                <TextView

                    android:id="@+id/alert_summary"

                    android:visibility="gone"

                    android:paddingTop="@dimen/notification_importance_button_padding"

                    android:text="@string/notification_channel_summary_default"

                    android:layout_width="match_parent"
@@ -271,7 +272,7 @@ asked for it --> 
                android:focusable="true">

                <ImageView

                    android:id="@+id/silence_icon"

                    android:src="@drawable/ic_notification_gentle"

                    android:src="@drawable/ic_notifications_silence"

                    android:background="@android:color/transparent"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"
@@ -292,6 +293,7 @@ asked for it --> 
                    android:text="@string/notification_silence_title"/>

                <TextView

                    android:id="@+id/silence_summary"

                    android:visibility="gone"

                    android:paddingTop="@dimen/notification_importance_button_padding"

                    android:text="@string/notification_channel_summary_default"

                    android:layout_width="match_parent"

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1643,13 +1643,13 @@ 
    <string name="inline_minimize_button">Minimize</string>



    <!-- Notification inline controls: button to show notifications silently, without alerting the user [CHAR_LIMIT=35] -->

    <string name="inline_silent_button_silent">Gentle</string>

    <string name="inline_silent_button_silent">Silent</string>



    <!-- Notification inline controls: button to continue showing notifications silently [CHAR_LIMIT=35] -->

    <string name="inline_silent_button_stay_silent">Stay silent</string>



    <!-- Notification inline controls: button to make notifications alert the user [CHAR_LIMIT=35] -->

    <string name="inline_silent_button_alert">Interruptive</string>

    <string name="inline_silent_button_alert">Alerting</string>



    <!-- Notification inline controls: button to continue alerting the user when notifications arrive [CHAR_LIMIT=35] -->

    <string name="inline_silent_button_keep_alerting">Keep alerting</string>

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

+21 −17
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 


    private static final int BUTTON_ANIM_TIME_MS = 200;



    private static final boolean SHOW_BUTTON_SUMMARY = false;



    private INotificationManager mINotificationManager;

    private PackageManager mPm;

    private MetricsLogger mMetricsLogger;
@@ -580,6 +582,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
            transition.setDuration(BUTTON_ANIM_TIME_MS);

            TransitionManager.beginDelayedTransition(this, transition);

        }

        if (SHOW_BUTTON_SUMMARY) {

            if (blockState == ACTION_ALERT) {

                TextView view = findViewById(R.id.alert_summary);

                view.setVisibility(VISIBLE);
@@ -602,6 +605,7 @@ public class NotificationInfo extends LinearLayout implements NotificationGuts.G 
                }

            }

        }

    }



    private void saveImportanceAndExitReason(@NotificationInfoAction int action) {

        switch (action) {