mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
63 lines
4.7 KiB
Diff
63 lines
4.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hugh Chen <hughchen@google.com>
|
|
Date: Thu, 3 Jun 2021 16:38:24 +0800
|
|
Subject: [PATCH] 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 38fc9a91b53e82c092c1324f5ba3085740e7dcdf)
|
|
(cherry picked from commit 3d6641a468bdb296af29bd222b3bc55ed62b78bc)
|
|
---
|
|
res/values/strings.xml | 11 +++++++----
|
|
.../bluetooth/BluetoothPermissionActivity.java | 2 +-
|
|
2 files changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/res/values/strings.xml b/res/values/strings.xml
|
|
index a4fdaf58c9c..322baf15662 100644
|
|
--- a/res/values/strings.xml
|
|
+++ b/res/values/strings.xml
|
|
@@ -7961,15 +7961,18 @@
|
|
<string name="touchscreen_gesture_settings_summary">Perform various touchscreen gestures for quick actions</string>
|
|
|
|
<!-- 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] -->
|
|
<string name="bluetooth_message_access_dialog_title">Allow access to messages?</string>
|
|
<!-- 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] -->
|
|
- <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] -->
|
|
<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] -->
|
|
- <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>
|
|
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
|
index ffb4f398ab3..92988dd97ee 100644
|
|
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
|
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
|
|
@@ -138,7 +138,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
|
|
}
|
|
p.mPositiveButtonText = getString(R.string.allow);
|
|
p.mPositiveButtonListener = this;
|
|
- p.mNegativeButtonText = getString(R.string.deny);
|
|
+ p.mNegativeButtonText = getString(R.string.request_manage_bluetooth_permission_dont_allow);
|
|
p.mNegativeButtonListener = this;
|
|
mOkButton = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
|
|
setupAlert();
|