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

Commit 764adf03 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "A11y: Show title if ticker is not available" into nyc-dev am: bc243b5f 

am: b45ed6b7

* commit 'b45ed6b7':
  A11y: Show title if ticker is not available

Change-Id: I9c6203a53d9db03efb792951115cf39488718d21
parents dcec9616 b45ed6b7

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

+8 −1
Original line number Diff line number Diff line
@@ -327,7 +327,14 @@ public class StatusBarIconView extends AnimatedImageView { 
    public static String contentDescForNotification(Context c, Notification n) {

        Notification.Builder builder = Notification.Builder.recoverBuilder(c, n);

        String appName = builder.loadHeaderAppName();



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

        CharSequence ticker = n.tickerText;

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



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

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



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

    }



}