Merge "A11y: Show title if ticker is not available" into nyc-dev
This commit is contained in:
@@ -327,7 +327,14 @@ public class StatusBarIconView extends AnimatedImageView {
|
|||||||
public static String contentDescForNotification(Context c, Notification n) {
|
public static String contentDescForNotification(Context c, Notification n) {
|
||||||
Notification.Builder builder = Notification.Builder.recoverBuilder(c, n);
|
Notification.Builder builder = Notification.Builder.recoverBuilder(c, n);
|
||||||
String appName = builder.loadHeaderAppName();
|
String appName = builder.loadHeaderAppName();
|
||||||
|
|
||||||
|
CharSequence title = n.extras.getString(Notification.EXTRA_TITLE);
|
||||||
CharSequence ticker = n.tickerText;
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user