DO NOT MERGE Add Bluetooth toggle prompts - settings

If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
This commit is contained in:
Svetoslav Ganov
2016-07-22 20:08:41 -07:00
committed by Marie Janssen
parent 5c6e7a2116
commit c6a074c80d
5 changed files with 240 additions and 189 deletions

View File

@@ -269,6 +269,9 @@
<!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
<string name="bluetooth_ask_enablement">An app wants to turn Bluetooth ON for this device.</string>
<!-- This string asks the user whether or not to allow an app to disable bluetooth. [CHAR LIMIT=100] -->
<string name="bluetooth_ask_disablement">An app wants to turn Bluetooth OFF for this device.</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 -->

View File

@@ -306,4 +306,9 @@
<style name="FallbackHomeProgressBar" parent="FallbackHome">
<item name="android:colorControlActivated">?android:attr/textColorPrimary</item>
</style>
<style name="BluetoothPermission" parent="@android:style/Theme.Material.Light.Dialog.Alert">
<item name="android:windowNoTitle">true</item>
</style>
</resources>