RESTRICT AUTOMERGE Update string am: 7ce80425ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137 Change-Id: I9c8fabb01ea2cf69b2714523b361f50a5a597561
This commit is contained in:
@@ -11433,15 +11433,18 @@
|
|||||||
<string name="rtt_settings_always_visible"></string>
|
<string name="rtt_settings_always_visible"></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>
|
||||||
|
@@ -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();
|
||||||
|
Reference in New Issue
Block a user