summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJustin Klaassen <justinklaassen@google.com>2016-05-17 23:30:47 -0700
committerJustin Klaassen <justinklaassen@google.com>2016-05-18 16:37:32 -0700
commitb2e7e162327b1992aa74721a8847c7f7a579e049 (patch)
treed6af7f665d5e92ca7c0b63f087ecd99fd27ac251 /AndroidManifest.xml
parent4e2e7e19f5fe76a0c4a480c243d0c98c46cf93a3 (diff)
downloadandroid_packages_apps_DeskClock-b2e7e162327b1992aa74721a8847c7f7a579e049.tar.gz
android_packages_apps_DeskClock-b2e7e162327b1992aa74721a8847c7f7a579e049.tar.bz2
android_packages_apps_DeskClock-b2e7e162327b1992aa74721a8847c7f7a579e049.zip
Custom ringtone picker v2
Bug: 28667387 - Request the READ_EXTERNAL_STORAGE permission if it isn't already granted when launching the ringtone picker. This allows the listing of external ringtones stored in the alarms/ folder. - Allow the volume rockers to control the alarm stream volume while the ringtone picker is showing. - Load the RingtoneManager's cursor off the main thread to prevent potential ANRs and jank. - Use Theme.AppCompat.Dialog to more closely match the styling of the platform version. - Disable the "OK" button if the selection is invalid. Change-Id: I1ec6b0b744a3a19b3f289e33c24db982543862bc
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml5
1 files changed, 1 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 392d7f5e5..1c5f299e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,7 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- WRITE_SETTINGS is required to record the upcoming alarm prior to L -->
<uses-permission
@@ -40,10 +41,6 @@
<uses-permission
android:name="android.permission.READ_PHONE_STATE"
android:maxSdkVersion="22" />
- <!-- READ_EXTERNAL_STORAGE is required to play custom ringtones from the SD card prior to M -->
- <uses-permission
- android:name="android.permission.READ_EXTERNAL_STORAGE"
- android:maxSdkVersion="22" />
<application
android:name=".DeskClockApplication"