From 51548e619f934dce9ece555a69d0f342564188ab Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Thu, 28 Apr 2016 11:20:26 -0700 Subject: [PATCH] A11y: Show title if ticker is not available Change-Id: I028ba9fffc8ca0f0340e052c6d1f99696aba084a Fixes: 27552350 --- .../android/systemui/statusbar/StatusBarIconView.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 6d76763edc84f..ce0163e66eaf2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -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); } + }