OSDN Git Service

am 7e827aca: (-s ours) Show a long dash instead of 0° if no temperature is available...
authorDaniel Sandler <dsandler@android.com>
Tue, 8 Dec 2009 16:03:16 +0000 (08:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Dec 2009 16:03:16 +0000 (08:03 -0800)
Merge commit '7e827acae69298441b970262a309a957c92da155' into eclair-mr2

* commit '7e827acae69298441b970262a309a957c92da155':
  Show a long dash instead of 0° if no temperature is available. (DO NOT MERGE)

28 files changed:
AndroidManifest.xml
res/layout/analog_appwidget.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-ru/strings.xml
res/values-sv/strings.xml
res/values-tr/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
src/com/android/deskclock/AlarmAlert.java
src/com/android/deskclock/AlarmAlertFullScreen.java
src/com/android/deskclock/AlarmClock.java
src/com/android/deskclock/AnalogAppWidgetProvider.java
src/com/android/deskclock/DeskClock.java
src/com/android/deskclock/SetAlarm.java

index b030918..fbc2ae6 100644 (file)
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.DEVICE_POWER" />
 
     <application android:label="@string/app_label"
                  android:icon="@drawable/ic_launcher_alarmclock">
index 7a32477..6a10611 100644 (file)
@@ -15,6 +15,7 @@
 -->
 
 <AnalogClock xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/analog_appwidget"
     android:dial="@drawable/appwidget_clock_dial"
     android:hand_hour="@drawable/appwidget_clock_hour"
     android:hand_minute="@drawable/appwidget_clock_minute"
index 29100ea..941bdcc 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Hodiny"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Budíky"</string>
+    <string name="app_label" msgid="6642875149600019623">"Budík"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Přidat budík"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Smazat budík"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Aktivovat budík"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Tento budík bude smazán."</string>
     <string name="show_clock" msgid="8358759982675616915">"Zobrazit hodiny"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Skrýt hodiny"</string>
   </string-array>
     <string name="done" msgid="6509722361933858451">"Hotovo"</string>
     <string name="revert" msgid="9100911171235162926">"Vrátit zpět"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Hlasitost budíku"</string>
-    <string name="alarm_volume_summary" msgid="8957440373896242438">"Nastavení hlasitosti budíků"</string>
+    <string name="alarm_volume_summary" msgid="8957440373896242438">"Nastavit hlasitost budíků"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Tichý"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"Vyberte, zda budík chcete ukončit nebo odložit."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (odloženo)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Budík byl nastaven na <xliff:g id="TIME">%s</xliff:g>. Můžete jej případně vybrat a zrušit."</string>
-    <string name="volume_button_setting_title" msgid="1892885285888644234">"Chování postranních tlačítek"</string>
+    <string name="volume_button_setting_title" msgid="1892885285888644234">"Chování postranního tlačítka"</string>
     <string name="volume_button_setting_summary" msgid="1594641247799573198">"Umožňuje nastavit chování postranních tlačítek při vyzvánění budíku"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Žádné"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Budíky"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galerie"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Hudba"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Ztlumit"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 6a3a12f..3ae56d3 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Ur"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmer"</string>
+    <string name="app_label" msgid="6642875149600019623">"Alarm"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Tilføj alarm"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Slet alarm"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Aktiver alarm"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Denne alarm slettes."</string>
     <string name="show_clock" msgid="8358759982675616915">"Vis ur"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Skjul ur"</string>
     <string name="label" msgid="162189613902857319">"Etiket"</string>
     <string name="default_label" msgid="5590025289805630372">"Alarm"</string>
-    <string name="set_alarm" msgid="9148359866152726808">"Angiv alarm"</string>
-    <string name="alarm_vibrate" msgid="3476686921490362230">"Vibration"</string>
+    <string name="set_alarm" msgid="9148359866152726808">"Indstil alarm"</string>
+    <string name="alarm_vibrate" msgid="3476686921490362230">"Vibrer"</string>
     <string name="alarm_repeat" msgid="7242985466344233206">"Gentag"</string>
     <string name="alert" msgid="6539852766423700221">"Ringetone"</string>
     <string name="time" msgid="8067216534232296518">"Tid"</string>
     <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Annuller"</string>
-    <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"Alarm slukkes efter <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <string name="alarm_alert_alert_silenced" msgid="7918075929961104202">"Alarm dæmpes efter <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Slumretilstand"</string>
     <string name="alarm_alert_snooze_set" msgid="656470966696912087">"Slumrer i <xliff:g id="MINUTES">%d</xliff:g> minutter."</string>
   <string-array name="alarm_set">
     <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> timer"</string>
     <string name="minute" msgid="2486157997434653710">"1 minut"</string>
     <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minutter"</string>
-    <string name="every_day" msgid="1058994798884544691">"hver dag"</string>
+    <string name="every_day" msgid="1058994798884544691">"Hver dag"</string>
     <string name="never" msgid="54104287800571769">"Aldrig"</string>
     <string name="day_concat" msgid="971998564991636532">", "</string>
-    <string name="clock_instructions" msgid="3118560284915857690">"Vælg det ur, der skal vises."</string>
+    <string name="clock_instructions" msgid="3118560284915857690">"Vælg et ur, der skal vises."</string>
     <string name="analog_gadget" msgid="1670505720837152766">"Analogt ur"</string>
     <string name="settings" msgid="5849739030579520686">"Indstillinger"</string>
-    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarm i lydløs tilstand"</string>
+    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarm er i lydløs tilstand"</string>
     <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Afspil alarm, selvom telefonen er i lydløs tilstand"</string>
     <string name="snooze_duration_title" msgid="1471249885139952670">"Slumretilstands varighed"</string>
   <string-array name="snooze_duration_entries">
     <item msgid="6048861883552402852">"25"</item>
     <item msgid="2740866721232379791">"30"</item>
   </string-array>
-    <string name="done" msgid="6509722361933858451">"Udfør"</string>
-    <string name="revert" msgid="9100911171235162926">"Annuller"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
-    <string name="alarm_volume_title" msgid="8506245173912428522">"Lydstyrke for alarm"</string>
-    <string name="alarm_volume_summary" msgid="8957440373896242438">"Angiv alarmernes lydstyrke"</string>
+    <string name="done" msgid="6509722361933858451">"Færdig"</string>
+    <string name="revert" msgid="9100911171235162926">"Vend tilbage"</string>
+    <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmlydstyrke"</string>
+    <string name="alarm_volume_summary" msgid="8957440373896242438">"Indstil alarmernes lydstyrke"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Lydløs"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"Vælg for at slumre eller annullere alarmen."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (slumretilstand)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarmen er indstillet til <xliff:g id="TIME">%s</xliff:g>. Vælg for at annullere."</string>
     <string name="volume_button_setting_title" msgid="1892885285888644234">"Sideknaps adfærd"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Angiv ønsket adfærd for sideknapperne, når der trykkes på dem under en alarm"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Indstil ønsket adfærd for sideknappen, når der trykkes på den under en alarm"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Ingen"</item>
     <item msgid="7111908302622811168">"Slumretilstand"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmer"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galleri"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Musik"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Dæmp"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 3acc531..9d07d6a 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Uhr"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Wecker"</string>
+    <string name="app_label" msgid="6642875149600019623">"Wecker"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Wecker hinzufügen"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Wecker löschen"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Wecker aktivieren"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Dieser Alarm wird gelöscht."</string>
     <string name="show_clock" msgid="8358759982675616915">"Uhr anzeigen"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Uhr ausblenden"</string>
   </string-array>
     <string name="done" msgid="6509722361933858451">"Fertig"</string>
     <string name="revert" msgid="9100911171235162926">"Zurücksetzen"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Lautstärke für Alarm"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Lautstärke des Weckers einstellen"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Lautlos"</string>
-    <string name="alarm_notify_text" msgid="4146350965933990093">"Für Snooze-Funktion oder Beenden auswählen"</string>
+    <string name="alarm_notify_text" msgid="4146350965933990093">"Für Snooze-Funktion oder Ablehnen der Weckerfunktion auswählen"</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (Snooze)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Wecker für <xliff:g id="TIME">%s</xliff:g> gestellt. Zum Abbrechen auswählen."</string>
-    <string name="volume_button_setting_title" msgid="1892885285888644234">"Funktion der seitlichen Tasten"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Verhalten der seitlichen Tasten während des Weckerklingelns"</string>
+    <string name="volume_button_setting_title" msgid="1892885285888644234">"Verhalten der seitlichen Schaltfläche"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Stellen Sie das gewünschte Verhalten der seitlichen Schaltflächen ein, wenn Sie während des Weckerklingelns gedrückt werden."</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Keine"</item>
     <item msgid="7111908302622811168">"Snooze-Funktion"</item>
-    <item msgid="8573552194573068996">"Beenden"</item>
+    <item msgid="8573552194573068996">"Verwerfen"</item>
   </string-array>
   <string-array name="volume_button_setting_values">
     <item msgid="4851033050639608752">"0"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Wecker"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galerie"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Musik"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Dimmen"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index d716fca..1b5953e 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Ρολόι"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Ειδοποιήσεις"</string>
+    <string name="app_label" msgid="6642875149600019623">"Ξυπνητήρι"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Προσθήκη ξυπνητηριού"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Διαγραφή ξυπνητηριού"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Ενεργοποίηση ξυπνητηριού"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Αυτό το ξυπνητήρι θα διαγραφεί."</string>
     <string name="show_clock" msgid="8358759982675616915">"Εμφάνιση ρολογιού"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Απόκρυψη ρολογιού"</string>
   </string-array>
     <string name="done" msgid="6509722361933858451">"Τέλος"</string>
     <string name="revert" msgid="9100911171235162926">"Επαναφορά"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Ένταση ήχου ξυπνητηριού"</string>
-    <string name="alarm_volume_summary" msgid="8957440373896242438">"Î\9fÏ\81ιÏ\83μÏ\8cÏ\82 Ï\84ηÏ\82 Î­Î½Ï\84αÏ\83ηÏ\82 Ï\84οÏ\85 Î®Ï\87οÏ\85 Î¾Ï\85Ï\80νηÏ\84ηÏ\81ιοÏ\8d"</string>
+    <string name="alarm_volume_summary" msgid="8957440373896242438">"Î\9fÏ\81ιÏ\83μÏ\8cÏ\82 Ï\84οÏ\85 Î±Ï\81ιθμοÏ\8d Ï\84Ï\89ν ÎµÎ¹Î´Î¿Ï\80οιήÏ\83εÏ\89ν"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Σίγαση"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"Επιλέξτε την αφύπνιση ή την παράβλεψη σε αυτό το ξυπνητήρι."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (αναβολή)"</string>
@@ -95,7 +85,7 @@
     <string name="volume_button_setting_title" msgid="1892885285888644234">"Συμπεριφορά πλευρικού κουμπιού"</string>
     <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ορίστε την επιθυμητή συμπεριφορά των πλαϊνών κουμπιών κατά τον ήχο του ξυπνητηριού"</string>
   <string-array name="volume_button_setting_entries">
-    <item msgid="4520420953175098625">"Î\9aαμία"</item>
+    <item msgid="4520420953175098625">"Î\9aανένα"</item>
     <item msgid="7111908302622811168">"Αφύπνιση"</item>
     <item msgid="8573552194573068996">"Παράβλεψη"</item>
   </string-array>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Ειδοποιήσεις"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Συλλογή"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Μουσική"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Θάμπωμα"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Εκκίνηση"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 965d330..661944e 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Reloj"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmas"</string>
+    <string name="app_label" msgid="6642875149600019623">"Alarma"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Agregar alarma"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Eliminar alarma"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Activar alarma"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Esta alarma se eliminará"</string>
     <string name="show_clock" msgid="8358759982675616915">"Mostrar reloj"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Ocultar reloj"</string>
@@ -62,8 +54,8 @@
     <string name="day_concat" msgid="971998564991636532">", "</string>
     <string name="clock_instructions" msgid="3118560284915857690">"Selecciona un reloj."</string>
     <string name="analog_gadget" msgid="1670505720837152766">"Reloj analógico"</string>
-    <string name="settings" msgid="5849739030579520686">"Config."</string>
-    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencio"</string>
+    <string name="settings" msgid="5849739030579520686">"Configuración"</string>
+    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencioso"</string>
     <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Reproducir alarma cuando el teléfono está en modo silencioso"</string>
     <string name="snooze_duration_title" msgid="1471249885139952670">"Duración de recurrencia"</string>
   <string-array name="snooze_duration_entries">
   </string-array>
     <string name="done" msgid="6509722361933858451">"Finalizado"</string>
     <string name="revert" msgid="9100911171235162926">"Revertir"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volumen de la alarma"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Establecer el volumen de las alarmas"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencioso"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"Seleccionar alarma recurrente o rechazar."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (recurrente)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Esta alarma se activará en <xliff:g id="TIME">%s</xliff:g>. Selecciona para cancelar."</string>
-    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comport. del botón lateral"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Activar el comport. deseado de los botones lat. durante una alarma"</string>
+    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento del botón lateral"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Activar el comportamiento deseado de los botones laterales cuando se presionen durante una alarma"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Ninguno"</item>
     <item msgid="7111908302622811168">"Recurrente"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmas"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galería"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Atenuar"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"Segmento <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 02b0df2..81c501e 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Reloj"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmas"</string>
+    <string name="app_label" msgid="6642875149600019623">"Alarma"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Añadir alarma"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Eliminar alarma"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Activar alarma"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Esta alarma se eliminará."</string>
     <string name="show_clock" msgid="8358759982675616915">"Mostrar reloj"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Ocultar reloj"</string>
@@ -65,7 +57,7 @@
     <string name="settings" msgid="5849739030579520686">"Configuración"</string>
     <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarma en modo silencio"</string>
     <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Reproducir alarma aunque el teléfono esté en modo silencio"</string>
-    <string name="snooze_duration_title" msgid="1471249885139952670">"Repetición de alarmas"</string>
+    <string name="snooze_duration_title" msgid="1471249885139952670">"Duración de la posposición"</string>
   <string-array name="snooze_duration_entries">
     <item msgid="8337408933053603125">"5 minutos"</item>
     <item msgid="5294206441496024610">"10 minutos"</item>
   </string-array>
     <string name="done" msgid="6509722361933858451">"Hecho"</string>
     <string name="revert" msgid="9100911171235162926">"Revertir"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volumen de alarma"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Establecer el volumen de las alarmas"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencio"</string>
-    <string name="alarm_notify_text" msgid="4146350965933990093">"Elige si deseas posponer o descartar esta alarma."</string>
+    <string name="alarm_notify_text" msgid="4146350965933990093">"Elija si desea posponer o descartar esta alarma."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (pospuesta)"</string>
-    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"La alarma sonará a las <xliff:g id="TIME">%s</xliff:g>. Selecciona la opción para cancelarla."</string>
-    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento de los botones laterales"</string>
+    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"La alarma sonará a las <xliff:g id="TIME">%s</xliff:g>. Seleccione la opción para cancelarla."</string>
+    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamiento de botón lateral"</string>
     <string name="volume_button_setting_summary" msgid="1594641247799573198">"Establecer el comportamiento deseado de los botones laterales cuando se pulsan durante una alarma"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Ninguno"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmas"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galería"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Atenuar"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Página principal"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index d5d7c16..e32ba49 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Horloge"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmes"</string>
+    <string name="app_label" msgid="6642875149600019623">"Réveil"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Ajouter alarme"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
-    <string name="delete_alarm" msgid="3457780990646206817">"Supprimer l\'alarme"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="delete_alarm" msgid="3457780990646206817">"Désactiver l\'alarme"</string>
+    <string name="enable_alarm" msgid="7442658245797418741">"Activer l\'alarme"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Cette alarme va être supprimée."</string>
     <string name="show_clock" msgid="8358759982675616915">"Afficher l\'horloge"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Masquer l\'horloge"</string>
@@ -64,7 +56,7 @@
     <string name="analog_gadget" msgid="1670505720837152766">"Horloge analogique"</string>
     <string name="settings" msgid="5849739030579520686">"Paramètres"</string>
     <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Alarme mode silencieux"</string>
-    <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Faire sonner l\'alarme même lorsque le téléphone est en mode silencieux"</string>
+    <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Faire sonner l\'alarme même lorsque le téléphone est en mode silencieux."</string>
     <string name="snooze_duration_title" msgid="1471249885139952670">"Répéter après"</string>
   <string-array name="snooze_duration_entries">
     <item msgid="8337408933053603125">"5 minutes"</item>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"Terminé"</string>
     <string name="revert" msgid="9100911171235162926">"Annuler"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volume"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Définir le volume des alarmes"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencieuse"</string>
@@ -93,7 +83,7 @@
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (répétition)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Prochaine alarme dans <xliff:g id="TIME">%s</xliff:g>. Sélectionnez l\'option appropriée pour annuler."</string>
     <string name="volume_button_setting_title" msgid="1892885285888644234">"Action du bouton latéral"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Définir les actions des boutons latéraux lors d\'une alarme"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Définissez les actions effectuées par les boutons latéraux lors d\'une alarme."</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Aucune"</item>
     <item msgid="7111908302622811168">"Répéter"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmes"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galerie"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Musique"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Assombrir"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Lanceur"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 55a589b..82e3a3f 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Orologio"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Sveglia"</string>
+    <string name="app_label" msgid="6642875149600019623">"Sveglia"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Aggiungi allarme"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Elimina allarme"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Attiva allarme"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Questa sveglia verrà eliminata."</string>
     <string name="show_clock" msgid="8358759982675616915">"Mostra orologio"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Nascondi orologio"</string>
@@ -63,7 +55,7 @@
     <string name="clock_instructions" msgid="3118560284915857690">"Seleziona un orologio."</string>
     <string name="analog_gadget" msgid="1670505720837152766">"Orologio analogico"</string>
     <string name="settings" msgid="5849739030579520686">"Impostazioni"</string>
-    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Allarme in mod. silenz."</string>
+    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"Allarme in mod. silenziosa"</string>
     <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"Riproduci allarme anche con telefono in modalità silenziosa"</string>
     <string name="snooze_duration_title" msgid="1471249885139952670">"Durata sospensione"</string>
   <string-array name="snooze_duration_entries">
   </string-array>
     <string name="done" msgid="6509722361933858451">"Fine"</string>
     <string name="revert" msgid="9100911171235162926">"Annulla modifiche"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volume allarme"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Imposta il volume degli allarmi"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Silenzioso"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"Seleziona per sospendere o eliminare questo allarme."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (sospeso)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"L\'allarme sarà attivato alle <xliff:g id="TIME">%s</xliff:g>. Seleziona per annullare."</string>
-    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comp. pulsante laterale"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Imposta il comport. dei puls. laterali quando vengono premuti durante un allarme"</string>
+    <string name="volume_button_setting_title" msgid="1892885285888644234">"Comportamento pulsante laterale"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Imposta il comportamento desiderato dei pulsanti laterali quando vengono premuti durante un allarme"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Nessuno"</item>
     <item msgid="7111908302622811168">"Sospendi"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Sveglia"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galleria"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Musica"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Abbassa"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index cefd752..ec3f71a 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"時計"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"アラーム"</string>
+    <string name="app_label" msgid="6642875149600019623">"アラーム"</string>
     <string name="add_alarm" msgid="5976616107390962899">"アラームの設定"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"アラームを削除"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"アラームON"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"このアラームを削除します。"</string>
     <string name="show_clock" msgid="8358759982675616915">"時計を表示"</string>
     <string name="hide_clock" msgid="3217727306480505694">"時計を隠す"</string>
     <string name="alarm_alert_snooze_set" msgid="656470966696912087">"<xliff:g id="MINUTES">%d</xliff:g>分後に再通知します"</string>
   <string-array name="alarm_set">
     <item msgid="5163476010406761625">"アラームは今から1分以内に設定されています。"</item>
-    <item msgid="7110525731259629055">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>後に設定されています。"</item>
-    <item msgid="7003982794086186185">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>後に設定されています。"</item>
-    <item msgid="7311021123230077742">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="HOURS">%2$s</xliff:g>後に設定されています。"</item>
-    <item msgid="8431715191823114872">"アラームは<xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
-    <item msgid="3244151088673185428">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
-    <item msgid="3663661342600168814">"アラームは<xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
-    <item msgid="7779544127785487304">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>と<xliff:g id="HOURS">%2$s</xliff:g><xliff:g id="MINUTES">%3$s</xliff:g>後に設定されています。"</item>
+    <item msgid="7110525731259629055">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>後に設定されています。"</item>
+    <item msgid="7003982794086186185">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>時間後に設定されています。"</item>
+    <item msgid="7311021123230077742">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="HOURS">%2$s</xliff:g>時間後に設定されています。"</item>
+    <item msgid="8431715191823114872">"ã\82¢ã\83©ã\83¼ã\83 ã\81¯<xliff:g id="MINUTES">%3$s</xliff:g>å\88\86å¾\8cã\81«è¨­å®\9aã\81\95ã\82\8cã\81¦ã\81\84ã\81¾ã\81\99ã\80\82"</item>
+    <item msgid="3244151088673185428">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
+    <item msgid="3663661342600168814">"アラームは<xliff:g id="HOURS">%2$s</xliff:g>時間<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
+    <item msgid="7779544127785487304">"アラームは<xliff:g id="DAYS">%1$s</xliff:g>日と<xliff:g id="HOURS">%2$s</xliff:g>時間<xliff:g id="MINUTES">%3$s</xliff:g>分後に設定されています。"</item>
   </string-array>
     <string name="day" msgid="7984755014526510295">"1日"</string>
     <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g>日"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"完了"</string>
     <string name="revert" msgid="9100911171235162926">"キャンセル"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"アラームの音量"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"アラームの音量を設定します"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"マナーモード"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"アラーム"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"ギャラリー"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"音楽"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"暗くする"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"ランチャー"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index a1b5c65..fe23b19 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"시계"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"알람"</string>
+    <string name="app_label" msgid="6642875149600019623">"알람"</string>
     <string name="add_alarm" msgid="5976616107390962899">"알람 추가"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"알람 삭제"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"알람 사용"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"알람이 삭제됩니다."</string>
     <string name="show_clock" msgid="8358759982675616915">"시계 표시"</string>
     <string name="hide_clock" msgid="3217727306480505694">"시계 숨기기"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"완료"</string>
     <string name="revert" msgid="9100911171235162926">"되돌리기"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"알람 볼륨"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"알람 볼륨 설정"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"무음"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"알람"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"갤러리"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"음악"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"낮추기"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 9003abd..9799fd1 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Klokke"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmer"</string>
+    <string name="app_label" msgid="6642875149600019623">"Alarm"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Legg til alarm"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Slett alarm"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Aktiver alarm"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Denne alarmen vil bli slettet."</string>
     <string name="show_clock" msgid="8358759982675616915">"Vis klokke"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Skjul klokke"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Slumre"</string>
     <string name="alarm_alert_snooze_set" msgid="656470966696912087">"Slumrer i <xliff:g id="MINUTES">%d</xliff:g> minutter."</string>
   <string-array name="alarm_set">
-    <item msgid="5163476010406761625">"Alarmen ringer om mindre enn ett minutt."</item>
-    <item msgid="7110525731259629055">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g>."</item>
-    <item msgid="7003982794086186185">"Alarmen ringer om <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="7311021123230077742">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="HOURS">%2$s</xliff:g>."</item>
-    <item msgid="8431715191823114872">"Alarmen ringer om <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="3244151088673185428">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="3663661342600168814">"Alarmen ringer om <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
-    <item msgid="7779544127785487304">"Alarmen ringer om <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
+    <item msgid="5163476010406761625">"Denne alarmen er innstilt på under ett minutt fra nå."</item>
+    <item msgid="7110525731259629055">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g> fra nå."</item>
+    <item msgid="7003982794086186185">"Denne alarmen er innstilt på <xliff:g id="HOURS">%2$s</xliff:g>  fra nå."</item>
+    <item msgid="7311021123230077742">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="HOURS">%2$s</xliff:g> fra nå."</item>
+    <item msgid="8431715191823114872">"Denne alarmen er innstilt på <xliff:g id="MINUTES">%3$s</xliff:g>  fra nå."</item>
+    <item msgid="3244151088673185428">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nå."</item>
+    <item msgid="3663661342600168814">"Denne alarmen er innstilt på  <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nå."</item>
+    <item msgid="7779544127785487304">"Denne alarmen er innstilt på <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> og <xliff:g id="MINUTES">%3$s</xliff:g> fra nå."</item>
   </string-array>
     <string name="day" msgid="7984755014526510295">"1 dag"</string>
     <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> dager"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"OK"</string>
     <string name="revert" msgid="9100911171235162926">"Tilbakestill"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmvolum"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Still inn volumet på alarmer"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Stille"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmer"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galleri"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Musikk"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Demp"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Hjem"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 715fb69..8fe1cd2 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Klok"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmen"</string>
+    <string name="app_label" msgid="6642875149600019623">"Wekker"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Alarm toevoegen"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Alarm verwijderen"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Alarm inschakelen"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Dit alarm wordt verwijderd."</string>
     <string name="show_clock" msgid="8358759982675616915">"Klok weergeven"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Klok verbergen"</string>
   </string-array>
     <string name="done" msgid="6509722361933858451">"Gereed"</string>
     <string name="revert" msgid="9100911171235162926">"Terugzetten"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmvolume"</string>
-    <string name="alarm_volume_summary" msgid="8957440373896242438">"Het volume van het alarm instellen"</string>
+    <string name="alarm_volume_summary" msgid="8957440373896242438">"Het volume van alarmen instellen"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Stil"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"Selecteer of u snooze wilt selecteren voor dit alarm of het alarm wilt negeren."</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (snooze aan)"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmen"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galerij"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Muziek"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Dimmen"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 6bbc24a..dd9cf1d 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Zegar"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmy"</string>
+    <string name="app_label" msgid="6642875149600019623">"Budzik"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Dodaj alarm"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Usuń alarm"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Włącz alarm"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Ten zegar zostanie usunięty."</string>
     <string name="show_clock" msgid="8358759982675616915">"Pokaż zegar"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Ukryj zegar"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"Gotowe"</string>
     <string name="revert" msgid="9100911171235162926">"Przywróć"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Głośność alarmu"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Ustaw głośność alarmów"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Cichy"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmy"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galeria"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Muzyka"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Przyciemnij"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Program uruchamiający"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 334eed8..2cdabb7 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Relógio"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmes"</string>
+    <string name="app_label" msgid="6642875149600019623">"Despertador"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Adicionar alarme"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Eliminar alarme"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Activar alarme"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Este alarme será eliminado."</string>
     <string name="show_clock" msgid="8358759982675616915">"Mostrar relógio"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Ocultar relógio"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"Concluído"</string>
     <string name="revert" msgid="9100911171235162926">"Reverter"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volume do alarme"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Definir o volume dos alarmes"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencioso"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmes"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galeria"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Esbater"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 10d56ca..485a372 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Relógio"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmes"</string>
+    <string name="app_label" msgid="6642875149600019623">"Despertador"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Adicionar alarme"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Excluir alarme"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Ativar alarme"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Este alarme será excluído."</string>
     <string name="show_clock" msgid="8358759982675616915">"Mostrar relógio"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Ocultar relógio"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"Concluído"</string>
     <string name="revert" msgid="9100911171235162926">"Reverter"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Volume do alarme"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Definir o volume dos alarmes"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Silencioso"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmes"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galeria"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Música"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Escurecer"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 4218aba..a4a0a1a 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Часы"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Будильник"</string>
+    <string name="app_label" msgid="6642875149600019623">"Будильник"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Добавить будильник"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Удалить будильник"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Включить будильник"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Сигнал будет удален."</string>
     <string name="show_clock" msgid="8358759982675616915">"Показать часы"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Спрятать часы"</string>
     <string name="label" msgid="162189613902857319">"Ярлык"</string>
     <string name="default_label" msgid="5590025289805630372">"Будильник"</string>
     <string name="set_alarm" msgid="9148359866152726808">"Установить будильник"</string>
-    <string name="alarm_vibrate" msgid="3476686921490362230">"Ð\92ибÑ\80оÑ\81игнал"</string>
+    <string name="alarm_vibrate" msgid="3476686921490362230">"Ð\92ибÑ\80аÑ\86иÑ\8f"</string>
     <string name="alarm_repeat" msgid="7242985466344233206">"Повтор"</string>
     <string name="alert" msgid="6539852766423700221">"Мелодия"</string>
     <string name="time" msgid="8067216534232296518">"Время"</string>
@@ -83,9 +75,7 @@
     <item msgid="2740866721232379791">"30"</item>
   </string-array>
     <string name="done" msgid="6509722361933858451">"Готово"</string>
-    <string name="revert" msgid="9100911171235162926">"Отмена"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
+    <string name="revert" msgid="9100911171235162926">"Отменить изменения"</string>
     <string name="alarm_volume_title" msgid="8506245173912428522">"Громкость будильника"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Настройка громкости будильника"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Без звука"</string>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Будильник"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Фотоальбом"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Музыка"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Затемнить"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index ac527d3..a5ab833 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Klocka"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarm"</string>
+    <string name="app_label" msgid="6642875149600019623">"Alarm"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Lägg till alarm"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Ta bort alarm"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Aktivera alarmet"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Alarmet tas bort."</string>
     <string name="show_clock" msgid="8358759982675616915">"Visa klocka"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Dölj klocka"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"Färdig"</string>
     <string name="revert" msgid="9100911171235162926">"Återgå"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Alarmvolym"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Ställ in volym för alarmen"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Tyst"</string>
@@ -93,9 +83,9 @@
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (snoozat)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"Alarmet ringer <xliff:g id="TIME">%s</xliff:g>. Välj om du vill avbryta."</string>
     <string name="volume_button_setting_title" msgid="1892885285888644234">"Sidoknappens funktion"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ange önskad funktion för sidoknappen under alarm"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Ange önskad funktion för sidoknapparna om de används under ett alarm"</string>
   <string-array name="volume_button_setting_entries">
-    <item msgid="4520420953175098625">"Ingen"</item>
+    <item msgid="4520420953175098625">"Inga"</item>
     <item msgid="7111908302622811168">"Snooze"</item>
     <item msgid="8573552194573068996">"Ta bort permanent"</item>
   </string-array>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarm"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galleri"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Musik"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Dämpa"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Startbild"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 4a92f8e..57927a1 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"Saat"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmlar"</string>
+    <string name="app_label" msgid="6642875149600019623">"Çalar Saat"</string>
     <string name="add_alarm" msgid="5976616107390962899">"Alarm ekle"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"Alarmı sil"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"Alarmı etkinleştir"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"Bu alarm silinecek."</string>
     <string name="show_clock" msgid="8358759982675616915">"Saati göster"</string>
     <string name="hide_clock" msgid="3217727306480505694">"Saati gizle"</string>
@@ -84,8 +76,6 @@
   </string-array>
     <string name="done" msgid="6509722361933858451">"Bitti"</string>
     <string name="revert" msgid="9100911171235162926">"Geri Döndür"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"Alarm ses düzeyi"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"Alarmların ses düzeyini ayarla"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"Sessiz"</string>
@@ -93,7 +83,7 @@
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (ertelendi)"</string>
     <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"<xliff:g id="TIME">%s</xliff:g> için alarm ayarlandı. İptal etmek için seçin."</string>
     <string name="volume_button_setting_title" msgid="1892885285888644234">"Yan düğme işlevi"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Alarm sırasında basıldığında istenen yan düğme işlevini ayarlayın"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"Alarm sırasında basıldığında yan düğmenin nasıl işlev görmesini istediğinizi ayarlayın"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"Yok"</item>
     <item msgid="7111908302622811168">"Ertele"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarm çalar"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galeri"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Müzik"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"Loş"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Başlatıcı"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 0019027..2740266 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"时钟"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"闹钟"</string>
+    <string name="app_label" msgid="6642875149600019623">"闹钟"</string>
     <string name="add_alarm" msgid="5976616107390962899">"添加闹钟"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"取消闹钟"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"启用闹钟"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"将会取消此闹钟。"</string>
     <string name="show_clock" msgid="8358759982675616915">"显示时钟"</string>
     <string name="hide_clock" msgid="3217727306480505694">"隐藏时钟"</string>
     <string name="alarm_alert_snooze_set" msgid="656470966696912087">"暂停 <xliff:g id="MINUTES">%d</xliff:g> 分钟。"</string>
   <string-array name="alarm_set">
     <item msgid="5163476010406761625">"已将此闹钟设置为从现在起不到 1 分钟后提醒。"</item>
-    <item msgid="7110525731259629055">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g>后启动。"</item>
-    <item msgid="7003982794086186185">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g>后启动。"</item>
-    <item msgid="7311021123230077742">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>后启动。"</item>
-    <item msgid="8431715191823114872">"已将此闹钟设置为从现在起 <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
-    <item msgid="3244151088673185428">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
-    <item msgid="3663661342600168814">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
-    <item msgid="7779544127785487304">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后启动。"</item>
+    <item msgid="7110525731259629055">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g>后提醒。"</item>
+    <item msgid="7003982794086186185">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g>后提醒。"</item>
+    <item msgid="7311021123230077742">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g>后提醒。"</item>
+    <item msgid="8431715191823114872">"已将此闹钟设置为从现在起 <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
+    <item msgid="3244151088673185428">"已将此闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
+    <item msgid="3663661342600168814">"已将此闹钟设置为从现在起 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
+    <item msgid="7779544127785487304">"已将该闹钟设置为从现在起 <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>后提醒。"</item>
   </string-array>
     <string name="day" msgid="7984755014526510295">"1 天"</string>
     <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
@@ -63,9 +55,9 @@
     <string name="clock_instructions" msgid="3118560284915857690">"选择要显示的时钟。"</string>
     <string name="analog_gadget" msgid="1670505720837152766">"模拟时钟"</string>
     <string name="settings" msgid="5849739030579520686">"设置"</string>
-    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"静音模式下的闹钟"</string>
-    <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"手机处于静音模式时,闹钟仍会响"</string>
-    <string name="snooze_duration_title" msgid="1471249885139952670">"æ\9a\82å\81\9cæ\97¶é\97´"</string>
+    <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"在静音模式下提醒"</string>
+    <string name="alarm_in_silent_mode_summary" msgid="6042500263899922832">"当手机处于静音模式时,同样进行提醒"</string>
+    <string name="snooze_duration_title" msgid="1471249885139952670">"æ\9a\82å\81\9cæ\97¶é\95¿"</string>
   <string-array name="snooze_duration_entries">
     <item msgid="8337408933053603125">"5 分钟"</item>
     <item msgid="5294206441496024610">"10 分钟"</item>
   </string-array>
     <string name="done" msgid="6509722361933858451">"完成"</string>
     <string name="revert" msgid="9100911171235162926">"还原"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"闹钟音量"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"设置闹钟音量"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"静音"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"选择暂停或关闭此闹钟。"</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g>(已暂停)"</string>
-    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已将此闹钟设置在 <xliff:g id="TIME">%s</xliff:g>启动。选择即可取消。"</string>
-    <string name="volume_button_setting_title" msgid="1892885285888644234">"侧边按钮功用"</string>
-    <string name="volume_button_setting_summary" msgid="1594641247799573198">"设置侧边按钮在闹钟启动时的功用"</string>
+    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已将闹钟设置为从现在起 <xliff:g id="TIME">%s</xliff:g>后再提醒。选中可以取消。"</string>
+    <string name="volume_button_setting_title" msgid="1892885285888644234">"侧按钮行为"</string>
+    <string name="volume_button_setting_summary" msgid="1594641247799573198">"根据需要设置闹钟响时按侧按钮所期望出现的行为"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="4520420953175098625">"无"</item>
     <item msgid="7111908302622811168">"暂停"</item>
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"闹钟"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"图库"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"音乐"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"调暗"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"启动程序"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index b8f421c..69bab56 100644 (file)
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="6674495003718166674">"時鐘"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"鬧鐘"</string>
+    <string name="app_label" msgid="6642875149600019623">"鬧鐘"</string>
     <string name="add_alarm" msgid="5976616107390962899">"新增鬧鐘"</string>
-    <!-- no translation found for menu_desk_clock (3241995064554071588) -->
-    <skip />
-    <!-- no translation found for menu_edit_alarm (7204602994918829751) -->
-    <skip />
     <string name="delete_alarm" msgid="3457780990646206817">"刪除鬧鐘"</string>
-    <!-- no translation found for enable_alarm (1834599140632142536) -->
-    <skip />
-    <!-- no translation found for disable_alarm (5889378670229554109) -->
-    <skip />
+    <string name="enable_alarm" msgid="7442658245797418741">"啟用鬧鐘"</string>
     <string name="delete_alarm_confirm" msgid="4237696873219106907">"刪除此鬧鐘?"</string>
     <string name="show_clock" msgid="8358759982675616915">"顯示時鐘"</string>
     <string name="hide_clock" msgid="3217727306480505694">"隱藏時鐘"</string>
     <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"貪睡"</string>
     <string name="alarm_alert_snooze_set" msgid="656470966696912087">"再貪睡 <xliff:g id="MINUTES">%d</xliff:g> 分鐘。"</string>
   <string-array name="alarm_set">
-    <item msgid="5163476010406761625">"已將此鬧鐘設為 1 分後啟動。"</item>
-    <item msgid="7110525731259629055">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>後啟動。"</item>
-    <item msgid="7003982794086186185">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
-    <item msgid="7311021123230077742">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="HOURS">%2$s</xliff:g>後啟動。"</item>
-    <item msgid="8431715191823114872">"已將此鬧鐘設為 <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
-    <item msgid="3244151088673185428">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
-    <item msgid="3663661342600168814">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
-    <item msgid="7779544127785487304">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g>又 <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>後啟動。"</item>
+    <item msgid="5163476010406761625">"已將此鬧鐘設為 1 分後啟動。"</item>
+    <item msgid="7110525731259629055">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天後啟動。"</item>
+    <item msgid="7003982794086186185">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> 小時後啟動。"</item>
+    <item msgid="7311021123230077742">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天 <xliff:g id="HOURS">%2$s</xliff:g> 小時後啟動。"</item>
+    <item msgid="8431715191823114872">"已將此鬧鐘設為 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
+    <item msgid="3244151088673185428">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天又 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
+    <item msgid="3663661342600168814">"已將此鬧鐘設為 <xliff:g id="HOURS">%2$s</xliff:g> 小時 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
+    <item msgid="7779544127785487304">"已將此鬧鐘設為 <xliff:g id="DAYS">%1$s</xliff:g> 天又 <xliff:g id="HOURS">%2$s</xliff:g> 小時 <xliff:g id="MINUTES">%3$s</xliff:g> 分鐘後啟動。"</item>
   </string-array>
     <string name="day" msgid="7984755014526510295">"1 天"</string>
     <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> 天"</string>
@@ -60,7 +52,7 @@
     <string name="every_day" msgid="1058994798884544691">"每天"</string>
     <string name="never" msgid="54104287800571769">"從不"</string>
     <string name="day_concat" msgid="971998564991636532">"、 "</string>
-    <string name="clock_instructions" msgid="3118560284915857690">"選取顯示的時鐘。"</string>
+    <string name="clock_instructions" msgid="3118560284915857690">"選取顯示的時鐘。"</string>
     <string name="analog_gadget" msgid="1670505720837152766">"類比時鐘"</string>
     <string name="settings" msgid="5849739030579520686">"設定"</string>
     <string name="alarm_in_silent_mode_title" msgid="3892612644543516705">"靜音模式下的鬧鐘"</string>
   </string-array>
     <string name="done" msgid="6509722361933858451">"完成"</string>
     <string name="revert" msgid="9100911171235162926">"復原"</string>
-    <!-- no translation found for delete (5732434972457000541) -->
-    <skip />
     <string name="alarm_volume_title" msgid="8506245173912428522">"鬧鐘音量"</string>
     <string name="alarm_volume_summary" msgid="8957440373896242438">"設定鬧鐘音量"</string>
     <string name="silent_alarm_summary" msgid="8605302849408279221">"靜音"</string>
     <string name="alarm_notify_text" msgid="4146350965933990093">"選取貪睡功能或關閉此鬧鐘。"</string>
     <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (貪睡)"</string>
-    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"鬧鐘設定在 <xliff:g id="TIME">%s</xliff:g>,選取即可取消"</string>
+    <string name="alarm_notify_snooze_text" msgid="8004830999152609519">"已將鬧鐘設定在 <xliff:g id="TIME">%s</xliff:g>,選取即可取消。"</string>
     <string name="volume_button_setting_title" msgid="1892885285888644234">"側邊按鈕功用"</string>
     <string name="volume_button_setting_summary" msgid="1594641247799573198">"設定側邊按鈕在鬧鐘啟動時的功用"</string>
   <string-array name="volume_button_setting_entries">
     <item msgid="3204893476515513084">"1"</item>
     <item msgid="7687709558968154577">"2"</item>
   </string-array>
-    <string name="alarm_button_description" msgid="740283647046258651">"鬧鐘"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"圖片庫"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"音樂"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"微暗"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Launcher"</string>
-    <!-- no translation found for desk_clock_button_description (968868045496561043) -->
-    <skip />
-    <string name="battery_charging_level" msgid="4391767951302394083">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
-    <!-- no translation found for weather_fetch_failure (7517010911981312358) -->
-    <skip />
 </resources>
index 6319dff..72b8a3b 100644 (file)
 
 package com.android.deskclock;
 
-import android.app.Activity;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
+import android.app.KeyguardManager;
 import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.LayoutInflater;
-import android.view.Window;
+import android.os.Handler;
+import android.os.Message;
 import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.Toast;
-import android.widget.TextView;
-
-import java.util.Calendar;
 
 /**
- * Alarm Clock alarm alert: pops visible indicator and plays alarm
- * tone
+ * Full screen alarm alert: pops visible indicator and plays alarm tone. This
+ * activity shows the alert as a dialog.
  */
-public class AlarmAlert extends Activity {
-
-    // These defaults must match the values in res/xml/settings.xml
-    private static final String DEFAULT_SNOOZE = "10";
-    private static final String DEFAULT_VOLUME_BEHAVIOR = "2";
+public class AlarmAlert extends AlarmAlertFullScreen {
 
-    private Alarm mAlarm;
-    private int mVolumeBehavior;
+    // If we try to check the keyguard more than 5 times, just launch the full
+    // screen activity.
+    private int mKeyguardRetryCount;
+    private final int MAX_KEYGUARD_CHECKS = 5;
 
-    // Receives the ALARM_KILLED action from the AlarmKlaxon.
-    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+    private final Handler mHandler = new Handler() {
         @Override
-        public void onReceive(Context context, Intent intent) {
-            Alarm alarm = intent.getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
-            if (mAlarm.id == alarm.id) {
-                dismiss(true);
-            }
+        public void handleMessage(Message msg) {
+            handleScreenOff((KeyguardManager) msg.obj);
         }
     };
 
+    private final BroadcastReceiver mScreenOffReceiver =
+            new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    KeyguardManager km =
+                            (KeyguardManager) context.getSystemService(
+                            Context.KEYGUARD_SERVICE);
+                    handleScreenOff(km);
+                }
+            };
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mAlarm = getIntent().getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
-
-        // Get the volume/camera button behavior setting
-        final String vol =
-                PreferenceManager.getDefaultSharedPreferences(this)
-                .getString(SettingsActivity.KEY_VOLUME_BEHAVIOR,
-                        DEFAULT_VOLUME_BEHAVIOR);
-        mVolumeBehavior = Integer.parseInt(vol);
-
-        requestWindowFeature(android.view.Window.FEATURE_NO_TITLE);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
-                | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
-        updateLayout();
-
-        // Register to get the alarm killed intent.
-        registerReceiver(mReceiver, new IntentFilter(Alarms.ALARM_KILLED));
-    }
-
-    private void setTitle() {
-        String label = mAlarm.getLabelOrDefault(this);
-        TextView title = (TextView) findViewById(R.id.alertTitle);
-        title.setText(label);
-    }
-
-    // This method is overwritten in AlarmAlertFullScreen in order to show a
-    // full activity with the wallpaper as the background.
-    protected View inflateView(LayoutInflater inflater) {
-        return inflater.inflate(R.layout.alarm_alert, null);
+        // Listen for the screen turning off so that when the screen comes back
+        // on, the user does not need to unlock the phone to dismiss the alarm.
+        registerReceiver(mScreenOffReceiver,
+                new IntentFilter(Intent.ACTION_SCREEN_OFF));
     }
 
-    private void updateLayout() {
-        LayoutInflater inflater = LayoutInflater.from(this);
-
-        setContentView(inflateView(inflater));
-
-        /* snooze behavior: pop a snooze confirmation view, kick alarm
-           manager. */
-        Button snooze = (Button) findViewById(R.id.snooze);
-        snooze.requestFocus();
-        snooze.setOnClickListener(new Button.OnClickListener() {
-            public void onClick(View v) {
-                snooze();
-            }
-        });
-
-        /* dismiss button: close notification */
-        findViewById(R.id.dismiss).setOnClickListener(
-                new Button.OnClickListener() {
-                    public void onClick(View v) {
-                        dismiss(false);
-                    }
-                });
-
-        /* Set the title from the passed in alarm */
-        setTitle();
-    }
-
-    // Attempt to snooze this alert.
-    private void snooze() {
-        final String snooze =
-                PreferenceManager.getDefaultSharedPreferences(this)
-                .getString(SettingsActivity.KEY_ALARM_SNOOZE, DEFAULT_SNOOZE);
-        int snoozeMinutes = Integer.parseInt(snooze);
-
-        final long snoozeTime = System.currentTimeMillis()
-                + (1000 * 60 * snoozeMinutes);
-        Alarms.saveSnoozeAlert(AlarmAlert.this, mAlarm.id, snoozeTime);
-
-        // Get the display time for the snooze and update the notification.
-        final Calendar c = Calendar.getInstance();
-        c.setTimeInMillis(snoozeTime);
-
-        // Append (snoozed) to the label.
-        String label = mAlarm.getLabelOrDefault(this);
-        label = getString(R.string.alarm_notify_snooze_label, label);
-
-        // Notify the user that the alarm has been snoozed.
-        Intent cancelSnooze = new Intent(this, AlarmReceiver.class);
-        cancelSnooze.setAction(Alarms.CANCEL_SNOOZE);
-        cancelSnooze.putExtra(Alarms.ALARM_ID, mAlarm.id);
-        PendingIntent broadcast =
-                PendingIntent.getBroadcast(this, mAlarm.id, cancelSnooze, 0);
-        NotificationManager nm = getNotificationManager();
-        Notification n = new Notification(R.drawable.stat_notify_alarm,
-                label, 0);
-        n.setLatestEventInfo(this, label,
-                getString(R.string.alarm_notify_snooze_text,
-                    Alarms.formatTime(this, c)), broadcast);
-        n.flags |= Notification.FLAG_AUTO_CANCEL
-                | Notification.FLAG_ONGOING_EVENT;
-        nm.notify(mAlarm.id, n);
-
-        String displayTime = getString(R.string.alarm_alert_snooze_set,
-                snoozeMinutes);
-        // Intentionally log the snooze time for debugging.
-        Log.v(displayTime);
-
-        // Display the snooze minutes in a toast.
-        Toast.makeText(AlarmAlert.this, displayTime, Toast.LENGTH_LONG).show();
-        stopService(new Intent(Alarms.ALARM_ALERT_ACTION));
-        finish();
-    }
-
-    private NotificationManager getNotificationManager() {
-        return (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-    }
-
-    // Dismiss the alarm.
-    private void dismiss(boolean killed) {
-        // The service told us that the alarm has been killed, do not modify
-        // the notification or stop the service.
-        if (!killed) {
-            // Cancel the notification and stop playing the alarm
-            NotificationManager nm = getNotificationManager();
-            nm.cancel(mAlarm.id);
-            stopService(new Intent(Alarms.ALARM_ALERT_ACTION));
-        }
-        finish();
-    }
-
-    /**
-     * this is called when a second alarm is triggered while a
-     * previous alert window is still active.
-     */
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-
-        if (Log.LOGV) Log.v("AlarmAlert.OnNewIntent()");
-
-        mAlarm = intent.getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
-
-        setTitle();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        // Don't hang around.
-        finish();
-    }
-    
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if (Log.LOGV) Log.v("AlarmAlert.onDestroy()");
-        // No longer care about the alarm being killed.
-        unregisterReceiver(mReceiver);
+        unregisterReceiver(mScreenOffReceiver);
+        // Remove any of the keyguard messages just in case
+        mHandler.removeMessages(0);
     }
 
     @Override
-    public boolean dispatchKeyEvent(KeyEvent event) {
-        // Do this on key down to handle a few of the system keys.
-        boolean up = event.getAction() == KeyEvent.ACTION_UP;
-        switch (event.getKeyCode()) {
-            // Volume keys and camera keys dismiss the alarm
-            case KeyEvent.KEYCODE_VOLUME_UP:
-            case KeyEvent.KEYCODE_VOLUME_DOWN:
-            case KeyEvent.KEYCODE_CAMERA:
-            case KeyEvent.KEYCODE_FOCUS:
-                if (up) {
-                    switch (mVolumeBehavior) {
-                        case 1:
-                            snooze();
-                            break;
+    public void onBackPressed() {
+        finish();
+    }
 
-                        case 2:
-                            dismiss(false);
-                            break;
+    private boolean checkRetryCount() {
+        if (mKeyguardRetryCount++ >= MAX_KEYGUARD_CHECKS) {
+            Log.e("Tried to read keyguard status too many times, bailing...");
+            return false;
+        }
+        return true;
+    }
 
-                        default:
-                            break;
-                    }
-                }
-                return true;
-            default:
-                break;
+    private void handleScreenOff(final KeyguardManager km) {
+        if (!km.inKeyguardRestrictedInputMode() && checkRetryCount()) {
+            if (checkRetryCount()) {
+                mHandler.sendMessageDelayed(mHandler.obtainMessage(0, km), 500);
+            }
+        } else {
+            // Launch the full screen activity but do not turn the screen on.
+            Intent i = new Intent(this, AlarmAlertFullScreen.class);
+            i.putExtra(Alarms.ALARM_INTENT_EXTRA, mAlarm);
+            i.putExtra(SCREEN_OFF, true);
+            startActivity(i);
+            finish();
         }
-        return super.dispatchKeyEvent(event);
     }
 }
index fe7d61d..3442da3 100644 (file)
 
 package com.android.deskclock;
 
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.BroadcastReceiver;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.LayoutInflater;
+import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.Toast;
+import android.widget.TextView;
+
+import java.util.Calendar;
 
 /**
- * Full screen alarm alert: pops visible indicator and plays alarm tone. This
- * activity displays the alert in full screen in order to be secure. The
- * background is the current wallpaper.
+ * Alarm Clock alarm alert: pops visible indicator and plays alarm
+ * tone. This activity is the full screen version which shows over the lock
+ * screen with the wallpaper as the background.
  */
-public class AlarmAlertFullScreen extends AlarmAlert {
+public class AlarmAlertFullScreen extends Activity {
+
+    // These defaults must match the values in res/xml/settings.xml
+    private static final String DEFAULT_SNOOZE = "10";
+    private static final String DEFAULT_VOLUME_BEHAVIOR = "2";
+    protected static final String SCREEN_OFF = "screen_off";
+
+    protected Alarm mAlarm;
+    private int mVolumeBehavior;
+
+    // Receives the ALARM_KILLED action from the AlarmKlaxon.
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Alarm alarm = intent.getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
+            if (alarm != null && mAlarm.id == alarm.id) {
+                dismiss(true);
+            }
+        }
+    };
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+
+        mAlarm = getIntent().getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
+
+        // Get the volume/camera button behavior setting
+        final String vol =
+                PreferenceManager.getDefaultSharedPreferences(this)
+                .getString(SettingsActivity.KEY_VOLUME_BEHAVIOR,
+                        DEFAULT_VOLUME_BEHAVIOR);
+        mVolumeBehavior = Integer.parseInt(vol);
+
+        requestWindowFeature(android.view.Window.FEATURE_NO_TITLE);
+
+        final Window win = getWindow();
+        win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+        // Turn on the screen unless we are being launched from the AlarmAlert
+        // subclass.
+        if (!getIntent().getBooleanExtra(SCREEN_OFF, false)) {
+            win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+
+        updateLayout();
+
+        // Register to get the alarm killed intent.
+        registerReceiver(mReceiver, new IntentFilter(Alarms.ALARM_KILLED));
+    }
+
+    private void setTitle() {
+        String label = mAlarm.getLabelOrDefault(this);
+        TextView title = (TextView) findViewById(R.id.alertTitle);
+        title.setText(label);
+    }
+
+    private void updateLayout() {
+        LayoutInflater inflater = LayoutInflater.from(this);
+
+        setContentView(inflater.inflate(R.layout.alarm_alert, null));
+
+        /* snooze behavior: pop a snooze confirmation view, kick alarm
+           manager. */
+        Button snooze = (Button) findViewById(R.id.snooze);
+        snooze.requestFocus();
+        snooze.setOnClickListener(new Button.OnClickListener() {
+            public void onClick(View v) {
+                snooze();
+            }
+        });
+
+        /* dismiss button: close notification */
+        findViewById(R.id.dismiss).setOnClickListener(
+                new Button.OnClickListener() {
+                    public void onClick(View v) {
+                        dismiss(false);
+                    }
+                });
+
+        /* Set the title from the passed in alarm */
+        setTitle();
+    }
+
+    // Attempt to snooze this alert.
+    private void snooze() {
+        final String snooze =
+                PreferenceManager.getDefaultSharedPreferences(this)
+                .getString(SettingsActivity.KEY_ALARM_SNOOZE, DEFAULT_SNOOZE);
+        int snoozeMinutes = Integer.parseInt(snooze);
+
+        final long snoozeTime = System.currentTimeMillis()
+                + (1000 * 60 * snoozeMinutes);
+        Alarms.saveSnoozeAlert(AlarmAlertFullScreen.this, mAlarm.id,
+                snoozeTime);
+
+        // Get the display time for the snooze and update the notification.
+        final Calendar c = Calendar.getInstance();
+        c.setTimeInMillis(snoozeTime);
+
+        // Append (snoozed) to the label.
+        String label = mAlarm.getLabelOrDefault(this);
+        label = getString(R.string.alarm_notify_snooze_label, label);
+
+        // Notify the user that the alarm has been snoozed.
+        Intent cancelSnooze = new Intent(this, AlarmReceiver.class);
+        cancelSnooze.setAction(Alarms.CANCEL_SNOOZE);
+        cancelSnooze.putExtra(Alarms.ALARM_ID, mAlarm.id);
+        PendingIntent broadcast =
+                PendingIntent.getBroadcast(this, mAlarm.id, cancelSnooze, 0);
+        NotificationManager nm = getNotificationManager();
+        Notification n = new Notification(R.drawable.stat_notify_alarm,
+                label, 0);
+        n.setLatestEventInfo(this, label,
+                getString(R.string.alarm_notify_snooze_text,
+                    Alarms.formatTime(this, c)), broadcast);
+        n.flags |= Notification.FLAG_AUTO_CANCEL
+                | Notification.FLAG_ONGOING_EVENT;
+        nm.notify(mAlarm.id, n);
+
+        String displayTime = getString(R.string.alarm_alert_snooze_set,
+                snoozeMinutes);
+        // Intentionally log the snooze time for debugging.
+        Log.v(displayTime);
+
+        // Display the snooze minutes in a toast.
+        Toast.makeText(AlarmAlertFullScreen.this, displayTime,
+                Toast.LENGTH_LONG).show();
+        stopService(new Intent(Alarms.ALARM_ALERT_ACTION));
+        finish();
+    }
+
+    private NotificationManager getNotificationManager() {
+        return (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+    }
+
+    // Dismiss the alarm.
+    private void dismiss(boolean killed) {
+        // The service told us that the alarm has been killed, do not modify
+        // the notification or stop the service.
+        if (!killed) {
+            // Cancel the notification and stop playing the alarm
+            NotificationManager nm = getNotificationManager();
+            nm.cancel(mAlarm.id);
+            stopService(new Intent(Alarms.ALARM_ALERT_ACTION));
+        }
+        finish();
+    }
+
+    /**
+     * this is called when a second alarm is triggered while a
+     * previous alert window is still active.
+     */
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        if (Log.LOGV) Log.v("AlarmAlert.OnNewIntent()");
+
+        mAlarm = intent.getParcelableExtra(Alarms.ALARM_INTENT_EXTRA);
+
+        setTitle();
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (!isFinishing()) {
+            // Don't hang around.
+            finish();
+        }
     }
     
     @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (Log.LOGV) Log.v("AlarmAlert.onDestroy()");
+        // No longer care about the alarm being killed.
+        unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        // Do this on key down to handle a few of the system keys.
+        boolean up = event.getAction() == KeyEvent.ACTION_UP;
+        switch (event.getKeyCode()) {
+            // Volume keys and camera keys dismiss the alarm
+            case KeyEvent.KEYCODE_VOLUME_UP:
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+            case KeyEvent.KEYCODE_CAMERA:
+            case KeyEvent.KEYCODE_FOCUS:
+                if (up) {
+                    switch (mVolumeBehavior) {
+                        case 1:
+                            snooze();
+                            break;
+
+                        case 2:
+                            dismiss(false);
+                            break;
+
+                        default:
+                            break;
+                    }
+                }
+                return true;
+            default:
+                break;
+        }
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Override
     public void onBackPressed() {
-        // Don't allow back to dismiss.
+        // Don't allow back to dismiss. This method is overriden by AlarmAlert
+        // so that the dialog is dismissed.
         return;
     }
 }
index adfe740..43c08c3 100644 (file)
@@ -28,7 +28,6 @@ import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.provider.Settings;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
@@ -36,7 +35,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.View.OnCreateContextMenuListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
@@ -56,11 +54,11 @@ import java.util.Calendar;
  */
 public class AlarmClock extends Activity implements OnItemClickListener {
 
-    final static String PREFERENCES = "AlarmClock";
+    static final String PREFERENCES = "AlarmClock";
 
     /** This must be false for production.  If true, turns on logging,
         test code, etc. */
-    final static boolean DEBUG = false;
+    static final boolean DEBUG = false;
 
     private SharedPreferences mPrefs;
     private LayoutInflater mFactory;
@@ -86,9 +84,9 @@ public class AlarmClock extends Activity implements OnItemClickListener {
         public View newView(Context context, Cursor cursor, ViewGroup parent) {
             View ret = mFactory.inflate(R.layout.alarm_time, parent, false);
 
-            DigitalClock digitalClock = (DigitalClock) ret.findViewById(R.id.digitalClock);
+            DigitalClock digitalClock =
+                    (DigitalClock) ret.findViewById(R.id.digitalClock);
             digitalClock.setLive(false);
-            if (Log.LOGV) Log.v("newView " + cursor.getPosition());
             return ret;
         }
 
index d78f82f..a493d90 100644 (file)
 
 package com.android.deskclock;
 
-import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.graphics.PorterDuff;
-import android.net.Uri;
-import android.provider.Calendar;
-import android.provider.Calendar.Attendees;
-import android.provider.Calendar.Calendars;
-import android.provider.Calendar.EventsColumns;
-import android.provider.Calendar.Instances;
-import android.provider.Calendar.Reminders;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-import android.util.Config;
-import android.util.Log;
-import android.view.View;
 import android.widget.RemoteViews;
 
-import java.util.Arrays;
-
 /**
  * Simple widget to show analog clock.
  */
@@ -51,13 +31,19 @@ public class AnalogAppWidgetProvider extends BroadcastReceiver {
 
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
-        
+
         if (AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action)) {
             RemoteViews views = new RemoteViews(context.getPackageName(),
                     R.layout.analog_appwidget);
-            
-            int[] appWidgetIds = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
-            
+
+            views.setOnClickPendingIntent(R.id.analog_appwidget,
+                    PendingIntent.getActivity(context, 0,
+                        new Intent(context, AlarmClock.class),
+                        PendingIntent.FLAG_CANCEL_CURRENT));
+
+            int[] appWidgetIds = intent.getIntArrayExtra(
+                    AppWidgetManager.EXTRA_APPWIDGET_IDS);
+
             AppWidgetManager gm = AppWidgetManager.getInstance(context);
             gm.updateAppWidget(appWidgetIds, views);
         }
index 88030cd..3cfcc38 100644 (file)
@@ -389,35 +389,21 @@ public class DeskClock extends Activity {
 
             mWeatherIconDrawable = mGenieResources.getDrawable(cur.getInt(
                 cur.getColumnIndexOrThrow("iconResId")));
-
+            mWeatherCurrentTemperatureString = String.format("%d\u00b0",
+                (cur.getInt(cur.getColumnIndexOrThrow("temperature"))));
+            mWeatherHighTemperatureString = String.format("%d\u00b0",
+                (cur.getInt(cur.getColumnIndexOrThrow("highTemperature"))));
+            mWeatherLowTemperatureString = String.format("%d\u00b0",
+                (cur.getInt(cur.getColumnIndexOrThrow("lowTemperature"))));
             mWeatherLocationString = cur.getString(
                 cur.getColumnIndexOrThrow("location"));
-
-            // any of these may be NULL
-            final int colTemp = cur.getColumnIndexOrThrow("temperature");
-            final int colHigh = cur.getColumnIndexOrThrow("highTemperature");
-            final int colLow = cur.getColumnIndexOrThrow("lowTemperature");
-
-            mWeatherCurrentTemperatureString =
-                cur.isNull(colTemp)
-                    ? "\u2014"
-                    : String.format("%d\u00b0", cur.getInt(colTemp));
-            mWeatherHighTemperatureString =
-                cur.isNull(colHigh)
-                    ? "\u2014"
-                    : String.format("%d\u00b0", cur.getInt(colHigh));
-            mWeatherLowTemperatureString =
-                cur.isNull(colLow)
-                    ? "\u2014"
-                    : String.format("%d\u00b0", cur.getInt(colLow));
         } else {
             Log.w(LOG_TAG, "No weather information available (cur="
                 + cur +")");
             mWeatherIconDrawable = null;
+            mWeatherHighTemperatureString = "";
+            mWeatherLowTemperatureString = "";
             mWeatherLocationString = getString(R.string.weather_fetch_failure);
-            mWeatherCurrentTemperatureString =
-                mWeatherHighTemperatureString =
-                mWeatherLowTemperatureString = "";
         }
 
         mHandy.sendEmptyMessage(UPDATE_WEATHER_DISPLAY_MSG);
index ce07cc1..2a14448 100644 (file)
@@ -95,6 +95,11 @@ public class SetAlarm extends PreferenceActivity
 
         /* load alarm details from database */
         Alarm alarm = Alarms.getAlarm(getContentResolver(), mId);
+        // Bad alarm, bail to avoid a NPE.
+        if (alarm == null) {
+            finish();
+            return;
+        }
         mEnabledPref.setChecked(alarm.enabled);
         mLabel.setText(alarm.label);
         mLabel.setSummary(alarm.label);
@@ -139,6 +144,8 @@ public class SetAlarm extends PreferenceActivity
         Button b = (Button) v.findViewById(R.id.alarm_save);
         b.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
+                    // Enable the alarm when clicking "Done"
+                    mEnabledPref.setChecked(true);
                     saveAlarm();
                     finish();
                 }