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

Merge "Remove "don't disconnect the device" description." into nyc-dev

Browse Source
This commit is contained in:
Daichi Hirono
2016-05-03 01:08:04 +00:00
committed by Android (Google) Code Review
parent bb4f1b4d75 59688a5883
commit 30506508fe
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/MtpDocumentsProvider/res/values/strings.xml
View File

@@ -25,8 +25,6 @@
<string name="root_name"><xliff:g id="device_model" example="Nexus 9">%1$s</xliff:g> <xliff:g id="storage_name" example="Internal Storage">%2$s</xliff:g></string> <string name="root_name"><xliff:g id="device_model" example="Nexus 9">%1$s</xliff:g> <xliff:g id="storage_name" example="Internal Storage">%2$s</xliff:g></string>
<!-- Title of notification showing Files app is accessing files in a MTP device. [CHAR LIMIT=60]--> <!-- Title of notification showing Files app is accessing files in a MTP device. [CHAR LIMIT=60]-->
<string name="accessing_notification_title">Accessing files from <xliff:g id="device_model" example="Nexus 9">%1$s</xliff:g></string> <string name="accessing_notification_title">Accessing files from <xliff:g id="device_model" example="Nexus 9">%1$s</xliff:g></string>
<!-- Description of notification showing Files app is accessing files in a MTP device. [CHAR LIMIT=60]-->
<string name="accessing_notification_description">Don\'t disconnect the device</string>
<!-- Error message shown in Files app when the connected MTP device is busy. [CHAR LIMIT=150]--> <!-- Error message shown in Files app when the connected MTP device is busy. [CHAR LIMIT=150]-->
<string name="error_busy_device">The other device is busy. You can\'t transfer files until it\'s available.</string> <string name="error_busy_device">The other device is busy. You can\'t transfer files until it\'s available.</string>
<!-- Error message shown in Files app when the connected MTP device may be locked. [CHAR LIMIT=150]--> <!-- Error message shown in Files app when the connected MTP device may be locked. [CHAR LIMIT=150]-->

3
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsService.java
View File

@@ -74,13 +74,10 @@ public class MtpDocumentsService extends Service {
final String title = getResources().getString( final String title = getResources().getString(
R.string.accessing_notification_title, R.string.accessing_notification_title,
record.name); record.name);
final String description = getResources().getString(
R.string.accessing_notification_description);
notificationId = record.deviceId; notificationId = record.deviceId;
notification = new Notification.Builder(this) notification = new Notification.Builder(this)
.setLocalOnly(true) .setLocalOnly(true)
.setContentTitle(title) .setContentTitle(title)
.setContentText(description)
.setSmallIcon(com.android.internal.R.drawable.stat_sys_data_usb) .setSmallIcon(com.android.internal.R.drawable.stat_sys_data_usb)
.setCategory(Notification.CATEGORY_SYSTEM) .setCategory(Notification.CATEGORY_SYSTEM)
.setPriority(Notification.PRIORITY_LOW) .setPriority(Notification.PRIORITY_LOW)