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

Commit 838e0b52 authored by Hugh Chen's avatar Hugh Chen Committed by Android Build Coastguard Worker
Browse files

RESTRICT AUTOMERGE Update string 

1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"

https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637

Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests

Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91)
(cherry picked from commit 7ce80425)
parent 11524c46

res/values/strings.xml

+7 −4
Original line number Original line Diff line number Diff line
@@ -11316,15 +11316,18 @@ 
    <string name="work_policy_privacy_settings_summary">Settings managed by your IT admin</string>

    <string name="work_policy_privacy_settings_summary">Settings managed by your IT admin</string>

















    <!-- Bluetooth message permission alert for notification content [CHAR LIMIT=none] -->







    <!-- Bluetooth message permission alert for notification content [CHAR LIMIT=none] -->











    <string name="bluetooth_message_access_notification_content">Untrusted device wants to access your messages. Tap for details.</string>







    <string name="bluetooth_message_access_notification_content">A device wants to access your messages. Tap for details.</string>











    <!-- Bluetooth message permission alert for dialog title [CHAR LIMIT=none] -->







    <!-- Bluetooth message permission alert for dialog title [CHAR LIMIT=none] -->











    <string name="bluetooth_message_access_dialog_title">Allow access to messages?</string>







    <string name="bluetooth_message_access_dialog_title">Allow access to messages?</string>











    <!-- Bluetooth message permission alert for dialog content [CHAR LIMIT=none] -->







    <!-- Bluetooth message permission alert for dialog content [CHAR LIMIT=none] -->











    <string name="bluetooth_message_access_dialog_content">An untrusted Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your messages.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>







    <string name="bluetooth_message_access_dialog_content">A Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your messages.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>











    <!-- Bluetooth phonebook permission alert for notification content [CHAR LIMIT=none] -->







    <!-- Bluetooth phonebook permission alert for notification content [CHAR LIMIT=none] -->











    <string name="bluetooth_phonebook_access_notification_content">Untrusted device wants to access your contacts and call log. Tap for details.</string>







    <string name="bluetooth_phonebook_access_notification_content">A device wants to access your contacts and call log. Tap for details.</string>











    <!-- Bluetooth phonebook permission alert for dialog title [CHAR LIMIT=none] -->







    <!-- Bluetooth phonebook permission alert for dialog title [CHAR LIMIT=none] -->











    <string name="bluetooth_phonebook_access_dialog_title">Allow access to contacts and call log?</string>







    <string name="bluetooth_phonebook_access_dialog_title">Allow access to contacts and call log?</string>











    <!-- Bluetooth phonebook permission alert for dialog content [CHAR LIMIT=none] -->







    <!-- Bluetooth phonebook permission alert for dialog content [CHAR LIMIT=none] -->











    <string name="bluetooth_phonebook_access_dialog_content">An untrusted Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>







    <string name="bluetooth_phonebook_access_dialog_content">A Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>



























    <!-- Label for button to not allow grant the permission for remote devices. [CHAR_LIMIT=50] -->














    <string name="request_manage_bluetooth_permission_dont_allow">Don\u2019t allow</string>











</resources>







</resources>

























src/com/android/settings/bluetooth/BluetoothPermissionActivity.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -135,7 +135,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements









        }







        }











        p.mPositiveButtonText = getString(R.string.allow);







        p.mPositiveButtonText = getString(R.string.allow);











        p.mPositiveButtonListener = this;







        p.mPositiveButtonListener = this;











        p.mNegativeButtonText = getString(R.string.deny);







        p.mNegativeButtonText = getString(R.string.request_manage_bluetooth_permission_dont_allow);











        p.mNegativeButtonListener = this;







        p.mNegativeButtonListener = this;











        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);







        mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);











        setupAlert();







        setupAlert();