Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reword analog audio not supported notification" into oc-dr1-dev

Browse Source 
am: 69840ca338

Change-Id: I6a9a611c13de7a63e6d5bdbf4718827f2295a28b
This commit is contained in:
Badhri Jagan Sridharan
2017-08-01 19:03:55 +00:00
committed by android-build-merger
parent c199e3fdf1 69840ca338
commit fb80072f99
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/strings.xml
View File

@@ -3131,9 +3131,9 @@
<!-- See USB_PREFERENCES. This is the message. -->
<string name="usb_notification_message">Tap for more options.</string>
<!-- USB_PREFERENCES: Notification for when a type-c USB audio accessory is attached but not supported. This is the title -->
<string name="usb_unsupported_audio_accessory_title">Audio accessory not supported</string>
<string name="usb_unsupported_audio_accessory_title">Analog audio accessory detected</string>
<!-- Message of notification shown when a type-c USB audio accessory is attached but not supported. -->
<string name="usb_unsupported_audio_accessory_message">Tap for more info</string>
<string name="usb_unsupported_audio_accessory_message">The attached device is not compatible with this phone. Tap to learn more.</string>
<!-- Title of notification shown when ADB is actively connected to the phone. -->

14
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -1153,8 +1153,7 @@ public class UsbDeviceManager {
.usb_unsupported_audio_accessory_message);
}
Notification notification =
new Notification.Builder(mContext, channel)
Notification.Builder builder = new Notification.Builder(mContext, channel)
.setSmallIcon(com.android.internal.R.drawable.stat_sys_adb)
.setWhen(0)
.setOngoing(true)
@@ -1166,8 +1165,15 @@ public class UsbDeviceManager {
.setContentTitle(title)
.setContentText(message)
.setContentIntent(pi)
.setVisibility(Notification.VISIBILITY_PUBLIC)
.build();
.setVisibility(Notification.VISIBILITY_PUBLIC);
if (titleRes
== com.android.internal.R.string
.usb_unsupported_audio_accessory_title) {
builder.setStyle(new Notification.BigTextStyle()
.bigText(message));
}
Notification notification = builder.build();
mNotificationManager.notifyAsUser(null, id, notification,
UserHandle.ALL);