Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 889ff496 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

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

am: 56ed214f

Change-Id: Ieec3c59499c3a3770d92a52866aa324df1ce0473
parents 5da014a5 56ed214f

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/src/com/android/systemui/usb/UsbDebuggingActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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;