diff options
| author | Vladislav Koldobskiy <admin@nevergone.ru> | 2015-01-04 02:08:53 +0300 |
|---|---|---|
| committer | Vladislav Koldobskiy <admin@nevergone.ru> | 2015-01-04 02:08:53 +0300 |
| commit | 776f0a2c366dcd88b504b1255598139be1350e82 (patch) | |
| tree | a178e98418d340ed91f7b66e38109e5e599e7ccf | |
| parent | 3217128e7719ad7691c55b29456a80ae5953358e (diff) | |
| download | android_packages_apps_DeskClock-776f0a2c366dcd88b504b1255598139be1350e82.tar.gz android_packages_apps_DeskClock-776f0a2c366dcd88b504b1255598139be1350e82.tar.bz2 android_packages_apps_DeskClock-776f0a2c366dcd88b504b1255598139be1350e82.zip | |
DeskClock: move CAF strings to cm_strings
Change-Id: Ifdd80bb514ac5132d6aef262200c91c8079960b2
| -rwxr-xr-x | res/values/cm_strings.xml | 13 | ||||
| -rw-r--r-- | res/values/strings.xml | 17 |
2 files changed, 14 insertions, 16 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 8ffdb1713..88a6bc2a0 100755 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -96,4 +96,17 @@ <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone --> <string name="take_persistent_grant_uri_permission_failed_msg">Failed to take persistent grant permission for ringtone</string> + + <string name="default_auto_silence_value">10</string> + <!-- Select the source of the alarm --> + <string name="alarm_select">Select Alarm</string> + <!-- Select the ringtone as alarm --> + <string name="alarm_select_ringtone">Ringtone</string> + <!-- Select the alarm from external device --> + <string name="alarm_select_external">Music</string> + <!-- Ok for selection --> + <string name="alarm_select_ok">OK</string> + <!-- Cancel for selection --> + <string name="alarm_select_cancel">Cancel</string> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 4cd3d94ff..80a3938ed 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved. - Not a Contribution. - - Copyright (C) 2007 The Android Open Source Project +<!-- Copyright (C) 2007 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. @@ -252,8 +249,6 @@ <!-- Auto silence summary when turned off --> <string name="auto_silence_never">Never</string> - <string name="default_auto_silence_value">10</string> - <!-- Entries listed in the ListPreference when invoking the auto silence preference. --> <string-array name="auto_silence_entries"> @@ -811,16 +806,6 @@ <string name="alarm_undo">undo</string> <!-- Toast content when an alarm was deleted --> <string name="alarm_deleted">Alarm deleted.</string> - <!-- Select the source of the alarm --> - <string name="alarm_select">Select Alarm</string> - <!-- Select the ringtone as alarm --> - <string name="alarm_select_ringtone">Ringtone</string> - <!-- Select the alarm from external device --> - <string name="alarm_select_external">Music</string> - <!-- Ok for selection --> - <string name="alarm_select_ok">OK</string> - <!-- Cancel for selection --> - <string name="alarm_select_cancel">Cancel</string> <!-- slash between date and next alarm in the clock --> <string name="slash"> / </string> <!-- slash between date and next alarm in the clock --> |