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

Merge "UsbDebuggingActivity.java: OK -> Allow" am: f9718dbe17

Browse Source 
am: 56ed214f67

Change-Id: Ieec3c59499c3a3770d92a52866aa324df1ce0473
This commit is contained in:
Nick Kralevich
2019-01-22 15:28:39 -08:00
committed by android-build-merger
parent 5da014a5fb 56ed214f67
commit 889ff4966b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/strings.xml
View File

@@ -170,6 +170,9 @@
<!-- Option to always allow USB debugging from the attached computer -->
<string name="usb_debugging_always">Always allow from this computer</string>
<!-- Button label for confirming acceptance of enabling USB debugging [CHAR LIMIT=15] -->
<string name="usb_debugging_allow">Allow</string>
<!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
<string name="usb_debugging_secondary_user_title">USB debugging not allowed</string>

2
packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java
View File

@@ -75,7 +75,7 @@ public class UsbDebuggingActivity extends AlertActivity
final AlertController.AlertParams ap = mAlertParams;
ap.mTitle = getString(R.string.usb_debugging_title);
ap.mMessage = getString(R.string.usb_debugging_message, fingerprints);
ap.mPositiveButtonText = getString(android.R.string.ok);
ap.mPositiveButtonText = getString(R.string.usb_debugging_allow);
ap.mNegativeButtonText = getString(android.R.string.cancel);
ap.mPositiveButtonListener = this;
ap.mNegativeButtonListener = this;