Merge "Add BT message access"
This commit is contained in:
committed by
Android (Google) Code Review
commit
cc4e973d72
@@ -306,6 +306,8 @@
|
||||
<string name="bluetooth_notif_message">Touch to pair with <xliff:g id="device_name">%1$s</xliff:g>.</string>
|
||||
<!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
|
||||
<string name="bluetooth_show_received_files">Show received files</string>
|
||||
<!-- Bluetooth settings screen, menu to show the list of email accounts to pull messages from [CHAR LIMIT=30] -->
|
||||
<string name="bluetooth_show_message_access">Message access</string>
|
||||
|
||||
<!-- Strings for BluetoothDevicePicker -->
|
||||
<string name="device_picker">Bluetooth device chooser</string>
|
||||
@@ -316,6 +318,8 @@
|
||||
<!-- Strings for asking to the user whether to allow an app to enable bluetooth -->
|
||||
<string name="bluetooth_ask_enablement">An app wants to turn on Bluetooth.</string>
|
||||
|
||||
<!-- String for informing the user that bluetooth devices must be granted permission. [CHAR LIMIT=100] -->
|
||||
<string name="bluetooth_message_access_notice">Bluetooth devices must ask for permission before accessing available accounts.</string>
|
||||
<!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
|
||||
<string name="bluetooth_ask_discovery" product="tablet">An app wants to make your tablet visible to other Bluetooth devices for <xliff:g id="timeout">%1$d</xliff:g> seconds.</string>
|
||||
<!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
|
||||
@@ -1106,6 +1110,8 @@
|
||||
<string name="bluetooth_preference_device_settings">Device settings</string>
|
||||
<!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
|
||||
<string name="bluetooth_preference_paired_devices">Paired devices</string>
|
||||
<!-- Bluetooth settings: The sub heading for messaging accesses. [CHAR LIMIT=50] -->
|
||||
<string name="bluetooth_message_access">Paired devices can view messages from</string>
|
||||
<!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
|
||||
<string name="bluetooth_preference_found_devices">Available devices</string>
|
||||
<!-- Bluetooth settings. Context menu item for a device. Action will connect to all profiles on the device. -->
|
||||
|
||||
31
res/xml/bluetooth_message_access.xml
Normal file
31
res/xml/bluetooth_message_access.xml
Normal file
@@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2014 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/bluetooth_show_message_access">
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="accounts"
|
||||
android:title="@string/bluetooth_message_access" />
|
||||
|
||||
<Preference
|
||||
android:key="notice"
|
||||
android:title=""
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:attr/colorForegroundInverse"
|
||||
android:selectable="false"
|
||||
android:summary="@string/bluetooth_message_access_notice" />
|
||||
|
||||
</PreferenceScreen>
|
||||
Reference in New Issue
Block a user