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

Commit b4e74e5a authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Remove notification content from icon a11y" into sc-dev am: 0bd305f4... 

Merge "Remove notification content from icon a11y" into sc-dev am: 0bd305f4 am: d09d1748 am: 62529f9e am: e2247c86

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/31252977



Change-Id: I8296bcaba36f4005db519832341d19713c7f8a7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e08656e4 e2247c86

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+1 −11
Original line number Diff line number Diff line
@@ -580,17 +580,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi 
            }

        }



        CharSequence title = n.extras.getCharSequence(Notification.EXTRA_TITLE);

        CharSequence text = n.extras.getCharSequence(Notification.EXTRA_TEXT);

        CharSequence ticker = n.tickerText;



        // Some apps just put the app name into the title

        CharSequence titleOrText = TextUtils.equals(title, appName) ? text : title;



        CharSequence desc = !TextUtils.isEmpty(titleOrText) ? titleOrText

                : !TextUtils.isEmpty(ticker) ? ticker : "";



        return c.getString(R.string.accessibility_desc_notification_icon, appName, desc);

        return c.getString(R.string.accessibility_desc_notification_icon, appName, "");

    }



    /**