diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 43c6ca58a16a6..dd05392c9c989 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3301,7 +3301,10 @@ public class Notification implements Parcelable } } - private String loadHeaderAppName() { + /** + * @hide + */ + public String loadHeaderAppName() { CharSequence name = null; final PackageManager pm = mContext.getPackageManager(); if (mN.extras.containsKey(EXTRA_SUBSTITUTE_APP_NAME)) { diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index f6c3dd4b28e9f..81fa520ae57de 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1657,6 +1657,9 @@ Quick settings editor. + + %1$s notification: %2$s + App may not work with split-screen. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 89899ece050ee..e795aa58e8b27 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -2118,7 +2118,7 @@ public abstract class BaseStatusBar extends SystemUI implements smallIcon, n.iconLevel, n.number, - n.tickerText); + StatusBarIconView.contentDescForNotification(mContext, n)); if (!iconView.set(ic)) { handleNotificationError(sbn, "Couldn't create icon: " + ic); return null; @@ -2287,7 +2287,7 @@ public abstract class BaseStatusBar extends SystemUI implements n.getSmallIcon(), n.iconLevel, n.number, - n.tickerText); + StatusBarIconView.contentDescForNotification(mContext, n)); entry.icon.setNotification(n); if (!entry.icon.set(ic)) { handleNotificationError(notification, "Couldn't update icon: " + ic); @@ -2311,7 +2311,7 @@ public abstract class BaseStatusBar extends SystemUI implements n.getSmallIcon(), n.iconLevel, n.number, - n.tickerText); + StatusBarIconView.contentDescForNotification(mContext, n)); entry.icon.setNotification(n); entry.icon.set(ic); inflateViews(entry, mStackScroller); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 870447acf6e85..6d76763edc84f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -307,9 +307,9 @@ public class StatusBarIconView extends AnimatedImageView { private void setContentDescription(Notification notification) { if (notification != null) { - CharSequence tickerText = notification.tickerText; - if (!TextUtils.isEmpty(tickerText)) { - setContentDescription(tickerText); + String d = contentDescForNotification(mContext, notification); + if (!TextUtils.isEmpty(d)) { + setContentDescription(d); } } } @@ -322,4 +322,12 @@ public class StatusBarIconView extends AnimatedImageView { public String getSlot() { return mSlot; } + + + public static String contentDescForNotification(Context c, Notification n) { + Notification.Builder builder = Notification.Builder.recoverBuilder(c, n); + String appName = builder.loadHeaderAppName(); + CharSequence ticker = n.tickerText; + return c.getString(R.string.accessibility_desc_notification_icon, appName, ticker); + } }