Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
DO NOT MERGE: Change permission strings to comply with the system permission UI
Change-Id: Ia5ad7f7297acfe85147fee8164ef3d387a2dc306
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 48792da..26cf92b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,7 +22,7 @@
<string name="permlab_readTvListings">read all TV listings</string>
<!-- Description of an application permission, listed so the user can choose
whether they want to allow the application to do this. -->
- <string name="permdesc_readTvListings">Allows the app to read all the TV listings stored on your device.</string>
+ <string name="permdesc_readTvListings">read all TV listings available on your device</string>
<!-- Title of an application permission, listed so the user can choose
whether they want to allow the application to do this.
@@ -31,26 +31,26 @@
<!-- Description of an application permission, listed so the user can choose
whether they want to allow the application to do this.
@deprecated -->
- <string name="permdesc_readEpgData">Allows the app to read its own TV listings stored on your device.</string>
+ <string name="permdesc_readEpgData">read TV listings</string>
<!-- Title of an application permission, listed so the user can choose
whether they want to allow the application to do this. -->
- <string name="permlab_writeEpgData">write TV listings</string>
+ <string name="permlab_writeEpgData">provide TV listings</string>
<!-- Description of an application permission, listed so the user can choose
whether they want to allow the application to do this. -->
- <string name="permdesc_writeEpgData">Allows the app to write its own TV listings on your device storage.</string>
+ <string name="permdesc_writeEpgData">provide TV listings</string>
<!-- Title of an application permission, listed so the user can choose
whether they want to allow the application to do this. -->
- <string name="permlab_accessAllEpgData">access all listings</string>
+ <string name="permlab_accessAllEpgData">access all TV listings</string>
<!-- Description of an application permission, listed so the user can choose
whether they want to allow the application to do this. -->
- <string name="permdesc_accessAllEpgData">Allows the app to read and write all the TV listings stored on your device.</string>
+ <string name="permdesc_accessAllEpgData">read and modify all TV listings available on your device</string>
<!-- Title of an application permission, listed so the user can choose
whether they want to allow the application to do this. -->
<string name="permlab_accessWatchedPrograms">access TV watch history</string>
<!-- Description of an application permission, listed so the user can choose
whether they want to allow the application to do this. -->
- <string name="permdesc_accessWatchedPrograms">Allows the app to read and write your TV watch history. Malicious apps may collect your private watch history.</string>
+ <string name="permdesc_accessWatchedPrograms">access your TV watch history</string>
</resources>