diff options
author | hoffc <hoffc@codeaurora.org> | 2016-05-27 10:59:45 +0800 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2016-08-24 08:06:59 -0600 |
commit | 48453143399ae03689ff3c69a02d3eb8e99dfd02 (patch) | |
tree | 3aa4859e820baf2479f4d0e7e9731d8e80af300f /res | |
parent | 6d687c69c638a23c23b70f63570c3f27a76f5ede (diff) | |
download | android_packages_apps_DeskClock-48453143399ae03689ff3c69a02d3eb8e99dfd02.tar.gz android_packages_apps_DeskClock-48453143399ae03689ff3c69a02d3eb8e99dfd02.tar.bz2 android_packages_apps_DeskClock-48453143399ae03689ff3c69a02d3eb8e99dfd02.zip |
DeskClock: add runtime permission control and ringtone fallback process
(1) when one alarm alert ringtone has been deleted, and its ringtone
should be fallback to default ringtone
(2) when ringtone need storage runtime permission, but the permission
is denied, and should fallback too
(3) optimize the ringtone title display for such as audio ringtone type
(4) during setting ringtone and if user denied permission, fail current
settting and give user toast prompt
Change-Id: I310ad9c81657f6b1a09a1bc53098e9c204bb3bae
CRs-Fixed: 1021348
Diffstat (limited to 'res')
-rw-r--r-- | res/values-zh-rCN/strings.xml | 3 | ||||
-rw-r--r-- | res/values-zh-rHK/strings.xml | 3 | ||||
-rw-r--r-- | res/values-zh-rTW/strings.xml | 3 | ||||
-rwxr-xr-x | res/values/strings.xml | 8 |
4 files changed, 17 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index ebe1c4fdc..ee78a7675 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -422,4 +422,7 @@ <string name="action_summary_snooze">暂停闹铃</string> <string name="action_summary_dismiss">停止闹铃</string> <string name="action_summary_do_nothing">不产生任何作用</string> + <string name="custom_ringtone" msgid="3477418548382111184">"自定义铃声"</string> + <string name="ringtone_default">"默认铃声"</string> + <string name="have_denied_storage_permission">"你主动拒绝了存储访问权限,可以去设置应用重新开启该应用权限"</string> </resources> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 6c2e8f2f6..9a8d0391e 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -405,4 +405,7 @@ <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"選擇要關閉的鬧鐘"</string> <string name="no_firing_alarms" msgid="4986161963178722289">"現時沒有響鬧"</string> <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> 的鬧鐘將於 10 分鐘後重響"</string> + <string name="custom_ringtone" msgid="3477418548382111184">"自訂鈴聲"</string> + <string name="ringtone_default">"默認鈴聲"</string> + <string name="have_denied_storage_permission">"你主動拒絕了存儲訪問權限,可以去設置應用重新開啓該應用權限"</string> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index f8f083264..fa72f2808 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -405,4 +405,7 @@ <string name="pick_alarm_to_dismiss" msgid="5408769235866082896">"選擇要關閉的鬧鐘"</string> <string name="no_firing_alarms" msgid="4986161963178722289">"目前沒有鬧鐘正在響鈴"</string> <string name="alarm_is_snoozed" msgid="7044644119744928846">"<xliff:g id="ALARM_TIME">%s</xliff:g> 的鬧鐘已延後 10 分鐘"</string> + <string name="custom_ringtone" msgid="3477418548382111184">"自訂鈴聲"</string> + <string name="ringtone_default">"默認鈴聲"</string> + <string name="have_denied_storage_permission">"你主動拒絕了存儲訪問權限,可以去設置應用重新開啓該應用權限"</string> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1e2f63e33..6035c6eb4 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1157,5 +1157,13 @@ <string name="action_summary_dismiss">dismiss the alarm</string> <string name="action_summary_do_nothing">do nothing</string> + <!-- Label on expanded alarm edit view indicating the ringtone is custom. --> + <string name="custom_ringtone">Custom Ringtone</string> + + <!-- Ringtone selection default" --> + <string name="ringtone_default">"Default ringtone"</string> + + <!--used for prompt to user storage permission status--> + <string name="have_denied_storage_permission">You have denied storage permission,and can manually add this permission again in setting application</string> </resources> |