diff options
| author | James Lemieux <jplemieux@google.com> | 2015-11-19 00:54:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-19 00:54:10 +0000 |
| commit | ad9d3e6d8317065bc4cade1947cee1b25388c4b8 (patch) | |
| tree | d31720ebf3c807259fdaa4ec69ffe5b534e9578a /res | |
| parent | da05d9e4882b5bc06e0cc668934d0f18cd392dd0 (diff) | |
| parent | 6468db45fd4ebb7dda8e65b19b3eb6a66e4d7e1f (diff) | |
| download | android_packages_apps_DeskClock-ad9d3e6d8317065bc4cade1947cee1b25388c4b8.tar.gz android_packages_apps_DeskClock-ad9d3e6d8317065bc4cade1947cee1b25388c4b8.tar.bz2 android_packages_apps_DeskClock-ad9d3e6d8317065bc4cade1947cee1b25388c4b8.zip | |
Merge "Miscellaneous fixes" into ub-deskclock-dazzle
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 20 | ||||
| -rw-r--r-- | res/xml/digital_appwidget.xml | 4 |
2 files changed, 11 insertions, 13 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 330273a90..5f18d1de9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -798,14 +798,14 @@ <item>"Asia/Jakarta"</item> </string-array> - <!-- Header in the preferences settings for the section pertaining to alarms --> - <string name="alarm_settings">Alarms</string> - <!-- Describes the running service for the timers --> - <string name="timer_service_desc">Timer service to run the notification.</string> - <!-- Describes the running service for the stopwatch --> - <string name="stopwatch_service_desc">Stopwatch service to run the notification.</string> - <!-- Description for the paused stop watch --> - <string name="swn_paused">Paused</string> + <!-- Header in the preferences settings for the section pertaining to alarms --> + <string name="alarm_settings">Alarms</string> + <!-- Describes the service that processes actions originating from timer notifications. --> + <string name="timer_service_desc">Processes actions from timer notifications.</string> + <!-- Describes the service that processes actions originating from stopwatch notifications. --> + <string name="stopwatch_service_desc">Processes actions from stopwatch notifications.</string> + <!-- Description for the paused stop watch --> + <string name="swn_paused">Paused</string> <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still be on the right even on RTL languages so please do not reverse this during @@ -1003,8 +1003,8 @@ --> <string name="too_many_timers_exist">More than one timer exists</string> - <!-- String that represents that the user attempted to control a timer with a voice action when - more than one timer is defined. + <!-- String that represents that the user attempted to control a timer with a voice action but + the timer could not be located. [CHAR LIMIT=NONE] --> <string name="timer_does_not_exist">The timer has been removed.</string> diff --git a/res/xml/digital_appwidget.xml b/res/xml/digital_appwidget.xml index b6b30fd1d..da28a882a 100644 --- a/res/xml/digital_appwidget.xml +++ b/res/xml/digital_appwidget.xml @@ -23,6 +23,4 @@ android:previewImage="@drawable/appwidget_digital_clock_preview" android:initialLayout="@layout/digital_appwidget" android:resizeMode="vertical|horizontal" - android:widgetCategory="keyguard|home_screen" - > -</appwidget-provider> + android:widgetCategory="keyguard|home_screen" /> |