commit f667aebe20c13b9c7e8b08fb22b44676d31a37b1
author Adrian Roos <roosa@google.com> Fri Mar 31 17:31:45 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 17:31:50 2017 +0000
tree 3a197a37745ff48f5055e492de56d0cdfdb8bb74
parent 8565eab156281ac23b3c1df9a05b242483e57ba9
parent 6e782a5e4ea3cca646f9d70b9aa95ae9f03990c7

Merge "A11y: Prefer EXTRA_TITLE to ticker for status bar icon content description" into oc-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 1101701..b9c8a78 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -455,8 +455,8 @@
         CharSequence title = n.extras.getCharSequence(Notification.EXTRA_TITLE);
         CharSequence ticker = n.tickerText;
 
-        CharSequence desc = !TextUtils.isEmpty(ticker) ? ticker
-                : !TextUtils.isEmpty(title) ? title : "";
+        CharSequence desc = !TextUtils.isEmpty(title) ? title
+                : !TextUtils.isEmpty(ticker) ? ticker : "";
 
         return c.getString(R.string.accessibility_desc_notification_icon, appName, desc);
     }