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

Commit 38fc9a91 authored by Hugh Chen's avatar Hugh Chen
Browse files

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
parent 0a03f8e2

res/values/strings.xml

+7 −4
Original line number Diff line number Diff line
@@ -13052,17 +13052,17 @@ 
    <string name="apps_dashboard_title">Apps</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>





























    <!-- Brightness category name in Display Settings [CHAR LIMIT=none] -->















    <string name="category_name_brightness">Brightness</string>










@@ -13160,4 +13160,7 @@



























    <!-- All apps screen title, entry name on Apps page for the user to go to the all apps page. [CHAR LIMIT=30] -->















    <string name="all_apps">All apps</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>

























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



+3
−3




























Original line number
Diff line number
Diff line








@@ -16,6 +16,8 @@





























package com.android.settings.bluetooth;





























import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;





























import android.bluetooth.BluetoothDevice;















import android.content.BroadcastReceiver;















import android.content.Context;









@@ -34,8 +36,6 @@ import com.android.internal.app.AlertActivity;













import com.android.internal.app.AlertController;















import com.android.settings.R;





























import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;





























/**















 * BluetoothPermissionActivity shows a dialog for accepting incoming















 * profile connection request from untrusted devices.










@@ -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();