am 46af54e4: Merge "Remove "Kyev," duplicate of "Kiev."" into ub-deskclock-army * commit '46af54e4b91cee8f152f3800dd26acb39fcd7d7c': Remove "Kyev," duplicate of "Kiev."

commit: c31c049b6824ae6fca3d7d78f5220b2b53e5b2c2 [log] [tgz]
author: Annie Chin <afchin@google.com> Wed Jun 03 19:49:18 2015 +0000
committer: Android Git Automerger <android-git-automerger@android.com> Wed Jun 03 19:49:18 2015 +0000
tree: c2ff3ee5a0ab0e3e431653804f5ffd2cb0f99680
parent: 89fc80a78dc62ab3783a1886136a45d21b68f69d [diff]
parent: 46af54e4b91cee8f152f3800dd26acb39fcd7d7c [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ec20a3c..e0d3f6d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -140,6 +140,93 @@
             android:exported="true">
         </activity-alias>
 
+        <activity android:name=".voice.HandleVoiceApiCalls"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:taskAffinity=""
+            android:theme="@android:style/Theme.NoDisplay"
+            android:permission="com.android.alarm.permission.SET_ALARM">
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_SHOW_CLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_ADD_CLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_DELETE_CLOCK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VOICE_CANCEL_ALARM" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_DISMISS_UPCOMING_ALARM" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VOICE_DELETE_ALARM" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_START_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_RESET_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_STOP_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_SHOW_TIMERS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_DELETE_TIMER" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_SHOW_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_START_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_STOP_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_LAP_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.deskclock.action.VOICE_RESET_STOPWATCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.VOICE" />
+            </intent-filter>
+        </activity>
 
         <receiver android:name="AlarmInitReceiver">
             <intent-filter>
@@ -212,7 +299,7 @@
 
         <!-- This activity is basically like the TimerFragment in DeskClock
          but only during lock screen
-         so that is only has the fired timers -->
+         so that it only has the fired timers -->
         <activity android:name="com.android.deskclock.timer.TimerAlertFullScreen"
                 android:excludeFromRecents="true"
                 android:theme="@style/TimerAlertFullScreenTheme"

diff --git a/res/values-da/array.xml b/res/values-da/array.xml
index 1b4a24d..6322067 100644
--- a/res/values-da/array.xml
+++ b/res/values-da/array.xml

@@ -120,7 +120,7 @@
     <item msgid="2173021164159165084">"Amman"</item>
     <item msgid="5365315490101319010">"Anadyr"</item>
     <item msgid="2203136550754775298">"Aqtau"</item>
-    <item msgid="6373057865921966096">"Bagdad"</item>
+    <item msgid="6373057865921966096">"Baghdad"</item>
     <item msgid="7705451629446449789">"Bahrain"</item>
     <item msgid="2201480850069597815">"Baku"</item>
     <item msgid="424770109352500733">"Bangkok"</item>

diff --git a/res/values-gu-rIN/array.xml b/res/values-gu-rIN/array.xml
deleted file mode 100644
index 3305ffd..0000000
--- a/res/values-gu-rIN/array.xml
+++ /dev/null

@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright (C) 2012 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="cities_names">
-    <item msgid="2528360178629244616">"આબિદ્જાન"</item>
-    <item msgid="6944239639314079002">"ઍકરા"</item>
-    <item msgid="1882840263263451068">"એડિસ અબાબા"</item>
-    <item msgid="1028929145486670248">"અલ્જીયર્સ"</item>
-    <item msgid="3701057587584676092">"બ્લેંટીર"</item>
-    <item msgid="2886322632268247117">"બ્રાઝાવિલે"</item>
-    <item msgid="6897570881968822043">"કૈરો"</item>
-    <item msgid="267605539096913498">"કાસાબ્લાંકા"</item>
-    <item msgid="4211664465580587414">"કોનૅક્રી"</item>
-    <item msgid="4541602834272820641">"ડકાર"</item>
-    <item msgid="8465732069409300950">"દાર એસ સલામ"</item>
-    <item msgid="6622510954516549116">"જીબૌટી"</item>
-    <item msgid="2276489800209768303">"ફ્રીટાઉન"</item>
-    <item msgid="1240576997711861023">"ગૅબોરોન"</item>
-    <item msgid="5349334209171364385">"હરારે"</item>
-    <item msgid="6113191477690557327">"જોહાન્સબર્ગ"</item>
-    <item msgid="927428576674822400">"કમ્પાલા"</item>
-    <item msgid="4026832076115235469">"ખાર્ટૂમ"</item>
-    <item msgid="5410782788724286381">"કિગાલી"</item>
-    <item msgid="7732811111504353705">"કિંશાસા"</item>
-    <item msgid="932809008471125011">"લાગોસ"</item>
-    <item msgid="2795948760365855772">"મસેરુ"</item>
-    <item msgid="6464910812969504493">"મોગાડીશુ"</item>
-    <item msgid="4620365036488328944">"નૈરોબી"</item>
-    <item msgid="4196652835056468390">"સાઓ ટૉમ"</item>
-    <item msgid="2002053268354813523">"ટિમ્બક્ટુ"</item>
-    <item msgid="6789355206260535774">"ટ્રીપોલી"</item>
-    <item msgid="1662913445892282208">"ટ્યુનિસ"</item>
-    <item msgid="1958350526592385504">"એન્કોરેજ"</item>
-    <item msgid="4530964415403549431">"મેન્ડોઝા"</item>
-    <item msgid="5519841965499989640">"અરુબા"</item>
-    <item msgid="3619641653330712167">"એસન્શિયન"</item>
-    <item msgid="1807527094848372100">"બારબાડોસ"</item>
-    <item msgid="7833099001850188721">"બેલીઝ"</item>
-    <item msgid="5063415446546412441">"બોગોટા"</item>
-    <item msgid="2839227656429500365">"બ્યુનસ એયર્સ"</item>
-    <item msgid="1133762043888408997">"કાન્કુન"</item>
-    <item msgid="5326063045518438386">"કૅરાકસ"</item>
-    <item msgid="889935230113732517">"કેમેન"</item>
-    <item msgid="3444477982230350362">"શિકાગો"</item>
-    <item msgid="610305270095390771">"કોસ્ટા રિકા"</item>
-    <item msgid="4297448531030514920">"ક્યુરાસાઓ"</item>
-    <item msgid="1819003821428989864">"ડૌસન ક્રિક"</item>
-    <item msgid="4753714764113170675">"દેન્વર"</item>
-    <item msgid="2279315094917045244">"ડેટ્રોઇટ"</item>
-    <item msgid="1330228105893462956">"ડોમિનિકા"</item>
-    <item msgid="3303245425281858320">"એડમેન્ટન"</item>
-    <item msgid="6102675683216802960">"એલ સેલ્વાડોર"</item>
-    <item msgid="7404823948632138334">"ફોર્ટાલેઝા"</item>
-    <item msgid="5295234178172153733">"ગ્રાન્ડ ટર્ક"</item>
-    <item msgid="3015155377774814857">"ગ્રેનેડા"</item>
-    <item msgid="5124228611616346914">"ગ્વાટેમાલા"</item>
-    <item msgid="890870630819396468">"ગયાના"</item>
-    <item msgid="7195964234494402331">"હેલિફેક્સ"</item>
-    <item msgid="4983877234758737190">"હવાના"</item>
-    <item msgid="2738888001225341531">"ઇન્ડિયાનપોલિસ"</item>
-    <item msgid="5335614190119698790">"નોક્સ"</item>
-    <item msgid="9056292535030679310">"મેરેંગો"</item>
-    <item msgid="1049051761793330471">"પીટર્સબર્ગ"</item>
-    <item msgid="4086392912705989429">"ટેલ સિટી"</item>
-    <item msgid="4953356468739912331">"વેવૈ"</item>
-    <item msgid="879918079035739958">"વેસેંન્સ"</item>
-    <item msgid="620064188588916047">"વિનામેક"</item>
-    <item msgid="1743310759320576964">"કિંગ્સ્ટન"</item>
-    <item msgid="5836540468054579646">"ન્યુએસ્ટ્રા સેનોરા દ લા પાઝ"</item>
-    <item msgid="9111190480556180457">"લિમા"</item>
-    <item msgid="3849323884810644665">"લોસ એંજેલેસ"</item>
-    <item msgid="9186705637161264387">"લૂઇવિલ"</item>
-    <item msgid="6045939557161114820">"માનાગુઆ"</item>
-    <item msgid="3688923880208568496">"માર્ટીનીક"</item>
-    <item msgid="3124245926616896140">"મેન્ડોઝા"</item>
-    <item msgid="8264013691437690644">"મેટલાકાટ્લા"</item>
-    <item msgid="3242307788223843671">"મેક્સિકો સિટી"</item>
-    <item msgid="3904210242491724008">"મોન્તોરે"</item>
-    <item msgid="2049700402307558992">"મૉંટેવિડિઓ"</item>
-    <item msgid="6972371385309297826">"મોન્ટ્રિયલ"</item>
-    <item msgid="1121150121639680484">"નાસાઉ"</item>
-    <item msgid="8783518093470040300">"ન્યૂયોર્ક"</item>
-    <item msgid="8685565479120721681">"બેઉલાહ"</item>
-    <item msgid="6854366494939955818">"મધ્ય"</item>
-    <item msgid="7325195282520040665">"ન્યૂ સાલેમ"</item>
-    <item msgid="3368872340258580668">"પનામા"</item>
-    <item msgid="58921303248631494">"ફોનિક્સ"</item>
-    <item msgid="6678389014419621494">"પોર્ટ ઑફ સ્પેન"</item>
-    <item msgid="5255184875289196899">"પોર્ટ-ઓ-પ્રિન્સ"</item>
-    <item msgid="7039428977566254389">"પ્યુઅર્ટો રિકો"</item>
-    <item msgid="1577859671465557300">"સેંટો ડોમિંગો"</item>
-    <item msgid="3956700126827381905">"સાઓ પાઉલો"</item>
-    <item msgid="3851056559336304908">"સેન્ટ જ્હોન્સ"</item>
-    <item msgid="7620601490016157459">"સેન્ટ કીટ્સ"</item>
-    <item msgid="256494147725561888">"સેંટ લુસિયા"</item>
-    <item msgid="9065982618380084594">"સેંટ થોમસ"</item>
-    <item msgid="7424657189317481507">"તિજુઆના"</item>
-    <item msgid="7378768724772963031">"ટોરન્ટો"</item>
-    <item msgid="2880175928020421322">"વેન્કુવર"</item>
-    <item msgid="8906495585877998744">"વિન્નિપેગ"</item>
-    <item msgid="8681645071790623069">"સાઉથ પોલ"</item>
-    <item msgid="9066834921549182064">"લોંગઇયરબિયેન"</item>
-    <item msgid="4656709932014204632">"અલ્માટી"</item>
-    <item msgid="2173021164159165084">"અમ્માન"</item>
-    <item msgid="5365315490101319010">"અનદિર"</item>
-    <item msgid="2203136550754775298">"અકટાઉ"</item>
-    <item msgid="6373057865921966096">"બગદાદ"</item>
-    <item msgid="7705451629446449789">"બેહરીન"</item>
-    <item msgid="2201480850069597815">"બાકુ"</item>
-    <item msgid="424770109352500733">"બેંગકોક"</item>
-    <item msgid="5329081174177673828">"બૈરુત"</item>
-    <item msgid="7187135889522860058">"કલકત્તા"</item>
-    <item msgid="8261312970920594511">"દમાસ્કસ"</item>
-    <item msgid="6050005781178769107">"ઢાકા"</item>
-    <item msgid="846831973484498790">"દુબઈ"</item>
-    <item msgid="6320380511060318660">"ગાઝા"</item>
-    <item msgid="138195076135095830">"હેબ્રોન"</item>
-    <item msgid="2792857260329757927">"હો ચી મિંહ"</item>
-    <item msgid="2753915200056183217">"હોંગકોંગ"</item>
-    <item msgid="6375713877627922624">"ઇસ્તંબુલ"</item>
-    <item msgid="164857852656167029">"જાકાર્તા"</item>
-    <item msgid="514551483895638508">"જેરુસલેમ"</item>
-    <item msgid="7852405794661778785">"કાબુલ"</item>
-    <item msgid="2733033767438957766">"કરાચી"</item>
-    <item msgid="5644311217186397680">"કાઠમંડુ"</item>
-    <item msgid="1242216853434928489">"કુઆલાલમ્પુર"</item>
-    <item msgid="4933780769758115782">"કુવૈત"</item>
-    <item msgid="6882764635090995312">"મકાઉ"</item>
-    <item msgid="3986352476396048104">"મનિલા"</item>
-    <item msgid="7941758124259560958">"મસ્કત"</item>
-    <item msgid="2671480270494284192">"ફ્નોમ પેન્હ"</item>
-    <item msgid="3585358766120768888">"પ્યોંગયાંગ"</item>
-    <item msgid="282733287703161268">"કતાર"</item>
-    <item msgid="8551825553277677949">"રંગૂન"</item>
-    <item msgid="3510541723342902050">"રિયાધ"</item>
-    <item msgid="7301933049899867383">"સૈગોન"</item>
-    <item msgid="2859585838402694009">"સીઓલ"</item>
-    <item msgid="33498601045535875">"શેંઘાઇ"</item>
-    <item msgid="8274790879257759399">"સિંગાપુર"</item>
-    <item msgid="4185891512451859606">"તાઇપેઇ"</item>
-    <item msgid="8272983787037437358">"તેહરાન"</item>
-    <item msgid="7548402686482506151">"તેલ અવિવ"</item>
-    <item msgid="6921751833980197720">"ટોક્યો"</item>
-    <item msgid="59728156515393986">"ઉલાંબાતર"</item>
-    <item msgid="701446121859732513">"બર્મુડા"</item>
-    <item msgid="6874435045145230527">"કૅનેરી"</item>
-    <item msgid="1975124795172898686">"કૅપ વેર્ડે"</item>
-    <item msgid="5405194758503124447">"રૅકયાવિક"</item>
-    <item msgid="4841506971765063373">"સ્ટેનલી"</item>
-    <item msgid="3192252088299410199">"એડિલેઇડ"</item>
-    <item msgid="4515440099016150233">"બ્રિસબેન"</item>
-    <item msgid="1603342478771190398">"કૅનબેરા"</item>
-    <item msgid="7369443573793537977">"ડાર્વિન"</item>
-    <item msgid="6038622967693853356">"મેલબોર્ન"</item>
-    <item msgid="5987600941235656656">"ન્યૂ સાઉથ વેલ્સ"</item>
-    <item msgid="8993222367897103441">"પર્થ"</item>
-    <item msgid="2331172541371685437">"ક્વીન્સલેન્ડ"</item>
-    <item msgid="2150912736505182699">"સિડ્ની"</item>
-    <item msgid="8097029759143077179">"વિક્ટોરિયા"</item>
-    <item msgid="2175264082469352441">"ન્યૂફાઉન્ડલેન્ડ"</item>
-    <item msgid="5299806709792658953">"સાસ્કાટચેવન"</item>
-    <item msgid="2742335625880576228">"ઇસ્ટર આયલેન્ડ"</item>
-    <item msgid="3401105135843706855">"ઍમ્સ્ટરડૅમ"</item>
-    <item msgid="7408055867187369479">"ઍંડોરા"</item>
-    <item msgid="7714099594043232998">"એથેંસ"</item>
-    <item msgid="7588965073415041593">"બેલફાસ્ટ"</item>
-    <item msgid="8982755519728730268">"બેલગ્રેડ"</item>
-    <item msgid="5820954942905597949">"બર્લિન"</item>
-    <item msgid="7624062157455799880">"બ્રેટિસલાવા"</item>
-    <item msgid="6138895798733335888">"બ્રસેલ્સ"</item>
-    <item msgid="8836227282219002613">"બુકરેસ્ટ"</item>
-    <item msgid="8868098210480147802">"બુડાપેસ્ટ"</item>
-    <item msgid="114329374155996860">"ચિસીનાઉ"</item>
-    <item msgid="6487487167873723374">"કૉપેનહૅગન"</item>
-    <item msgid="5264002034116955880">"ડબલિન"</item>
-    <item msgid="7950073703814432186">"જીબ્રાલ્ટર"</item>
-    <item msgid="4616641627708493425">"હેલસિંકી"</item>
-    <item msgid="212359461403262711">"આઇલ ઓફ મૅન"</item>
-    <item msgid="4245799496293578703">"ઇસ્તંબુલ"</item>
-    <item msgid="4477669700025211678">"કૈવ"</item>
-    <item msgid="7233802930588725294">"લિસ્બન"</item>
-    <item msgid="7186725202454661926">"લંડન"</item>
-    <item msgid="5298853578615697920">"લક્ઝમબર્ગ"</item>
-    <item msgid="3107227222663823852">"મૅડ્રીડ"</item>
-    <item msgid="6409612387432198642">"માલ્ટા"</item>
-    <item msgid="6955558182074785338">"મિંસ્ક"</item>
-    <item msgid="6228242074512253552">"મોનાકો"</item>
-    <item msgid="6544575681565409774">"મોસ્કો"</item>
-    <item msgid="3976815367069730505">"ઑસ્લો"</item>
-    <item msgid="2469420333993086275">"પેરિસ"</item>
-    <item msgid="7485656867179996639">"પ્રાગ"</item>
-    <item msgid="988513162091270543">"રિગા"</item>
-    <item msgid="3998650297514954079">"રોમ"</item>
-    <item msgid="1732427206709814080">"સૅન મેરિનો"</item>
-    <item msgid="2794131568674225119">"સારાજેવો"</item>
-    <item msgid="2400301040855226066">"સિમ્ફેરોપોલ"</item>
-    <item msgid="9186733542818983602">"સ્કોપયે"</item>
-    <item msgid="1586570243468059398">"સોફિયા"</item>
-    <item msgid="564898083230872572">"સ્ટોકહૉમ"</item>
-    <item msgid="8462542989781385012">"તલ્લીન"</item>
-    <item msgid="6709788967440613264">"વેટિકન"</item>
-    <item msgid="8251863344440905549">"વિયેના"</item>
-    <item msgid="3257947331297603891">"વિલ્નિઅસ"</item>
-    <item msgid="2305299694079344212">"વોરસૉ"</item>
-    <item msgid="4469591142000997702">"ઝેગરેબ"</item>
-    <item msgid="3827805692447432666">"ઝુરીક"</item>
-    <item msgid="7710293346890852314">"અંતાનાનારિવો"</item>
-    <item msgid="8675463358261691187">"માલદિવ્સ"</item>
-    <item msgid="8258461076442136172">"મોરિશિયસ"</item>
-    <item msgid="3150318624617990367">"ઑકલેન્ડ"</item>
-    <item msgid="8427795435830682122">"ફીજી"</item>
-    <item msgid="1158779814198631169">"ગ્વામ"</item>
-    <item msgid="5893704879373137457">"હોનોલુલુ"</item>
-    <item msgid="1770338947698194275">"કિરિતિમાતી"</item>
-    <item msgid="3115018823853432422">"નૌમીઆ"</item>
-    <item msgid="8930848797035435014">"સમોઆ"</item>
-    <item msgid="5520094948583238358">"તાહીતી"</item>
-    <item msgid="7301905385854586936">"ઍન્ટિગુવા"</item>
-    <item msgid="8984152310253274404">"ઓસ્ટિન"</item>
-    <item msgid="6874533703004710145">"બોસ્ટન"</item>
-    <item msgid="7432962958322057136">"કેલગરી"</item>
-    <item msgid="8096684279604140978">"કૉલમ્બસ"</item>
-    <item msgid="936901718255724986">"ડલ્લાસ"</item>
-    <item msgid="4015131634823666245">"નોક્સવિલે"</item>
-    <item msgid="3978413466663710403">"મેમફિસ"</item>
-    <item msgid="5023838008354228529">"મિયામી"</item>
-    <item msgid="7182213480667543511">"મિનેપોલિસ"</item>
-    <item msgid="869023139270244552">"ઓટ્ટાવા"</item>
-    <item msgid="8138869957811168440">"ફિલાડેલ્ફિયા"</item>
-    <item msgid="1752278495028380978">"પોર્ટલેન્ડ"</item>
-    <item msgid="8972733979389600134">"સાન ડિએગો"</item>
-    <item msgid="304925930860094332">"સાન ફ્રાંસિસ્કો"</item>
-    <item msgid="1092295421727954508">"સૉલ્ટ લૅક સિટી"</item>
-    <item msgid="2861495155508879945">"સાન જોસે"</item>
-    <item msgid="6951841899277574144">"સાન સૅલ્વાડૉર"</item>
-    <item msgid="4063054959106860389">"સિએટલ"</item>
-    <item msgid="4985936045757148312">"સેંટ લુઇસ"</item>
-    <item msgid="2498001791404810614">"વોશિંગ્ટન D.C."</item>
-    <item msgid="6490744399654978915">"હ્યુસ્ટન"</item>
-    <item msgid="5461172996986211872">"સાન એન્ટોનિયો"</item>
-    <item msgid="7955879665647778362">"જૅક્સનવિલે"</item>
-    <item msgid="7274737959786806118">"બાલ્ટીમોર"</item>
-    <item msgid="5440109692257991959">"નૅશવિલે"</item>
-    <item msgid="2580598303029580540">"મિલવૌકી"</item>
-    <item msgid="5778397064882342884">"ઑક્લાહોમા સિટી"</item>
-    <item msgid="60834900460576333">"લાસ વેગાસ"</item>
-    <item msgid="1242224546028941695">"આલ્બુકર્ક"</item>
-    <item msgid="2108508912885156322">"ટક્સન"</item>
-    <item msgid="2736505692163909286">"સેક્રામેંટો"</item>
-    <item msgid="4244292537769840523">"એટલાન્ટા"</item>
-    <item msgid="1458420523389537755">"ક્લીવલેંડ"</item>
-    <item msgid="6576927115185043547">"ન્યૂ ઓર્લિયન્સ"</item>
-    <item msgid="2723274638984844697">"ટામ્પા"</item>
-    <item msgid="1176352970801801624">"પિટ્સબર્ગ"</item>
-    <item msgid="5624802871949256105">"સિનસિનાટી"</item>
-    <item msgid="527393217276418005">"માઉન્ટેન વ્યૂ"</item>
-    <item msgid="1744025839066009857">"રેનો"</item>
-    <item msgid="6276904698731697502">"બ્લેક રૉક સિટી"</item>
-    <item msgid="2844451059935789778">"દોહા"</item>
-    <item msgid="4108653157206192019">"બેઇજિંગ"</item>
-    <item msgid="6115360044399896579">"મુંબઈ"</item>
-    <item msgid="7140676596549732117">"દિલ્હી"</item>
-    <item msgid="1236127343975476693">"ઓસાકા"</item>
-    <item msgid="6470041111418276646">"લાહોર"</item>
-    <item msgid="5672665774945554582">"સાના"</item>
-    <item msgid="4227294244388933650">"બાર્સેલોના"</item>
-    <item msgid="2404605478532633099">"મ્યુનિક"</item>
-    <item msgid="2402973841037462176">"મિલાન"</item>
-    <item msgid="1658609023659261743">"ફ્રેન્કફર્ટ"</item>
-    <item msgid="4214691757607136548">"હનોઈ"</item>
-    <item msgid="484506613000693635">"અન્કારા"</item>
-    <item msgid="1958807113380596945">"બેંગલોર"</item>
-    <item msgid="2258411542499008700">"બ્રાસિલિયા"</item>
-    <item msgid="770086263560182220">"કેપ ટાઉન"</item>
-    <item msgid="5936333722350504953">"ઇસ્લામાબાદ"</item>
-    <item msgid="3631805761163219329">"રિયો ડી જિનેરો"</item>
-    <item msgid="6544644866501929714">"એન આર્બોર"</item>
-    <item msgid="8675519768651745334">"બોલ્ડર"</item>
-    <item msgid="7006632817384692182">"કેમ્બ્રિજ"</item>
-    <item msgid="7233704593042272414">"કિર્કલૅંડ"</item>
-    <item msgid="717352875658559544">"મેડિસન"</item>
-    <item msgid="3567009426051313507">"ગુઆંગઝાઉ"</item>
-    <item msgid="2738289235744819761">"હૈદરાબાદ"</item>
-    <item msgid="35629823970779893">"રેસ્ટોન"</item>
-    <item msgid="2620375619174484543">"બેલો હોરીઝોન્ટે"</item>
-    <item msgid="3949247113051549869">"સાંટિયાગો"</item>
-    <item msgid="3583568170097050810">"મોંરોવિયા"</item>
-    <item msgid="4337041465665825381">"કોલંબો"</item>
-    <item msgid="2758533074887258174">"ચિહુઆહુઆ"</item>
-    <item msgid="3904262821019008829">"સેલ્વાડોર"</item>
-    <item msgid="7335556305222315705">"ગુડગાંવ"</item>
-    <item msgid="8092021218913879570">"માન્ચેસ્ટર"</item>
-    <item msgid="3262376108426000449">"કિવ"</item>
-    <item msgid="1321450515191695851">"સેન્ટ પીટર્સબર્ગ"</item>
-    <item msgid="5152144018647717853">"ક્રેકો"</item>
-    <item msgid="3995511368799031783">"રૉક્લાવ"</item>
-    <item msgid="7251862005498390469">"હેમ્બર્ગ"</item>
-    <item msgid="4403899516544001462">"ઔલુ"</item>
-    <item msgid="8378499650951313108">"હાઇફા"</item>
-    <item msgid="7504732361387330116">"સેન જુએન"</item>
-    <item msgid="8613864994547669100">"તેગુસિગલ્પા"</item>
-    <item msgid="7087691675228926801">"પેરામેરિબો"</item>
-    <item msgid="478384295484578701">"ક્વીટો"</item>
-    <item msgid="4517870253399384206">"લુબ્લિયાના"</item>
-  </string-array>
-</resources>

diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
deleted file mode 100644
index 4feb9d9..0000000
--- a/res/values-gu-rIN/strings.xml
+++ /dev/null

@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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="add_alarm" msgid="5976616107390962899">"એલાર્મ ઉમેરો"</string>
-    <string name="menu_desk_clock" msgid="3241995064554071588">"ડેસ્ક ઘડિયાળ"</string>
-    <string name="menu_edit_alarm" msgid="7204602994918829751">"એલાર્મ સંપાદિત કરો"</string>
-    <string name="delete_alarm" msgid="3457780990646206817">"એલાર્મ કાઢી નાખો"</string>
-    <string name="enable_alarm" msgid="1834599140632142536">"એલાર્મ ચાલુ કરો"</string>
-    <string name="disable_alarm" msgid="5889378670229554109">"એલાર્મ બંધ કરો"</string>
-    <string name="delete_alarm_confirm" msgid="6578572637340860840">"આ એલાર્મ કાઢી નાખીએ?"</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">"વાઇબ્રેટ"</string>
-    <string name="alarm_repeat" msgid="7242985466344233206">"પુનરાવર્તન"</string>
-    <string name="alert" msgid="6506982899651975645">"એલાર્મ રિંગટોન"</string>
-    <string name="ringtone" msgid="9110746249688559579">"રિંગટોન"</string>
-    <string name="time" msgid="8067216534232296518">"સમય"</string>
-    <string name="alarm_tomorrow" msgid="131356848787643420">"આવતીકાલે"</string>
-    <string name="alarm_today" msgid="7873594221106531654">"આજે"</string>
-    <string name="alarm_alert_wake_up" msgid="6790780716498252583">"જાગો!"</string>
-    <string name="alarm_alert_off_action_text" msgid="2459925305288819812">"બંધ"</string>
-    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"છોડી દો"</string>
-    <string name="alarm_alert_dismiss_now_text" msgid="3272183025444682500">"હવે કાઢી નાખો"</string>
-    <string name="alarm_missed_title" msgid="3828345099754063392">"મિસ્ડ એલાર્મ"</string>
-    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
-    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"સ્નૂઝ કરી"</string>
-  <plurals name="alarm_alert_snooze_duration">
-    <item quantity="one" msgid="9092917312369131464">"1 મિનિટ"</item>
-    <item quantity="other" msgid="6731274475422132958">"<xliff:g id="NUMBER">%d</xliff:g> મિનિટ"</item>
-  </plurals>
-    <string name="alarm_alert_off_text" msgid="4472073417593915002">"એલાર્મ બંધ"</string>
-    <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"સ્નૂઝ"</string>
-  <plurals name="alarm_alert_snooze_set">
-    <item quantity="one" msgid="7884410398338611019">"1 મિનિટ માટે સ્નૂઝ કરીને."</item>
-    <item quantity="other" msgid="7377899473014259727">"<xliff:g id="MINUTES">%d</xliff:g> મિનિટ માટે સ્નૂઝ કરીને."</item>
-  </plurals>
-    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"<xliff:g id="TIME">%s</xliff:g> સુધી સ્નૂઝ કરીને"</string>
-    <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"આગામી એલાર્મ"</string>
-    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"તમારો મિસ્ડ એલાર્મ કાઢી નાખવામાં આવ્યો છે"</string>
-  <string-array name="timer_notifications">
-    <item msgid="7760558912503484257">"એક મિનિટ કરતા ઓછી બાકી છે"</item>
-    <item msgid="83197792732433351">"<xliff:g id="HOURS">%1$s</xliff:g> બાકી છે"</item>
-    <item msgid="8919698220200894252">"<xliff:g id="MINUTES">%2$s</xliff:g> બાકી છે"</item>
-    <item msgid="8458069283817013813">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> બાકી છે"</item>
-  </string-array>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"એલાર્મ હવેથી 1 મિનિટથી ઓછા સમય માટે સેટ થયો."</item>
-    <item msgid="6002066367368421848">"એલાર્મ હવેથી <xliff:g id="DAYS">%1$s</xliff:g> માટે સેટ થયો."</item>
-    <item msgid="8824719306247973774">"એલાર્મ હવેથી <xliff:g id="HOURS">%2$s</xliff:g> માટે સેટ થયો."</item>
-    <item msgid="8182406852935468862">"એલાર્મ હવેથી <xliff:g id="DAYS">%1$s</xliff:g> અને <xliff:g id="HOURS">%2$s</xliff:g> માટે સેટ થયો."</item>
-    <item msgid="2532279224777213194">"એલાર્મ હવેથી <xliff:g id="MINUTES">%3$s</xliff:g> માટે સેટ થયો."</item>
-    <item msgid="5936557894247187717">"એલાર્મ હવેથી <xliff:g id="DAYS">%1$s</xliff:g> અને <xliff:g id="MINUTES">%3$s</xliff:g> માટે સેટ થયો."</item>
-    <item msgid="9115697840826129603">"એલાર્મ હવેથી <xliff:g id="HOURS">%2$s</xliff:g> અને <xliff:g id="MINUTES">%3$s</xliff:g> માટે સેટ થયો."</item>
-    <item msgid="2332583385137381060">"એલાર્મ હવેથી <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>
-    <string name="hour" msgid="2546819039651509323">"1 કલાક"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> કલાક"</string>
-    <string name="minute" msgid="2486157997434653710">"1 મિનિટ"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> મિનિટ"</string>
-    <string name="every_day" msgid="4100909974923444602">"દરરોજ"</string>
-    <string name="day_concat" msgid="971998564991636532">", "</string>
-    <string name="clock_instructions" msgid="2656876819515011590">"એક ઘડિયાળ પસંદ કરો"</string>
-    <string name="analog_gadget" msgid="1670505720837152766">"એનાલોગ ઘડિયાળ"</string>
-    <string name="help" msgid="7786263119482654015">"સહાય"</string>
-    <string name="settings" msgid="5849739030579520686">"સેટિંગ્સ"</string>
-    <string name="snooze_duration_title" msgid="1097309861110780483">"સ્નૂઝ લંબાઈ"</string>
-  <plurals name="snooze_duration">
-    <item quantity="one" msgid="7406963706727564418">"1 મિનિટ"</item>
-    <item quantity="other" msgid="568504136093419703">"<xliff:g id="NUMBER">%d</xliff:g> મિનિટ"</item>
-  </plurals>
-  <plurals name="snooze_picker_label">
-    <item quantity="one" msgid="3783171637798575068">"મિનિટ"</item>
-    <item quantity="other" msgid="1304056759541595077">"મિનિટ"</item>
-  </plurals>
-    <string name="auto_silence_title" msgid="2012754009554434544">"આના પછી શાંતિ"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> મિનિટ"</string>
-    <string name="auto_silence_never" msgid="4821982647348750809">"ક્યારેય નહીં"</string>
-  <string-array name="auto_silence_entries">
-    <item msgid="3024545954917711306">"1 મિનિટ"</item>
-    <item msgid="5431906692406316549">"5 મિનિટ"</item>
-    <item msgid="7742728812068919959">"10 મિનિટ"</item>
-    <item msgid="2855948657259647629">"15 મિનિટ"</item>
-    <item msgid="6330196381284475079">"20 મિનિટ"</item>
-    <item msgid="7809240121716151904">"25 મિનિટ"</item>
-    <item msgid="4278641338024561333">"ક્યારેય નહીં"</item>
-  </string-array>
-    <string name="week_start_title" msgid="4268917518596832096">"આ પર સપ્તાહ શરૂ કરો"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"શનિવાર"</item>
-    <item msgid="3993530639455360921">"રવિવાર"</item>
-    <item msgid="8594709368683324282">"સોમવાર"</item>
-  </string-array>
-    <string name="done" msgid="6509722361933858451">"થઈ ગયું"</string>
-    <string name="revert" msgid="9100911171235162926">"પાછા ફરો"</string>
-    <string name="delete" msgid="5732434972457000541">"કાઢી નાખો"</string>
-    <string name="alarm_volume_title" msgid="8506245173912428522">"એલાર્મ વૉલ્યૂમ"</string>
-    <string name="silent_alarm_summary" msgid="8605302849408279221">"શાંત"</string>
-    <string name="alarm_notify_text" msgid="4891014685945904766">"એલાર્મ સ્નૂઝ કરો અથવા કાઢી નાખો."</string>
-    <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (સ્નૂઝ કરેલ)"</string>
-    <string name="alarm_notify_snooze_text" msgid="4819324081410990368">"એલાર્મ <xliff:g id="TIME">%s</xliff:g> માટે સેટ થયો. રદ કરવા માટે ટચ કરો."</string>
-    <string name="volume_button_setting_title" msgid="6937131248843413357">"વૉલ્યૂમ બટન્સ"</string>
-    <string name="volume_button_dialog_title" msgid="8768042543750036853">"બટન પ્રભાવ"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"સ્નૂઝ"</item>
-    <item msgid="3450979320164769576">"છોડી દો"</item>
-    <item msgid="6302517608411378024">"કંઈ કરશો નહીં"</item>
-  </string-array>
-    <string name="default_ringtone_setting_title" msgid="4549726190682964245">"ડિફોલ્ટ રિંગટોન સેટ કરો"</string>
-    <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>
-    <string name="desk_clock_button_description" msgid="4207371097361657274">"ઘડિયાળ પ્રદર્શન"</string>
-    <string name="label_description" msgid="8736179296142915727">"લેબલ"</string>
-    <string name="ringtone_description" msgid="7580922112921069925">"રિંગટોન"</string>
-    <string name="weather_fetch_failure" msgid="3425804832021006835">"હવામાન માહિતી અત્યારે ઉપલબ્ધ નથી."</string>
-    <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"ઘડિયાળમાં એલાર્મ્સ માટે ધ્વનિ પ્લેબેક સેવા સેટ કરી."</string>
-    <string name="loading_ringtone" msgid="6523322777415268044">"રિંગટોન લોડ કરી રહ્યું છે..."</string>
-    <string name="timer_ring_service_desc" msgid="2620214305660322415">"ઘડિયાળમાં સેટ કરેલ ટાઇમર્સ માટે ધ્વનિ પ્લેબેક સેવા."</string>
-    <string name="control_set_alarm" msgid="2194676418924016327">"એલાર્મ સેટ કરો"</string>
-    <!-- no translation found for control_set_alarm_with_existing (3359285346655630660) -->
-    <skip />
-    <string name="menu_alarm" msgid="4772010125376647519">"એલાર્મ"</string>
-    <string name="menu_timer" msgid="6459070074762877114">"ટાઇમર"</string>
-    <string name="menu_clock" msgid="5612760670606829805">"ઘડિયાળ"</string>
-    <string name="menu_stopwatch" msgid="3396117705293574701">"સ્ટોપવૉચ"</string>
-    <string name="button_alarms" msgid="3907838219512538763">"એલાર્મ ઉમેરો"</string>
-    <string name="button_cities" msgid="4555761857494501363">"શહેરો"</string>
-    <string name="button_menu" msgid="6050484561842120282">"વધુ વિકલ્પો"</string>
-    <string name="menu_item_settings" msgid="1413723516369078665">"સેટિંગ્સ"</string>
-    <string name="menu_item_help" msgid="4570953476186849841">"સહાય"</string>
-    <string name="menu_item_night_mode" msgid="3486930302245398975">"રાત્રિ મોડ"</string>
-    <string name="menu_item_sort_by_gmt_offset" msgid="3120860422682721706">"સમય દ્વારા સૉર્ટ કરો"</string>
-    <string name="menu_item_sort_by_name" msgid="1762931290495104106">"નામ દ્વારા સૉર્ટ કરો"</string>
-    <string name="selected_cities_label" msgid="3607479399424246605">"પસંદ કરેલ શહેરો"</string>
-    <string name="sw_resume_button" msgid="2569360966002022248">"ફરી શરૂ કરો"</string>
-    <string name="sw_start_button" msgid="8373422516681242270">"પ્રારંભ કરો"</string>
-    <string name="sw_stop_button" msgid="8322958613123274451">"રોકો"</string>
-    <string name="sw_lap_button" msgid="6992264696039004233">"લેપ"</string>
-    <string name="sw_reset_button" msgid="6616804728322906117">"રીસેટ કરો"</string>
-    <string name="sw_share_button" msgid="4478648110382859382">"શેર કરો"</string>
-    <string name="hours_label" msgid="3393478155635368097">"સહાય"</string>
-    <string name="minutes_label" msgid="3568098128251438588">"મી."</string>
-    <string name="seconds_label" msgid="124655952824003246">"સે."</string>
-    <string name="hours_label_description" msgid="8652842524970971830">"કલાક"</string>
-    <string name="minutes_label_description" msgid="965686733490357796">"મિનિટ"</string>
-    <string name="seconds_label_description" msgid="3821620053141299692">"સેકંડ"</string>
-    <string name="zero" msgid="7102083421938355017">"0"</string>
-    <string name="sw_share_main" msgid="7703563468204234405">"મારો સમય છે <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="sw_share_laps" msgid="614390674795945007">"લેપ સમય:"</string>
-    <string name="sw_notification_lap_number" msgid="3535420316052647126">"લેપ <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="Nhours_description">
-    <item quantity="one" msgid="371227238759147245">"1 કલાક"</item>
-    <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> કલાક"</item>
-  </plurals>
-  <plurals name="Nminutes_description">
-    <item quantity="one" msgid="1001391305885322059">"1 મિનિટ"</item>
-    <item quantity="other" msgid="6948360065351547776">"<xliff:g id="NUMBER">%d</xliff:g> મિનિટ"</item>
-  </plurals>
-  <plurals name="Nseconds_description">
-    <item quantity="one" msgid="6589853086641485725">"1 સેકંડ"</item>
-    <item quantity="other" msgid="7583230315175387547">"<xliff:g id="NUMBER">%d</xliff:g> સેકંડ"</item>
-  </plurals>
-    <string name="timer_add_timer" msgid="862733633862574752">"ટાઇમર ઉમેરો"</string>
-    <string name="timer_start" msgid="6158486445614356442">"પ્રારંભ કરો"</string>
-    <string name="timer_delete" msgid="8699122001991909302">"કાઢી નાખો"</string>
-    <string name="timer_descriptive_delete" msgid="8794915342760383536">"<xliff:g id="NUMBER_STRING">%s</xliff:g> ને કાઢી નાખો"</string>
-    <string name="timer_plus_one" msgid="6631211310420106116">"1 મિનિટ ઉમેરો"</string>
-    <string name="timer_plus_1_min" msgid="8645224089494875062">"1 મિનિટ ઉમેરો"</string>
-    <string name="timer_stop" msgid="3361154678667736722">"રોકો"</string>
-    <string name="timer_done" msgid="2375990511982914051">"થઈ ગયું"</string>
-    <string name="timer_reset" msgid="7848424809190171640">"રીસેટ કરો"</string>
-    <string name="timer_cancel" msgid="3572868404230815644">"રદ કરો"</string>
-    <string name="timer_times_up" msgid="9190440395938519009">"સમય પૂરો થયો!"</string>
-    <string name="timer_notification_label" msgid="4933184831583137249">"ટાઇમર"</string>
-    <string name="timers_max_count_reached" msgid="9140022846793903813">"મહત્તમ 4 ટાઇમર્સ"</string>
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"તમે એકદમ વેગવાન રાક્ષસ છો."</item>
-    <item msgid="6332879039890727169">"તમારી મહેનતના ફળનો આનંદ લો."</item>
-    <item msgid="815382761274660130">"Androids ઝડપ માટે જાણીતા છે, પરંતુ તમારા જેટલા ઝડપી નથી!"</item>
-    <item msgid="7916250650982813737">"હાશ્શ."</item>
-    <item msgid="6836603904515182333">"છેલ્લી વખત."</item>
-    <item msgid="7508085100680861631">"કેવો પ્રચંડ વેગ."</item>
-    <item msgid="5961245252909589573">"ચાલો સમયને ફરીથી ખેંચીએ."</item>
-    <item msgid="5211891900854545940">"ફક્ત એક જમ્પ ડાબી બાજુએ."</item>
-    <item msgid="9071353477103826053">"તમારી પાસે ઉતાવળ કરવા એક પેલેટ છે."</item>
-    <item msgid="3785193933691117181">"ફોટોનિક વેગ."</item>
-  </string-array>
-    <string name="home_label" msgid="4436139365695453870">"હોમ"</string>
-    <string name="cities_activity_title" msgid="8552462751129256730">"શહેરો"</string>
-    <string name="clock_settings" msgid="8317286807280600391">"ઘડિયાળ"</string>
-    <string name="clock_style" msgid="2265011060429742344">"શૈલી"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"એનાલોગ"</item>
-    <item msgid="8483930821046925592">"ડિજિટલ"</item>
-  </string-array>
-    <string name="automatic_home_clock" msgid="6274174710735449252">"સ્વચલિત ઘર ઘડિયાળ"</string>
-    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"એવા ક્ષેત્રોમાં સફર કરતી વખતે કે જ્યાં સમય અલગ હોય, ઘર માટે ઘડિયાળ ઉમેરો"</string>
-    <string name="home_time_zone" msgid="9199730676287974501">"હોમ સમય ઝોન"</string>
-    <string name="home_time_zone_title" msgid="807894493443834624">"હોમ સમય ઝોન"</string>
-    <string name="time_picker_cancel" msgid="7437106489606013077">"રદ કરો"</string>
-    <string name="time_picker_set" msgid="331153175471468051">"ઑકે"</string>
-    <string name="time_picker_time_seperator" msgid="7484926510054777041">":"</string>
-    <string name="time_picker_ampm_label" msgid="6754113715199751083">"--"</string>
-    <string name="time_picker_00_label" msgid="6001006474735281911">":00"</string>
-    <string name="time_picker_30_label" msgid="1027250857384838129">":30"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"માર્શલ આઇલેન્ડ્સ"</item>
-    <item msgid="4196408495909011020">"મિડવે આઇલેન્ડ"</item>
-    <item msgid="1414384194857730006">"હવાઈ"</item>
-    <item msgid="2687091371581931926">"અલાસ્કા"</item>
-    <item msgid="1922100269679049660">"પેસિફિક સમય"</item>
-    <item msgid="7156402158716866161">"તિજુઆના"</item>
-    <item msgid="1144117502254612241">"એરિઝોના"</item>
-    <item msgid="101284182011722637">"ચિહુઆહુઆ"</item>
-    <item msgid="689121094232986897">"માઉન્ટેન ટાઇમ"</item>
-    <item msgid="5445331923942302756">"મધ્ય અમેરિકા"</item>
-    <item msgid="2749806434052452351">"કેન્દ્રીય સમય"</item>
-    <item msgid="3997138870229703753">"મેક્સિકો સિટી"</item>
-    <item msgid="5425567073027744888">"સાસ્કાટચેવન"</item>
-    <item msgid="2877342865396629368">"બોગોટા"</item>
-    <item msgid="568682398893899670">"પૂર્વી સમય"</item>
-    <item msgid="668135984541863866">"વેનેઝુએલા"</item>
-    <item msgid="3737474220861486223">"એટલાન્ટિક સમય (બાર્બાડોસ)"</item>
-    <item msgid="6279116051273436870">"એટલાન્ટિક સમય (કેનેડા)"</item>
-    <item msgid="8513382867172014244">"મનૌસ"</item>
-    <item msgid="7776299003105932407">"સાંટિયાગો"</item>
-    <item msgid="8636989494746218677">"ન્યૂફાઉન્ડલેન્ડ"</item>
-    <item msgid="4402541016410147505">"બ્રાસિલિયા"</item>
-    <item msgid="2251184440733164084">"બ્યુનસ એયર્સ"</item>
-    <item msgid="6202926618569004969">"ગ્રીનલેન્ડ"</item>
-    <item msgid="2355275037115290628">"મૉંટેવિડિઓ"</item>
-    <item msgid="1377549694711708945">"મધ્ય-એટલાંટિક"</item>
-    <item msgid="3457671272126347981">"એઝોરેઝ"</item>
-    <item msgid="3659315141063710840">"કેપ વર્ડે આઇલેન્ડ્સ"</item>
-    <item msgid="1260941741802367635">"કાસાબ્લાંકા"</item>
-    <item msgid="8275203689687954762">"લંડન, ડબલિન"</item>
-    <item msgid="5970179539479320905">"એમ્સ્ટર્ડમ, બર્લિન"</item>
-    <item msgid="5396319478750517962">"બેલગ્રેડ"</item>
-    <item msgid="8688787475056663004">"બ્રસેલ્સ"</item>
-    <item msgid="3415827874921681622">"સારાજેવો"</item>
-    <item msgid="402008965928320066">"વિંડહૉક"</item>
-    <item msgid="6436942724959275569">"પ. આફ્રિકા સમય"</item>
-    <item msgid="954536568417204026">"અમ્માન, જોર્ડન"</item>
-    <item msgid="8932745482008902551">"એથેન્સ, ઇસ્તાંબુલ"</item>
-    <item msgid="320025725949024510">"બૈરુત, લેબનોન"</item>
-    <item msgid="7242083112551905970">"કૈરો"</item>
-    <item msgid="7241520146011450419">"હેલસિંકી"</item>
-    <item msgid="2717065017510546526">"જેરુસલેમ"</item>
-    <item msgid="8698556287741466553">"મિંસ્ક"</item>
-    <item msgid="1797598357342084506">"હરારે"</item>
-    <item msgid="5169119919905066998">"બગદાદ"</item>
-    <item msgid="2615788116201065182">"મોસ્કો"</item>
-    <item msgid="9084354867885584646">"કુવૈત"</item>
-    <item msgid="1351570519986178268">"નૈરોબી"</item>
-    <item msgid="7094569580635877460">"તેહરાન"</item>
-    <item msgid="3953138772617909704">"બાકુ"</item>
-    <item msgid="2868893113598800752">"બિલિસિ"</item>
-    <item msgid="7088581865802476373">"યેરેવાન"</item>
-    <item msgid="1941122257623887992">"દુબઈ"</item>
-    <item msgid="9194797225058249720">"કાબુલ"</item>
-    <item msgid="6486569254364577332">"ઇસ્લામાબાદ, કરાચી"</item>
-    <item msgid="5487724896895412089">"ઉરાલ્સ્ક"</item>
-    <item msgid="364906869710826982">"યેકાતેરિનબર્ગ"</item>
-    <item msgid="2106505051751383358">"કોલકાતા"</item>
-    <item msgid="6851586621581501447">"શ્રીલંકા"</item>
-    <item msgid="800438544128213134">"કાઠમંડુ"</item>
-    <item msgid="6173621471007643021">"અસ્તાના"</item>
-    <item msgid="8645125891971581128">"યાંગૂન"</item>
-    <item msgid="2886407505119737794">"ક્રિસ્નોયાર્સ્ક"</item>
-    <item msgid="3408222398188107090">"બેંગકોક"</item>
-    <item msgid="4441612937172851228">"બેઇજિંગ"</item>
-    <item msgid="4936715789028996930">"હોંગકોંગ"</item>
-    <item msgid="4261031143777385525">"ઇર્કુત્સ્ક"</item>
-    <item msgid="3538060959338191835">"કુઆલાલમ્પુર"</item>
-    <item msgid="1438847562643099201">"પર્થ"</item>
-    <item msgid="3063913827688244383">"તાઇપેઇ"</item>
-    <item msgid="3502757135046564209">"સીઓલ"</item>
-    <item msgid="6107588684519111669">"ટોક્યો, ઓસાકા"</item>
-    <item msgid="4350769099755608471">"યકુત્સક"</item>
-    <item msgid="2422707004533526462">"એડિલેઇડ"</item>
-    <item msgid="1292192084554134339">"ડાર્વિન"</item>
-    <item msgid="1320883699470001716">"બ્રિસબેન"</item>
-    <item msgid="5137198806146386527">"હોબાર્ટ"</item>
-    <item msgid="5920063686933941174">"સિડની, કેનબેરા"</item>
-    <item msgid="615906039696009425">"વ્લેડિવોસ્ટોક"</item>
-    <item msgid="7738680449356275374">"ગ્વામ"</item>
-    <item msgid="2882915026380778227">"મેગાડન"</item>
-    <item msgid="8255615641810148152">"ઑકલેન્ડ"</item>
-    <item msgid="3027153773466391728">"ફીજી"</item>
-    <item msgid="5911600083231840181">"ટોંગા"</item>
-    <item msgid="5176858645450908751">"જાકાર્તા"</item>
-  </string-array>
-    <string name="alarm_settings" msgid="2947147071388290814">"એલાર્મ્સ"</string>
-    <string name="stopwatch_service_desc" msgid="8416624630388063996">"સૂચના ચલાવવા માટે સ્ટોપવૉચ સેવા."</string>
-    <string name="swn_stopped" msgid="783124901663086172">"રોક્યું"</string>
-    <string name="description_direction_right" msgid="5709209043267548985">"કાઢી નાખવા માટે જમણે સવાઇપ કરો"</string>
-    <string name="description_direction_left" msgid="7448141043674998679">"સ્નૂઝ કરવા માટે ડાબે સ્વાઇપ કરો"</string>
-    <string name="description_direction_both" msgid="1841309486023845685">"સ્નૂઝ કરવા માટે ડાબે અથવા છોડી દેવા માટે જમણે સવાઇપ કરો"</string>
-    <string name="timer_stopped" msgid="2730331837832462008">"ટાઇમર બંધ કર્યું"</string>
-    <string name="timers_stopped" msgid="2393640808691864520">"<xliff:g id="NUMBER">%d</xliff:g> ટાઇમર્સ બંધ કર્યાં"</string>
-    <string name="all_timers_stopped_notif" msgid="278532320068394600">"તમારા ટાઇમર્સ જોવા માટે ટચ કરો"</string>
-    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> ટાઇમર્સ"</string>
-    <string name="next_timer_notif" msgid="6136454740115613653">"આગલું ટાઇમર: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
-    <string name="screensaver_settings" msgid="7013450738357352801">"સ્વપ્ન સેટિંગ્સ"</string>
-    <string name="night_mode_title" msgid="5983813889469616299">"રાત્રિ મોડ"</string>
-    <string name="night_mode_summary" msgid="1017350187324162631">"ખૂબ આછું પ્રદર્શન (અંધારા રૂમ્સ માટે)"</string>
-    <string name="expand_alarm" msgid="7392616528943305020">"એલાર્મ વિસ્તૃત કરો"</string>
-    <string name="collapse_alarm" msgid="3561772046433483980">"એલાર્મ સંકુચિત કરો"</string>
-    <string name="alarm_undo" msgid="5710042601177655254">"કરેલું પાછું લાવો"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"એલાર્મ કાઢી નાખ્યો."</string>
-    <string name="slash" msgid="2077577763821006919">"/"</string>
-    <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
-    <string name="next_alarm_description" msgid="2650244835760747046">"આગલો એલાર્મ: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
-    <string name="label_unlabeled" msgid="4699506713571930740"></string>
-    <string name="alarms_selected" msgid="1075308195332888260">"<xliff:g id="ALARMS">%d</xliff:g> પસંદ કર્યાં"</string>
-    <string name="deleted_message" msgid="1220848140260509437">"કાઢી નાખ્યું"</string>
-  <plurals name="alarm_delete_confirmation">
-    <item quantity="one" msgid="111940612131906802">"પસંદ કરેલ એલાર્મ કાઢી નાખીએ?"</item>
-    <item quantity="other" msgid="6918176478191272189">"પસંદ કરેલા એલાર્મ્સ કાઢી નાખીએ?"</item>
-  </plurals>
-    <string name="timer_delete_confirmation" msgid="2815524107015816453">"આ ટાઇમર કાઢી નાખીએ?"</string>
-    <string name="city_delete_confirmation" msgid="1783441538785676299">"આ શહેર દૂર કરીએ?"</string>
-    <string name="digital_gadget" msgid="2326954556720571358">"ડિજિટલ ઘડિયાળ"</string>
-    <string name="no_alarms" msgid="6429431324842022917">"એલાર્મ્સ નથી"</string>
-    <string name="no_alarms_set" msgid="4887558279496044764">"કોઈ એલાર્મ્સ સેટ નથી"</string>
-    <string name="no_upcoming_alarms" msgid="2889840988069436254">"કોઈ આગામી એલાર્મ નથી"</string>
-    <string name="time_format_12_mode" msgid="1619464909892545536">"hh:mm a"</string>
-    <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
-    <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
-    <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
-</resources>

diff --git a/res/values-it/array.xml b/res/values-it/array.xml
index 501be68..ce357df 100644
--- a/res/values-it/array.xml
+++ b/res/values-it/array.xml

@@ -168,7 +168,7 @@
     <item msgid="1603342478771190398">"Canberra"</item>
     <item msgid="7369443573793537977">"Darwin"</item>
     <item msgid="6038622967693853356">"Melbourne"</item>
-    <item msgid="5987600941235656656">"Nuovo Galles del Sud"</item>
+    <item msgid="5987600941235656656">"Nuovo Galles meridionale"</item>
     <item msgid="8993222367897103441">"Perth"</item>
     <item msgid="2331172541371685437">"Queensland"</item>
     <item msgid="2150912736505182699">"Sydney"</item>

diff --git a/res/values-kk-rKZ/array.xml b/res/values-kk-rKZ/array.xml
index f7ed977..c83874d 100644
--- a/res/values-kk-rKZ/array.xml
+++ b/res/values-kk-rKZ/array.xml

@@ -97,7 +97,7 @@
     <item msgid="1121150121639680484">"Нассау"</item>
     <item msgid="8783518093470040300">"Нью-Йорк"</item>
     <item msgid="8685565479120721681">"Беула"</item>
-    <item msgid="6854366494939955818">"Сентер"</item>
+    <item msgid="6854366494939955818">"Орталық"</item>
     <item msgid="7325195282520040665">"Нью-Салем"</item>
     <item msgid="3368872340258580668">"Панама"</item>
     <item msgid="58921303248631494">"Финикс"</item>
@@ -133,7 +133,7 @@
     <item msgid="138195076135095830">"Хеврон"</item>
     <item msgid="2792857260329757927">"Хошимин"</item>
     <item msgid="2753915200056183217">"Гонконг"</item>
-    <item msgid="6375713877627922624">"Ыстамбұл"</item>
+    <item msgid="6375713877627922624">"Стамбул"</item>
     <item msgid="164857852656167029">"Джакарта"</item>
     <item msgid="514551483895638508">"Иерусалим"</item>
     <item msgid="7852405794661778785">"Кабул"</item>
@@ -192,7 +192,7 @@
     <item msgid="7950073703814432186">"Гибралтар"</item>
     <item msgid="4616641627708493425">"Хельсинки"</item>
     <item msgid="212359461403262711">"Мэн аралы"</item>
-    <item msgid="4245799496293578703">"Ыстамбұл"</item>
+    <item msgid="4245799496293578703">"Стамбул"</item>
     <item msgid="4477669700025211678">"Киев"</item>
     <item msgid="7233802930588725294">"Лиссабон"</item>
     <item msgid="7186725202454661926">"Лондон"</item>
@@ -221,7 +221,7 @@
     <item msgid="4469591142000997702">"Загреб"</item>
     <item msgid="3827805692447432666">"Цюрих"</item>
     <item msgid="7710293346890852314">"Антананариву"</item>
-    <item msgid="8675463358261691187">"Maльдив"</item>
+    <item msgid="8675463358261691187">"Maльдивы"</item>
     <item msgid="8258461076442136172">"Маврикий"</item>
     <item msgid="3150318624617990367">"Окленд"</item>
     <item msgid="8427795435830682122">"Фиджи"</item>
@@ -273,7 +273,7 @@
     <item msgid="1744025839066009857">"Рено"</item>
     <item msgid="6276904698731697502">"Блэк-Рок сити"</item>
     <item msgid="2844451059935789778">"Доха"</item>
-    <item msgid="4108653157206192019">"Бейжің"</item>
+    <item msgid="4108653157206192019">"Пекин"</item>
     <item msgid="6115360044399896579">"Мумбаи"</item>
     <item msgid="7140676596549732117">"Дели"</item>
     <item msgid="1236127343975476693">"Осака"</item>

diff --git a/res/values-pa-rIN/array.xml b/res/values-pa-rIN/array.xml
deleted file mode 100644
index 202c4d7..0000000
--- a/res/values-pa-rIN/array.xml
+++ /dev/null

@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright (C) 2012 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="cities_names">
-    <item msgid="2528360178629244616">"ਅਬਿਦਜਾਨ"</item>
-    <item msgid="6944239639314079002">"ਐਕਰਾ"</item>
-    <item msgid="1882840263263451068">"ਐਡਿਸ ਅਬਾਬਾ"</item>
-    <item msgid="1028929145486670248">"ਅਲਜੀਅਰਸ"</item>
-    <item msgid="3701057587584676092">"ਬਲਾਂਟਾਇਰ"</item>
-    <item msgid="2886322632268247117">"ਬ੍ਰੈਜ਼ਾਵਿਲੇ"</item>
-    <item msgid="6897570881968822043">"ਕਾਇਰੋ"</item>
-    <item msgid="267605539096913498">"ਕਾਸਾਬਲਾਂਕਾ"</item>
-    <item msgid="4211664465580587414">"ਕੋਨਾਕਰਾਈ"</item>
-    <item msgid="4541602834272820641">"ਡਕਾਰ"</item>
-    <item msgid="8465732069409300950">"ਡਰ ਐਸ ਸਲਾਮ"</item>
-    <item msgid="6622510954516549116">"ਜਾਇਬੂਟੀ"</item>
-    <item msgid="2276489800209768303">"ਫ੍ਰੀਟਾਊਨ"</item>
-    <item msgid="1240576997711861023">"ਗੈਬਰੋਨ"</item>
-    <item msgid="5349334209171364385">"ਹਰਾਰੇ"</item>
-    <item msgid="6113191477690557327">"ਜੋਹਨਸਬਰਗ"</item>
-    <item msgid="927428576674822400">"ਕੰਪਾਲਾ"</item>
-    <item msgid="4026832076115235469">"ਖਰਟੂਮ"</item>
-    <item msgid="5410782788724286381">"ਕਿਗਾਲੀ"</item>
-    <item msgid="7732811111504353705">"ਕਿੰਸ਼ਾਸਾ"</item>
-    <item msgid="932809008471125011">"ਲਾਗੋਸ"</item>
-    <item msgid="2795948760365855772">"ਮਸੈਰੁ"</item>
-    <item msgid="6464910812969504493">"ਮੋਗਾਦਿਸ਼ੁ"</item>
-    <item msgid="4620365036488328944">"ਨੈਰੋਬੀ"</item>
-    <item msgid="4196652835056468390">"ਸਾਓ ਤੋਮੇ"</item>
-    <item msgid="2002053268354813523">"ਟਿਮਬੁਕਤੁ"</item>
-    <item msgid="6789355206260535774">"ਤ੍ਰਿਪੋਲੀ"</item>
-    <item msgid="1662913445892282208">"ਟਿਊਨਿਸ"</item>
-    <item msgid="1958350526592385504">"ਐਂਕੋਰੇਜ"</item>
-    <item msgid="4530964415403549431">"ਮੈਂਡੋਜ਼ਾ"</item>
-    <item msgid="5519841965499989640">"ਅਰੂਬਾ"</item>
-    <item msgid="3619641653330712167">"ਅਸਨਸਿਓਨ"</item>
-    <item msgid="1807527094848372100">"ਬਾਰਬਾਡੋਜ਼"</item>
-    <item msgid="7833099001850188721">"ਬੈਲੀਜ਼"</item>
-    <item msgid="5063415446546412441">"ਬੋਗੋਟਾ"</item>
-    <item msgid="2839227656429500365">"ਬੁਏਨੋਸ ਐਰਸ"</item>
-    <item msgid="1133762043888408997">"ਕੈਨਕੁਨ"</item>
-    <item msgid="5326063045518438386">"ਕਾਰਾਕੈਸ"</item>
-    <item msgid="889935230113732517">"ਕੈਮੈਨ"</item>
-    <item msgid="3444477982230350362">"ਸ਼ਿਕਾਗੋ"</item>
-    <item msgid="610305270095390771">"ਕੋਸਟਾ ਰੀਕਾ"</item>
-    <item msgid="4297448531030514920">"ਕੁਰਾਸਾਓ"</item>
-    <item msgid="1819003821428989864">"ਡੌਸਨ ਕ੍ਰੀਕ"</item>
-    <item msgid="4753714764113170675">"ਡੈਨਵਰ"</item>
-    <item msgid="2279315094917045244">"ਡੈਟਰੋਇਟ"</item>
-    <item msgid="1330228105893462956">"ਡੋਮੀਨਿਕਾ"</item>
-    <item msgid="3303245425281858320">"ਐਡਮੋਂਟਨ"</item>
-    <item msgid="6102675683216802960">"ਅਲ ਸਾਲਵਾਡੋਰ"</item>
-    <item msgid="7404823948632138334">"ਫੋਰਟਾਲੈਜ਼ਾ"</item>
-    <item msgid="5295234178172153733">"ਗ੍ਰਾਂਡ ਤੁਰਕ"</item>
-    <item msgid="3015155377774814857">"ਗ੍ਰੇਨਾਡਾ"</item>
-    <item msgid="5124228611616346914">"ਗੁਆਟੇਮਾਲਾ"</item>
-    <item msgid="890870630819396468">"ਗੁਆਨਾ"</item>
-    <item msgid="7195964234494402331">"ਹੈਲੀਫੈਕਸ"</item>
-    <item msgid="4983877234758737190">"ਹਵਾਨਾ"</item>
-    <item msgid="2738888001225341531">"ਇੰਡੀਅਨਪੋਲਿਸ"</item>
-    <item msgid="5335614190119698790">"ਨੌਕਸ"</item>
-    <item msgid="9056292535030679310">"ਮਰੈਂਗੋ"</item>
-    <item msgid="1049051761793330471">"ਪੀਟਰਸਬਰਗ"</item>
-    <item msgid="4086392912705989429">"ਸ਼ਹਿਰ ਦੱਸੋ"</item>
-    <item msgid="4953356468739912331">"ਵੈਵੇ"</item>
-    <item msgid="879918079035739958">"ਵਿੰਸੀਨਸ"</item>
-    <item msgid="620064188588916047">"ਵਿਨਾਮੈਕ"</item>
-    <item msgid="1743310759320576964">"ਕਿੰਗਸਟਨ"</item>
-    <item msgid="5836540468054579646">"ਨਿਉਸਤ੍ਰਾ ਸੈਨੋਰਾ ਦੇ ਲਾ ਪਾਜ਼"</item>
-    <item msgid="9111190480556180457">"ਲਿਮਾ"</item>
-    <item msgid="3849323884810644665">"ਲੌਸ ਏਂਜਲਸ"</item>
-    <item msgid="9186705637161264387">"ਲੁਈਸਵਿਲੇ"</item>
-    <item msgid="6045939557161114820">"ਮਾਨਾਗੁਆ"</item>
-    <item msgid="3688923880208568496">"ਮਾਰਟੀਨੀਕਿਉ"</item>
-    <item msgid="3124245926616896140">"ਮੈਂਡੋਜ਼ਾ"</item>
-    <item msgid="8264013691437690644">"ਮੈਟਲਾਕਤਲਾ"</item>
-    <item msgid="3242307788223843671">"ਮੈਕਸੀਕੋ ਸਿਟੀ"</item>
-    <item msgid="3904210242491724008">"ਮੋਂਟੈਰੇ"</item>
-    <item msgid="2049700402307558992">"ਮੋਂਟੈਵੀਡੀਓ"</item>
-    <item msgid="6972371385309297826">"ਮੋਂਟੀਰੀਅਲ"</item>
-    <item msgid="1121150121639680484">"ਨਸਾਉ"</item>
-    <item msgid="8783518093470040300">"ਨਿਊ ਯੌਰਕ"</item>
-    <item msgid="8685565479120721681">"ਬੈਉਲਾ"</item>
-    <item msgid="6854366494939955818">"ਸੈਂਟਰ"</item>
-    <item msgid="7325195282520040665">"ਨਿਊ ਸਲੇਮ"</item>
-    <item msgid="3368872340258580668">"ਪਨਾਮਾ"</item>
-    <item msgid="58921303248631494">"ਫੋਨਿਕਸ"</item>
-    <item msgid="6678389014419621494">"ਪੋਰਟ ਔਫ ਸਪੇਨ"</item>
-    <item msgid="5255184875289196899">"ਪੋਰਟ-ਔ-ਪ੍ਰਿੰਸ"</item>
-    <item msgid="7039428977566254389">"ਪਿਉਰਟੋ ਰੀਕੋ"</item>
-    <item msgid="1577859671465557300">"ਸੈਂਟੋ ਡੋਮਿੰਗੋ"</item>
-    <item msgid="3956700126827381905">"ਸਾਓ ਪਉਲੋ"</item>
-    <item msgid="3851056559336304908">"ਸੈਂਟ ਜੋਨਸ"</item>
-    <item msgid="7620601490016157459">"ਸੈਂਟ ਕਿਟਸ"</item>
-    <item msgid="256494147725561888">"ਸੈਂਟ ਲੁਸੀਆ"</item>
-    <item msgid="9065982618380084594">"ਸੈਂਟ ਥੌਮਸ"</item>
-    <item msgid="7424657189317481507">"ਟਿਜੁਆਨਾ"</item>
-    <item msgid="7378768724772963031">"ਟੋਰੰਟੋ"</item>
-    <item msgid="2880175928020421322">"ਵੈਨਕੂਵਰ"</item>
-    <item msgid="8906495585877998744">"ਵਿਨੀਪੈਗ"</item>
-    <item msgid="8681645071790623069">"ਸਾਊਥ ਪੋਲੈ"</item>
-    <item msgid="9066834921549182064">"ਲੋਂਗੀਈਅਰਬਿਆਨ"</item>
-    <item msgid="4656709932014204632">"ਅਲਮੈਟੀ"</item>
-    <item msgid="2173021164159165084">"ਅਮਾਨ"</item>
-    <item msgid="5365315490101319010">"ਐਨਾਡਰ"</item>
-    <item msgid="2203136550754775298">"ਅਕਤਾਉ"</item>
-    <item msgid="6373057865921966096">"ਬਗਦਾਦ"</item>
-    <item msgid="7705451629446449789">"ਬਹਿਰੈਨ"</item>
-    <item msgid="2201480850069597815">"ਬਾਕੁ"</item>
-    <item msgid="424770109352500733">"ਬੈਂਕਾਕ"</item>
-    <item msgid="5329081174177673828">"ਬੈਰੁਤ"</item>
-    <item msgid="7187135889522860058">"ਕਲਕੱਤਾ"</item>
-    <item msgid="8261312970920594511">"ਦਮਸਕਸ"</item>
-    <item msgid="6050005781178769107">"ਢਾਕਾ"</item>
-    <item msgid="846831973484498790">"ਦੁਬਈ"</item>
-    <item msgid="6320380511060318660">"ਗਾਜ਼ਾ"</item>
-    <item msgid="138195076135095830">"ਹੈਬਰੋਨ"</item>
-    <item msgid="2792857260329757927">"ਹੋ ਚੀ ਮਿਨ੍ਹ"</item>
-    <item msgid="2753915200056183217">"ਹਾਂਗ ਕਾਂਗ"</item>
-    <item msgid="6375713877627922624">"ਇਸਤਾਨਬੁਲ"</item>
-    <item msgid="164857852656167029">"ਜਕਾਰਤਾ"</item>
-    <item msgid="514551483895638508">"ਜੇਰੁਸਲੇਮ"</item>
-    <item msgid="7852405794661778785">"ਕਾਬੁਲ"</item>
-    <item msgid="2733033767438957766">"ਕਰਾਚੀ"</item>
-    <item msgid="5644311217186397680">"ਕਾਠਮਾਂਡੂ"</item>
-    <item msgid="1242216853434928489">"ਕੁਆਲਾਲਮਪੁਰ"</item>
-    <item msgid="4933780769758115782">"ਕੁਵੈਤ"</item>
-    <item msgid="6882764635090995312">"ਮਕਾਉ"</item>
-    <item msgid="3986352476396048104">"ਮਨੀਲਾ"</item>
-    <item msgid="7941758124259560958">"ਮਸਕਟ"</item>
-    <item msgid="2671480270494284192">"ਫਨੋਮ ਪੈਨ੍ਹ"</item>
-    <item msgid="3585358766120768888">"ਪਿਓਂਗਯਾਂਗ"</item>
-    <item msgid="282733287703161268">"ਕਤਰ"</item>
-    <item msgid="8551825553277677949">"ਰੰਗੂਨ"</item>
-    <item msgid="3510541723342902050">"ਰਿਆਧ"</item>
-    <item msgid="7301933049899867383">"ਸਾਈਗੋਨ"</item>
-    <item msgid="2859585838402694009">"ਸਿਓਲ"</item>
-    <item msgid="33498601045535875">"ਸ਼ੰਘਾਈ"</item>
-    <item msgid="8274790879257759399">"ਸਿੰਗਾਪੁਰ"</item>
-    <item msgid="4185891512451859606">"ਤਾਈਪੇਈ"</item>
-    <item msgid="8272983787037437358">"ਤੇਹਰਾਨ"</item>
-    <item msgid="7548402686482506151">"ਟੈਲ ਅਵੀਵ"</item>
-    <item msgid="6921751833980197720">"ਟੋਕਿਓ"</item>
-    <item msgid="59728156515393986">"ਉਲਾਨਬਾਤਰ"</item>
-    <item msgid="701446121859732513">"ਬਰਮੁਡਾ"</item>
-    <item msgid="6874435045145230527">"ਕੈਨਰੀ"</item>
-    <item msgid="1975124795172898686">"ਕੇਪ ਵਰਡੇ"</item>
-    <item msgid="5405194758503124447">"ਰੈਕਜਾਵਿਕ"</item>
-    <item msgid="4841506971765063373">"ਸਟੈਨਲੀ"</item>
-    <item msgid="3192252088299410199">"ਅਦੈਲੇਡ"</item>
-    <item msgid="4515440099016150233">"ਬ੍ਰਿਸਬੇਨ"</item>
-    <item msgid="1603342478771190398">"ਕੈਨਬੈਰਾ"</item>
-    <item msgid="7369443573793537977">"ਡਰਵਿਨ"</item>
-    <item msgid="6038622967693853356">"ਮੈਲਬੋਰਨ"</item>
-    <item msgid="5987600941235656656">"ਨਿਊ ਸਾਊਥ ਵੇਲਸ"</item>
-    <item msgid="8993222367897103441">"ਪਰਥ"</item>
-    <item msgid="2331172541371685437">"ਕਵੀਂਸਲੈਂਡ"</item>
-    <item msgid="2150912736505182699">"ਸਿਡਨੀ"</item>
-    <item msgid="8097029759143077179">"ਵਿਕਟੋਰੀਆ"</item>
-    <item msgid="2175264082469352441">"ਨਿਊਫਾਊਂਡਲੈਂਡ"</item>
-    <item msgid="5299806709792658953">"ਸਸਕੈਚਵਾਨ"</item>
-    <item msgid="2742335625880576228">"ਈਸਟਰ ਆਈਲੈਂਡ"</item>
-    <item msgid="3401105135843706855">"ਅਮਸਟਰਡੈਮ"</item>
-    <item msgid="7408055867187369479">"ਅੰਡੋਰਾ"</item>
-    <item msgid="7714099594043232998">"ਐਥਨਸ"</item>
-    <item msgid="7588965073415041593">"ਬੈਲਫਾਸਟ"</item>
-    <item msgid="8982755519728730268">"ਬੈਲਗ੍ਰੇਡ"</item>
-    <item msgid="5820954942905597949">"ਬਰਲਿਨ"</item>
-    <item msgid="7624062157455799880">"ਬ੍ਰਾਟੀਸਲਾਵਾ"</item>
-    <item msgid="6138895798733335888">"ਬ੍ਰਸਲਸ"</item>
-    <item msgid="8836227282219002613">"ਬੁਕਾਰੈਸਟ"</item>
-    <item msgid="8868098210480147802">"ਬੁਦਾਪੈਸਟ"</item>
-    <item msgid="114329374155996860">"ਚਿਸੀਨਉ"</item>
-    <item msgid="6487487167873723374">"ਕੋਪਨਹੈਗਨ"</item>
-    <item msgid="5264002034116955880">"ਡਬਲਿਨ"</item>
-    <item msgid="7950073703814432186">"ਗਿਬਲਰਤਾਰ"</item>
-    <item msgid="4616641627708493425">"ਹੈਲਸਿੰਕੀ"</item>
-    <item msgid="212359461403262711">"ਆਇਲ ਔਫ ਮੈਨ"</item>
-    <item msgid="4245799496293578703">"ਇਸਤਾਨਬੁਲ"</item>
-    <item msgid="4477669700025211678">"ਕਿਐਵ"</item>
-    <item msgid="7233802930588725294">"ਲਿਸਬਨ"</item>
-    <item msgid="7186725202454661926">"ਲੰਡਨ"</item>
-    <item msgid="5298853578615697920">"ਲਕਜ਼ਮਬਰਗ"</item>
-    <item msgid="3107227222663823852">"ਮਦਰੀਦ"</item>
-    <item msgid="6409612387432198642">"ਮਾਲਟਾ"</item>
-    <item msgid="6955558182074785338">"ਮਿੰਸਕ"</item>
-    <item msgid="6228242074512253552">"ਮੋਨੈਕੋ"</item>
-    <item msgid="6544575681565409774">"ਮਾਸਕੋ"</item>
-    <item msgid="3976815367069730505">"ਓਸਲੋ"</item>
-    <item msgid="2469420333993086275">"ਪੈਰਿਸ"</item>
-    <item msgid="7485656867179996639">"ਪਰਾਗ"</item>
-    <item msgid="988513162091270543">"ਰੀਗਾ"</item>
-    <item msgid="3998650297514954079">"ਰੋਮ"</item>
-    <item msgid="1732427206709814080">"ਸਨ ਮਾਰੀਨੋ"</item>
-    <item msgid="2794131568674225119">"ਸਾਰਾਜੈਵੋ"</item>
-    <item msgid="2400301040855226066">"ਸਿੰਫੈਰੋਪੋਲ"</item>
-    <item msgid="9186733542818983602">"ਸਕੋਪਜੈ"</item>
-    <item msgid="1586570243468059398">"ਸੋਫੀਆ"</item>
-    <item msgid="564898083230872572">"ਸਟੌਕਹੋਲਮ"</item>
-    <item msgid="8462542989781385012">"ਟੈਲਿਨ"</item>
-    <item msgid="6709788967440613264">"ਵੈਟੀਕੈਨ"</item>
-    <item msgid="8251863344440905549">"ਵਿਏਨਾ"</item>
-    <item msgid="3257947331297603891">"ਵਿਲਨਿਅਸ"</item>
-    <item msgid="2305299694079344212">"ਵਾਰਸੌ"</item>
-    <item msgid="4469591142000997702">"ਜ਼ਗਰੈਬ"</item>
-    <item msgid="3827805692447432666">"ਜ਼ਿਊਰਿਕ"</item>
-    <item msgid="7710293346890852314">"ਅੰਤਾਨਾਨਾਨਾਰੀਵੋ"</item>
-    <item msgid="8675463358261691187">"ਮਾਲਦੀਵਸ"</item>
-    <item msgid="8258461076442136172">"ਮੌਰਸ਼ੀਅਸ"</item>
-    <item msgid="3150318624617990367">"ਔਕਲੈਂਡ"</item>
-    <item msgid="8427795435830682122">"ਫਿਜੀ"</item>
-    <item msgid="1158779814198631169">"ਗੁਆਮ"</item>
-    <item msgid="5893704879373137457">"ਹੋਨੋਲੁਲੁ"</item>
-    <item msgid="1770338947698194275">"ਕਿਰਿਤੀਮਤੀ"</item>
-    <item msgid="3115018823853432422">"ਨੌਮੈਆ"</item>
-    <item msgid="8930848797035435014">"ਸਮੋਆ"</item>
-    <item msgid="5520094948583238358">"ਤਹੀਤੀ"</item>
-    <item msgid="7301905385854586936">"ਐਂਟੀਗੁਆ"</item>
-    <item msgid="8984152310253274404">"ਔਸਟਿਨ"</item>
-    <item msgid="6874533703004710145">"ਬੋਸਟਨ"</item>
-    <item msgid="7432962958322057136">"ਕਾਲਗਰੀ"</item>
-    <item msgid="8096684279604140978">"ਕੋਲੰਬਸ"</item>
-    <item msgid="936901718255724986">"ਡਲਾਸ"</item>
-    <item msgid="4015131634823666245">"ਨੌਕਸਵਿਲੇ"</item>
-    <item msgid="3978413466663710403">"ਮੈਮਫਿਸ"</item>
-    <item msgid="5023838008354228529">"ਮਿਆਮੀ"</item>
-    <item msgid="7182213480667543511">"ਮਿਨੀਆਪੋਲਿਸ"</item>
-    <item msgid="869023139270244552">"ਓਟਵਾ"</item>
-    <item msgid="8138869957811168440">"ਫਿਲਾਡੈਲਫਿਆ"</item>
-    <item msgid="1752278495028380978">"ਪੋਰਟਲੈਂਡ"</item>
-    <item msgid="8972733979389600134">"ਸਨ ਡਿਏਗੋ"</item>
-    <item msgid="304925930860094332">"ਸਨ ਫ੍ਰਾਂਸਿਸਕੋ"</item>
-    <item msgid="1092295421727954508">"ਸਾਲਟ ਲੇਕ ਸਿਟੀ"</item>
-    <item msgid="2861495155508879945">"ਸਨ ਜੋਸ"</item>
-    <item msgid="6951841899277574144">"ਸਨ ਸਾਲਵਾਡੋਰ"</item>
-    <item msgid="4063054959106860389">"ਸੀਟਲ"</item>
-    <item msgid="4985936045757148312">"ਸੈਂਟ ਲੁਈਸ"</item>
-    <item msgid="2498001791404810614">"ਵਾਸ਼ਿੰਗਟਨ ਡੀ.ਸੀ."</item>
-    <item msgid="6490744399654978915">"ਹੌਸਟਨ"</item>
-    <item msgid="5461172996986211872">"ਸਨ ਅੰਟੋਨੀਓ"</item>
-    <item msgid="7955879665647778362">"ਜੈਕਸਨਵਿਲੇ"</item>
-    <item msgid="7274737959786806118">"ਬਾਲਟੀਮੋਰ"</item>
-    <item msgid="5440109692257991959">"ਨਾਸ਼ਵਿਲੇ"</item>
-    <item msgid="2580598303029580540">"ਮਿਲਵੌਕੀ"</item>
-    <item msgid="5778397064882342884">"ਓਕਲਾਹੋਮਾ ਸਿਟੀ"</item>
-    <item msgid="60834900460576333">"ਲਾਸ ਵੇਗਸ"</item>
-    <item msgid="1242224546028941695">"ਅਲਬੁਕੇਰਕਿਉ"</item>
-    <item msgid="2108508912885156322">"ਟਕਸਨ"</item>
-    <item msgid="2736505692163909286">"ਸੈਕਰਾਮੈਂਟੋ"</item>
-    <item msgid="4244292537769840523">"ਅਟਲਾਂਟਾ"</item>
-    <item msgid="1458420523389537755">"ਕਲੀਵਲੈਂਡ"</item>
-    <item msgid="6576927115185043547">"ਨਿਊ ਓਰਲੀਂਸ"</item>
-    <item msgid="2723274638984844697">"ਟੈਂਪਾ"</item>
-    <item msgid="1176352970801801624">"ਪਿਟਸਬਰਗ"</item>
-    <item msgid="5624802871949256105">"ਸਿਨਸਨੈਟੀ"</item>
-    <item msgid="527393217276418005">"ਮਾਊਂਟੇਨ ਵਿਊ"</item>
-    <item msgid="1744025839066009857">"ਰੈਨੋ"</item>
-    <item msgid="6276904698731697502">"ਬਲੈਕ ਰੌਕ ਸਿਟੀ"</item>
-    <item msgid="2844451059935789778">"ਦੋਹਾ"</item>
-    <item msgid="4108653157206192019">"ਬੀਜਿੰਗ"</item>
-    <item msgid="6115360044399896579">"ਮੁੰਬਈ"</item>
-    <item msgid="7140676596549732117">"ਦਿੱਲੀ"</item>
-    <item msgid="1236127343975476693">"ਓਸਾਕਾ"</item>
-    <item msgid="6470041111418276646">"ਲਾਹੌਰ"</item>
-    <item msgid="5672665774945554582">"ਸਾਨਾ"</item>
-    <item msgid="4227294244388933650">"ਬਾਰਸੀਲੋਨਾ"</item>
-    <item msgid="2404605478532633099">"ਮਿਊਨਿਕ"</item>
-    <item msgid="2402973841037462176">"ਮਿਲਨ"</item>
-    <item msgid="1658609023659261743">"ਫ੍ਰੈਂਕਫਰਟ"</item>
-    <item msgid="4214691757607136548">"ਹਨੋਈ"</item>
-    <item msgid="484506613000693635">"ਅੰਕਾਰਾ"</item>
-    <item msgid="1958807113380596945">"ਬੰਗਲੋਰ"</item>
-    <item msgid="2258411542499008700">"ਬ੍ਰਾਸੀਲੀਆ"</item>
-    <item msgid="770086263560182220">"ਕੇਪ ਟਾਊਨ"</item>
-    <item msgid="5936333722350504953">"ਇਸਲਾਮਾਬਾਦ"</item>
-    <item msgid="3631805761163219329">"ਰਿਓ ਦੇ ਜਨੈਰੋ"</item>
-    <item msgid="6544644866501929714">"ਅੰਨ ਆਰਬਰ"</item>
-    <item msgid="8675519768651745334">"ਬੌਲਡੈਰ"</item>
-    <item msgid="7006632817384692182">"ਕੈਂਬ੍ਰਿਜ਼"</item>
-    <item msgid="7233704593042272414">"ਕਿਰਕਲੈਂਡ"</item>
-    <item msgid="717352875658559544">"ਮੈਡੀਸਨ"</item>
-    <item msgid="3567009426051313507">"ਗੁਆਂਗਜ਼ੌ"</item>
-    <item msgid="2738289235744819761">"ਹੈਦਰਾਬਾਦ"</item>
-    <item msgid="35629823970779893">"ਰੈਸਟਨ"</item>
-    <item msgid="2620375619174484543">"ਬੈਲੋ ਹੋਰੀਜ਼ੋਂਟੈ"</item>
-    <item msgid="3949247113051549869">"ਸੈਂਟਿਆਗੋ"</item>
-    <item msgid="3583568170097050810">"ਮੋਨਰੋਵੀਆ"</item>
-    <item msgid="4337041465665825381">"ਕੋਲੰਬੋ"</item>
-    <item msgid="2758533074887258174">"ਚਿਹੁਆਹੁਆ"</item>
-    <item msgid="3904262821019008829">"ਸਾਲਵਾਡੋਰ"</item>
-    <item msgid="7335556305222315705">"ਗੁੜਗਾਓਂ"</item>
-    <item msgid="8092021218913879570">"ਮੈਨਚੈਸਟਰ"</item>
-    <item msgid="3262376108426000449">"ਕਾਈਵ"</item>
-    <item msgid="1321450515191695851">"ਸੈਂਟ ਪੀਟਰਸਬਰਗ"</item>
-    <item msgid="5152144018647717853">"ਕ੍ਰਾਕੋ"</item>
-    <item msgid="3995511368799031783">"ਰੋਕਲੌ"</item>
-    <item msgid="7251862005498390469">"ਹੈਮਬਰਗ"</item>
-    <item msgid="4403899516544001462">"ਔਲੁ"</item>
-    <item msgid="8378499650951313108">"ਹਾਇਫਾ"</item>
-    <item msgid="7504732361387330116">"ਸਨ ਜੁਆਨ"</item>
-    <item msgid="8613864994547669100">"ਟੈਗੁਸਿਗਾਲਪਾ"</item>
-    <item msgid="7087691675228926801">"ਪੈਰਾਮਰੀਬੋ"</item>
-    <item msgid="478384295484578701">"ਕੁਇਟੋ"</item>
-    <item msgid="4517870253399384206">"ਜੁਬਲਜਾਨਾ"</item>
-  </string-array>
-</resources>

diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
deleted file mode 100644
index 553e729..0000000
--- a/res/values-pa-rIN/strings.xml
+++ /dev/null

@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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="add_alarm" msgid="5976616107390962899">"ਅਲਾਰਮ ਜੋੜੋ"</string>
-    <string name="menu_desk_clock" msgid="3241995064554071588">"ਡੈਸਕ ਘੜੀ"</string>
-    <string name="menu_edit_alarm" msgid="7204602994918829751">"ਅਲਾਰਮ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
-    <string name="delete_alarm" msgid="3457780990646206817">"ਅਲਾਰਮ ਮਿਟਾਓ"</string>
-    <string name="enable_alarm" msgid="1834599140632142536">"ਅਲਾਰਮ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="disable_alarm" msgid="5889378670229554109">"ਅਲਾਰਮ ਬੰਦ ਕਰੋ"</string>
-    <string name="delete_alarm_confirm" msgid="6578572637340860840">"ਕੀ ਇਹ ਅਲਾਰਮ ਮਿਟਾਉਣਾ ਹੈ?"</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">"ਵਾਈਬ੍ਰੇਟ"</string>
-    <string name="alarm_repeat" msgid="7242985466344233206">"ਦੁਹਰਾਓ"</string>
-    <string name="alert" msgid="6506982899651975645">"ਅਲਾਰਮ ਰਿੰਗਟੋਨ"</string>
-    <string name="ringtone" msgid="9110746249688559579">"ਰਿੰਗਟੋਨ"</string>
-    <string name="time" msgid="8067216534232296518">"ਸਮਾਂ"</string>
-    <string name="alarm_tomorrow" msgid="131356848787643420">"ਕੱਲ੍ਹ ਨੂੰ"</string>
-    <string name="alarm_today" msgid="7873594221106531654">"ਅੱਜ"</string>
-    <string name="alarm_alert_wake_up" msgid="6790780716498252583">"ਜਗਾਓ!"</string>
-    <string name="alarm_alert_off_action_text" msgid="2459925305288819812">"ਬੰਦ"</string>
-    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ਬਰਖਾਸਤ ਕਰੋ"</string>
-    <string name="alarm_alert_dismiss_now_text" msgid="3272183025444682500">"ਹੁਣ ਬਰਖਾਸਤ ਕਰੋ"</string>
-    <string name="alarm_missed_title" msgid="3828345099754063392">"ਮਿਸਡ ਅਲਾਰਮ"</string>
-    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
-    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"ਸਨੂਜ਼ ਕੀਤਾ"</string>
-  <plurals name="alarm_alert_snooze_duration">
-    <item quantity="one" msgid="9092917312369131464">"1 ਮਿੰਟ"</item>
-    <item quantity="other" msgid="6731274475422132958">"<xliff:g id="NUMBER">%d</xliff:g> ਮਿੰਟ"</item>
-  </plurals>
-    <string name="alarm_alert_off_text" msgid="4472073417593915002">"ਅਲਾਰਮ ਬੰਦ"</string>
-    <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"ਸਨੂਜ਼"</string>
-  <plurals name="alarm_alert_snooze_set">
-    <item quantity="one" msgid="7884410398338611019">"1 ਮਿੰਟ ਲਈ ਸਨੂਜ਼ ਕਰ ਰਿਹਾ ਹੈ।"</item>
-    <item quantity="other" msgid="7377899473014259727">"<xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਸਨੂਜ਼ ਕਰ ਰਿਹਾ ਹੈ।"</item>
-  </plurals>
-    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"<xliff:g id="TIME">%s</xliff:g> ਤੱਕ ਸਨੂਜ਼ਿੰਗ"</string>
-    <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"ਅਪਕਮਿੰਗ ਅਲਾਰਮ"</string>
-    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"ਤੁਹਾਡਾ ਮਿਸਡ ਅਲਾਰਮ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ"</string>
-  <string-array name="timer_notifications">
-    <item msgid="7760558912503484257">"ਇੱਕ ਮਿੰਟ ਤੋਂ ਘੱਟ ਬਾਕੀ।"</item>
-    <item msgid="83197792732433351">"<xliff:g id="HOURS">%1$s</xliff:g> ਬਾਕੀ"</item>
-    <item msgid="8919698220200894252">"<xliff:g id="MINUTES">%2$s</xliff:g> ਬਾਕੀ"</item>
-    <item msgid="8458069283817013813">"<xliff:g id="HOURS">%1$s</xliff:g> <xliff:g id="MINUTES">%2$s</xliff:g> ਬਾਕੀ"</item>
-  </string-array>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ 1 ਮਿੰਟ ਤੋਂ ਘੱਟ ਲਈ ਸੈਟ ਕੀਤਾ।"</item>
-    <item msgid="6002066367368421848">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ <xliff:g id="DAYS">%1$s</xliff:g> ਲਈ ਸੈਟ ਕੀਤਾ।"</item>
-    <item msgid="8824719306247973774">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ <xliff:g id="HOURS">%2$s</xliff:g> ਲਈ ਸੈਟ ਕੀਤਾ।"</item>
-    <item msgid="8182406852935468862">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ <xliff:g id="DAYS">%1$s</xliff:g> ਅਤੇ <xliff:g id="HOURS">%2$s</xliff:g> ਲਈ ਸੈਟ ਕੀਤਾ।"</item>
-    <item msgid="2532279224777213194">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ <xliff:g id="MINUTES">%3$s</xliff:g> ਸੈਟ ਕੀਤਾ।"</item>
-    <item msgid="5936557894247187717">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ <xliff:g id="DAYS">%1$s</xliff:g> ਅਤੇ <xliff:g id="MINUTES">%3$s</xliff:g> ਲਈ ਸੈਟ ਕੀਤਾ।"</item>
-    <item msgid="9115697840826129603">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ <xliff:g id="HOURS">%2$s</xliff:g> ਅਤੇ <xliff:g id="MINUTES">%3$s</xliff:g> ਲਈ ਸੈਟ ਕੀਤਾ।"</item>
-    <item msgid="2332583385137381060">"ਅਲਾਰਮ ਹੁਣ ਤੋਂ <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>
-    <string name="hour" msgid="2546819039651509323">"1 ਘੰਟਾ"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> ਘੰਟੇ"</string>
-    <string name="minute" msgid="2486157997434653710">"1 ਮਿੰਟ"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> ਮਿੰਟ"</string>
-    <string name="every_day" msgid="4100909974923444602">"ਰੁਜ਼ਾਨਾ"</string>
-    <string name="day_concat" msgid="971998564991636532">", "</string>
-    <string name="clock_instructions" msgid="2656876819515011590">"ਇੱਕ ਘੜੀ ਚੁਣੋ"</string>
-    <string name="analog_gadget" msgid="1670505720837152766">"ਐਨਾਲਾਗ ਘੜੀ"</string>
-    <string name="help" msgid="7786263119482654015">"ਸਹਾਇਤਾ"</string>
-    <string name="settings" msgid="5849739030579520686">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="snooze_duration_title" msgid="1097309861110780483">"ਸਨੂਜ਼ ਲੰਮਾਈ"</string>
-  <plurals name="snooze_duration">
-    <item quantity="one" msgid="7406963706727564418">"1 ਮਿੰਟ"</item>
-    <item quantity="other" msgid="568504136093419703">"<xliff:g id="NUMBER">%d</xliff:g> ਮਿੰਟ"</item>
-  </plurals>
-  <plurals name="snooze_picker_label">
-    <item quantity="one" msgid="3783171637798575068">"ਮਿੰਟ"</item>
-    <item quantity="other" msgid="1304056759541595077">"ਮਿੰਟ"</item>
-  </plurals>
-    <string name="auto_silence_title" msgid="2012754009554434544">"ਇਸਤੋਂ ਬਾਅਦ ਸਾਈਲੈਂਸ"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ"</string>
-    <string name="auto_silence_never" msgid="4821982647348750809">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
-  <string-array name="auto_silence_entries">
-    <item msgid="3024545954917711306">"1 ਮਿੰਟ"</item>
-    <item msgid="5431906692406316549">"5 ਮਿੰਟ"</item>
-    <item msgid="7742728812068919959">"10 ਮਿੰਟ"</item>
-    <item msgid="2855948657259647629">"15 ਮਿੰਟ"</item>
-    <item msgid="6330196381284475079">"20 ਮਿੰਟ"</item>
-    <item msgid="7809240121716151904">"25 ਮਿੰਟ"</item>
-    <item msgid="4278641338024561333">"ਕਦੇ ਵੀ ਨਹੀਂ"</item>
-  </string-array>
-    <string name="week_start_title" msgid="4268917518596832096">"ਇਸਨੂੰ ਹਫ਼ਤਾ ਸ਼ੁਰੂ ਕਰੋ"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"ਸ਼ਨਿਚਰਵਾਰ"</item>
-    <item msgid="3993530639455360921">"ਐਤਵਾਰ"</item>
-    <item msgid="8594709368683324282">"ਸੋਮਵਾਰ"</item>
-  </string-array>
-    <string name="done" msgid="6509722361933858451">"ਹੋ ਗਿਆ"</string>
-    <string name="revert" msgid="9100911171235162926">"ਵਾਪਸ ਲਿਆਓ"</string>
-    <string name="delete" msgid="5732434972457000541">"ਮਿਟਾਓ"</string>
-    <string name="alarm_volume_title" msgid="8506245173912428522">"ਅਲਾਰਮ ਵੌਲਯੂਮ"</string>
-    <string name="silent_alarm_summary" msgid="8605302849408279221">"ਸਾਈਲੈਂਟ"</string>
-    <string name="alarm_notify_text" msgid="4891014685945904766">"ਅਲਾਰਮ ਸਨੂਜ਼ ਕਰੋ ਜਾਂ ਬਰਖਾਸਤ ਕਰੋ।"</string>
-    <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (ਸਨੂਜ਼ ਕੀਤਾ)"</string>
-    <string name="alarm_notify_snooze_text" msgid="4819324081410990368">"ਅਲਾਰਮ <xliff:g id="TIME">%s</xliff:g> ਲਈ ਸੈਟ ਕੀਤਾ। ਰੱਦ ਕਰਨ ਲਈ ਛੋਹਵੋ।"</string>
-    <string name="volume_button_setting_title" msgid="6937131248843413357">"ਵੌਲਯੂਮ ਬਟਨ"</string>
-    <string name="volume_button_dialog_title" msgid="8768042543750036853">"ਬਟਨ ਇਫੈਕਟ"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"ਸਨੂਜ਼"</item>
-    <item msgid="3450979320164769576">"ਬਰਖਾਸਤ ਕਰੋ"</item>
-    <item msgid="6302517608411378024">"ਕੁਝ ਨਾ ਕਰੋ"</item>
-  </string-array>
-    <string name="default_ringtone_setting_title" msgid="4549726190682964245">"ਡਿਫੌਲਟ ਰਿੰਗਟੋਨ ਸੈਟ ਕਰੋ"</string>
-    <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>
-    <string name="desk_clock_button_description" msgid="4207371097361657274">"ਘੜੀ ਡਿਸਪਲੇ"</string>
-    <string name="label_description" msgid="8736179296142915727">"ਲੇਬਲ"</string>
-    <string name="ringtone_description" msgid="7580922112921069925">"ਰਿੰਗਟੋਨ"</string>
-    <string name="weather_fetch_failure" msgid="3425804832021006835">"ਮੌਸਮ ਜਾਣਕਾਰੀ ਇਸ ਵੇਲੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"ਅਲਾਰਮਾਂ ਲਈ ਅਵਾਜ਼ ਪਲੇਬੈਕ ਸੇਵਾ ਘੜੀ ਵਿੱਚ ਸੈਟ ਕੀਤੀ।"</string>
-    <string name="loading_ringtone" msgid="6523322777415268044">"ਰਿੰਗਟੋਨ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="timer_ring_service_desc" msgid="2620214305660322415">"ਟਾਈਮਰਾਂ ਲਈ ਅਵਾਜ਼ ਪਲੇਬੈਕ ਸੇਵਾ ਘੜੀ ਵਿੱਚ ਸੈਟ ਕੀਤੀ।"</string>
-    <string name="control_set_alarm" msgid="2194676418924016327">"ਅਲਾਰਮ ਸੈਟ ਕਰੋ"</string>
-    <!-- no translation found for control_set_alarm_with_existing (3359285346655630660) -->
-    <skip />
-    <string name="menu_alarm" msgid="4772010125376647519">"ਅਲਾਰਮ"</string>
-    <string name="menu_timer" msgid="6459070074762877114">"ਟਾਈਮਰ"</string>
-    <string name="menu_clock" msgid="5612760670606829805">"ਘੜੀ"</string>
-    <string name="menu_stopwatch" msgid="3396117705293574701">"ਸਟੌਪਵੌਚ"</string>
-    <string name="button_alarms" msgid="3907838219512538763">"ਅਲਾਰਮ ਜੋੜੋ"</string>
-    <string name="button_cities" msgid="4555761857494501363">"ਸ਼ਹਿਰ"</string>
-    <string name="button_menu" msgid="6050484561842120282">"ਹੋਰ ਚੋਣਾਂ"</string>
-    <string name="menu_item_settings" msgid="1413723516369078665">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="menu_item_help" msgid="4570953476186849841">"ਸਹਾਇਤਾ"</string>
-    <string name="menu_item_night_mode" msgid="3486930302245398975">"ਰਾਤ ਮੋਡ"</string>
-    <string name="menu_item_sort_by_gmt_offset" msgid="3120860422682721706">"ਸਮੇਂ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
-    <string name="menu_item_sort_by_name" msgid="1762931290495104106">"ਨਾਮ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
-    <string name="selected_cities_label" msgid="3607479399424246605">"ਚੁਣੇ ਗਏ ਸ਼ਹਿਰ"</string>
-    <string name="sw_resume_button" msgid="2569360966002022248">"ਮੁੜ ਸ਼ੁਰੂ ਕਰੋ"</string>
-    <string name="sw_start_button" msgid="8373422516681242270">"ਚਾਲੂ ਕਰੋ"</string>
-    <string name="sw_stop_button" msgid="8322958613123274451">"ਰੋਕੋ"</string>
-    <string name="sw_lap_button" msgid="6992264696039004233">"ਲੈਪ"</string>
-    <string name="sw_reset_button" msgid="6616804728322906117">"ਰੀਸੈਟ ਕਰੋ"</string>
-    <string name="sw_share_button" msgid="4478648110382859382">"ਸ਼ੇਅਰ ਕਰੋ"</string>
-    <string name="hours_label" msgid="3393478155635368097">"ਘੰਟਾ"</string>
-    <string name="minutes_label" msgid="3568098128251438588">"ਮਿੰਟ"</string>
-    <string name="seconds_label" msgid="124655952824003246">"ਸਕਿੰਟ"</string>
-    <string name="hours_label_description" msgid="8652842524970971830">"ਘੰਟੇ"</string>
-    <string name="minutes_label_description" msgid="965686733490357796">"ਮਿੰਟ"</string>
-    <string name="seconds_label_description" msgid="3821620053141299692">"ਸਕਿੰਟ"</string>
-    <string name="zero" msgid="7102083421938355017">"0"</string>
-    <string name="sw_share_main" msgid="7703563468204234405">"ਮੇਰਾ ਸਮਾਂ ਹੈ <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="sw_share_laps" msgid="614390674795945007">"ਲੈਪ ਸਮੇਂ:"</string>
-    <string name="sw_notification_lap_number" msgid="3535420316052647126">"ਲੈਪ <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="Nhours_description">
-    <item quantity="one" msgid="371227238759147245">"1 ਘੰਟਾ"</item>
-    <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> ਘੰਟੇ"</item>
-  </plurals>
-  <plurals name="Nminutes_description">
-    <item quantity="one" msgid="1001391305885322059">"1 ਮਿੰਟ"</item>
-    <item quantity="other" msgid="6948360065351547776">"<xliff:g id="NUMBER">%d</xliff:g> ਮਿੰਟ"</item>
-  </plurals>
-  <plurals name="Nseconds_description">
-    <item quantity="one" msgid="6589853086641485725">"1 ਸਕਿੰਟ"</item>
-    <item quantity="other" msgid="7583230315175387547">"<xliff:g id="NUMBER">%d</xliff:g> ਸਕਿੰਟ"</item>
-  </plurals>
-    <string name="timer_add_timer" msgid="862733633862574752">"ਟਾਈਮਰ ਜੋੜੋ"</string>
-    <string name="timer_start" msgid="6158486445614356442">"ਚਾਲੂ ਕਰੋ"</string>
-    <string name="timer_delete" msgid="8699122001991909302">"ਮਿਟਾਓ"</string>
-    <string name="timer_descriptive_delete" msgid="8794915342760383536">"<xliff:g id="NUMBER_STRING">%s</xliff:g> ਨੂੰ ਮਿਟਾਓ"</string>
-    <string name="timer_plus_one" msgid="6631211310420106116">"1 ਮਿੰਟ ਜੋੜੋ"</string>
-    <string name="timer_plus_1_min" msgid="8645224089494875062">"1 ਮਿੰਟ ਜੋੜੋ"</string>
-    <string name="timer_stop" msgid="3361154678667736722">"ਰੋਕੋ"</string>
-    <string name="timer_done" msgid="2375990511982914051">"ਹੋ ਗਿਆ"</string>
-    <string name="timer_reset" msgid="7848424809190171640">"ਰੀਸੈਟ ਕਰੋ"</string>
-    <string name="timer_cancel" msgid="3572868404230815644">"ਰੱਦ ਕਰੋ"</string>
-    <string name="timer_times_up" msgid="9190440395938519009">"ਟਾਈਪ ਪੂਰਾ ਹੋ ਗਿਆ"</string>
-    <string name="timer_notification_label" msgid="4933184831583137249">"ਟਾਈਮਰ"</string>
-    <string name="timers_max_count_reached" msgid="9140022846793903813">"ਅਧਿਕਤਮ 4 ਟਾਈਮਰ"</string>
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"ਤੁਸੀਂ ਬਿਲਕੁਲ ਸਪੀਡ ਡੈਮਨ ਹੋ।"</item>
-    <item msgid="6332879039890727169">"ਆਪਣੀ ਮਿਹਨਤ ਦੇ ਫਲ ਦਾ ਅਨੰਦ ਮਾਣੋ।"</item>
-    <item msgid="815382761274660130">"Androids ਨੂੰ ਕਾਫ਼ੀ ਤੇਜ਼ ਮੰਨਿਆ ਜਾਂਦਾ ਹੈ, ਪਰੰਤੂ ਤੁਹਾਡੇ ਜਿੰਨੀਆਂ ਤੇਜ਼ ਨਹੀਂ!"</item>
-    <item msgid="7916250650982813737">"ਉਫ।"</item>
-    <item msgid="6836603904515182333">"L33t ਵਾਰ।"</item>
-    <item msgid="7508085100680861631">"ਇੰਨੀ ਅਨੋਖੀ ਰਫ਼ਤਾਰ।"</item>
-    <item msgid="5961245252909589573">"ਆਓ ਫਿਰ ਸਮੇਂ ਦੀ ਕਲਪਨਾ ਕਰੀਏ।"</item>
-    <item msgid="5211891900854545940">"ਖੱਬੇ ਪਾਸੇ ਇੱਕ ਜੰਪ ਕਰੋ।"</item>
-    <item msgid="9071353477103826053">"ਤੁਹਾਡੇ ਕੋਲ ਤੇਜ਼ੀ ਲਈ ਇੱਕ ਪੈਲੇਟ ਹੈ।"</item>
-    <item msgid="3785193933691117181">"ਧੁਨੀਆਤਮਿਕ ਰਫ਼ਤਾਰ।"</item>
-  </string-array>
-    <string name="home_label" msgid="4436139365695453870">"ਘਰ"</string>
-    <string name="cities_activity_title" msgid="8552462751129256730">"ਸ਼ਹਿਰ"</string>
-    <string name="clock_settings" msgid="8317286807280600391">"ਘੜੀ"</string>
-    <string name="clock_style" msgid="2265011060429742344">"ਸਟਾਈਲ"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"ਐਨਾਲਾਗ"</item>
-    <item msgid="8483930821046925592">"ਡਿਜੀਟਲ"</item>
-  </string-array>
-    <string name="automatic_home_clock" msgid="6274174710735449252">"ਆਟੋਮੈਟਿਕ ਹੋਮ ਘੜੀ"</string>
-    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"ਕਿਸੇ ਅਜਿਹੇ ਖੇਤਰ ਵਿੱਚ ਯਾਤਰਾ ਕਰਦੇ ਸਮੇਂ, ਜਿੱਥੇ ਸਮਾਂ ਵੱਖ ਹੋਵੇ, ਹੋਮ ਲਈ ਇੱਕ ਘੜੀ ਜੋੜੋ"</string>
-    <string name="home_time_zone" msgid="9199730676287974501">"ਘਰ ਸਮਾਂ ਜ਼ੋਨ"</string>
-    <string name="home_time_zone_title" msgid="807894493443834624">"ਘਰ ਸਮਾਂ ਜ਼ੋਨ"</string>
-    <string name="time_picker_cancel" msgid="7437106489606013077">"ਰੱਦ ਕਰੋ"</string>
-    <string name="time_picker_set" msgid="331153175471468051">"ਠੀਕ"</string>
-    <string name="time_picker_time_seperator" msgid="7484926510054777041">":"</string>
-    <string name="time_picker_ampm_label" msgid="6754113715199751083">"--"</string>
-    <string name="time_picker_00_label" msgid="6001006474735281911">":00"</string>
-    <string name="time_picker_30_label" msgid="1027250857384838129">":30"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"ਮਾਰਸ਼ਲ ਆਈਲੈਂਡਸ"</item>
-    <item msgid="4196408495909011020">"ਮਿਡਵੇ ਆਈਲੈਂਡ"</item>
-    <item msgid="1414384194857730006">"ਹਵਾਈ"</item>
-    <item msgid="2687091371581931926">"ਅਲਾਸਕਾ"</item>
-    <item msgid="1922100269679049660">"ਪੈਸਿਫਿਕ ਸਮਾਂ"</item>
-    <item msgid="7156402158716866161">"ਟਿਜੁਆਨਾ"</item>
-    <item msgid="1144117502254612241">"ਐਰੀਜ਼ੋਨਾ"</item>
-    <item msgid="101284182011722637">"ਚਿਹੁਆਹੁਆ"</item>
-    <item msgid="689121094232986897">"ਮਾਊਂਟੇਨ ਸਮਾਂ"</item>
-    <item msgid="5445331923942302756">"ਮੱਧ ਅਮਰੀਕਾ"</item>
-    <item msgid="2749806434052452351">"ਸੈਂਟਰਲ ਸਮਾਂ"</item>
-    <item msgid="3997138870229703753">"ਮੈਕਸੀਕੋ ਸਿਟੀ"</item>
-    <item msgid="5425567073027744888">"ਸਸਕੈਚਵਾਨ"</item>
-    <item msgid="2877342865396629368">"ਬੋਗੋਟਾ"</item>
-    <item msgid="568682398893899670">"ਪੂਰਬੀ ਸਮਾਂ"</item>
-    <item msgid="668135984541863866">"ਵੈਨੇਜ਼ੁਏਲਾ"</item>
-    <item msgid="3737474220861486223">"ਅਟਲਾਂਟਿਕ ਸਮਾਂ (ਬਾਰਬਾਡੋਸ)"</item>
-    <item msgid="6279116051273436870">"ਅਟਲਾਂਟਿਕ ਸਮਾਂ (ਕੈਨੇਡਾ)"</item>
-    <item msgid="8513382867172014244">"ਮੈਨੌਸ"</item>
-    <item msgid="7776299003105932407">"ਸੈਂਟਿਆਗੋ"</item>
-    <item msgid="8636989494746218677">"ਨਿਊਫਾਊਂਡਲੈਂਡ"</item>
-    <item msgid="4402541016410147505">"ਬ੍ਰਾਜ਼ੀਲੀਆ"</item>
-    <item msgid="2251184440733164084">"ਬੁਏਨੋਸ ਐਰਸ"</item>
-    <item msgid="6202926618569004969">"ਗ੍ਰੀਨਲੈਂਡ"</item>
-    <item msgid="2355275037115290628">"ਮੋਂਟੈਵੀਡੀਓ"</item>
-    <item msgid="1377549694711708945">"ਮਿਡ-ਅਟਲਾਂਟਿਕ"</item>
-    <item msgid="3457671272126347981">"ਅਜ਼ੋਰਸ"</item>
-    <item msgid="3659315141063710840">"ਕੇਪ ਵਰਡੇ ਆਈਲੈਂਡਸ"</item>
-    <item msgid="1260941741802367635">"ਕਾਸਾਬਲਾਂਕਾ"</item>
-    <item msgid="8275203689687954762">"ਲੰਡਨ, ਡਬਲਿਨ"</item>
-    <item msgid="5970179539479320905">"ਅਮਸਟਰਡੈਮ, ਬਰਲਿਨ"</item>
-    <item msgid="5396319478750517962">"ਬੈਲਗ੍ਰੇਡ"</item>
-    <item msgid="8688787475056663004">"ਬ੍ਰਸਲਸ"</item>
-    <item msgid="3415827874921681622">"ਸਾਰਾਜੈਵੋ"</item>
-    <item msgid="402008965928320066">"ਵਿੰਢੋਐਕ"</item>
-    <item msgid="6436942724959275569">"ਪੱਛਮੀ ਅਫਰੀਕਾ ਸਮਾਂ"</item>
-    <item msgid="954536568417204026">"ਅਮਾਨ, ਜੋਰਡਨ"</item>
-    <item msgid="8932745482008902551">"ਐਥਨਸ, ਇਸਤਾਨਬੁਲ"</item>
-    <item msgid="320025725949024510">"ਬੈਰੁਤ, ਲੈਬਨੋਨ"</item>
-    <item msgid="7242083112551905970">"ਕਾਇਰੋ"</item>
-    <item msgid="7241520146011450419">"ਹੈਲਸਿੰਕੀ"</item>
-    <item msgid="2717065017510546526">"ਜੇਰੁਸਲੇਮ"</item>
-    <item msgid="8698556287741466553">"ਮਿੰਸਕ"</item>
-    <item msgid="1797598357342084506">"ਹਰਾਰੇ"</item>
-    <item msgid="5169119919905066998">"ਬਗਦਾਦ"</item>
-    <item msgid="2615788116201065182">"ਮਾਸਕੋ"</item>
-    <item msgid="9084354867885584646">"ਕੁਵੈਤ"</item>
-    <item msgid="1351570519986178268">"ਨੈਰੋਬੀ"</item>
-    <item msgid="7094569580635877460">"ਤੇਹਰਾਨ"</item>
-    <item msgid="3953138772617909704">"ਬਾਕੁ"</item>
-    <item msgid="2868893113598800752">"ਤਬਿਲਿਸੀ"</item>
-    <item msgid="7088581865802476373">"ਯੈਰੈਵਨ"</item>
-    <item msgid="1941122257623887992">"ਦੁਬਈ"</item>
-    <item msgid="9194797225058249720">"ਕਾਬੁਲ"</item>
-    <item msgid="6486569254364577332">"ਇਸਲਾਮਾਬਾਦ, ਕਰਾਚੀ"</item>
-    <item msgid="5487724896895412089">"ਯੂਰਾਲਸਕ"</item>
-    <item msgid="364906869710826982">"ਯੈਕਟੈਰਿਨਬਰਗ"</item>
-    <item msgid="2106505051751383358">"ਕੋਲਕਾਤਾ"</item>
-    <item msgid="6851586621581501447">"ਸ਼੍ਰੀ ਲੰਕਾ"</item>
-    <item msgid="800438544128213134">"ਕਾਠਮਾਂਡੂ"</item>
-    <item msgid="6173621471007643021">"ਅਸਤਾਨਾ"</item>
-    <item msgid="8645125891971581128">"ਯਾਂਗੋਨ"</item>
-    <item msgid="2886407505119737794">"ਕ੍ਰਾਸਨੋਯਾਰਸਕ"</item>
-    <item msgid="3408222398188107090">"ਬੈਂਕਾਕ"</item>
-    <item msgid="4441612937172851228">"ਬੀਜਿੰਗ"</item>
-    <item msgid="4936715789028996930">"ਹਾਂਗ ਕਾਂਗ"</item>
-    <item msgid="4261031143777385525">"ਇਰਕੁਤਸਕ"</item>
-    <item msgid="3538060959338191835">"ਕੁਆ ਲਾਲਮਪੁਰ"</item>
-    <item msgid="1438847562643099201">"ਪਰਥ"</item>
-    <item msgid="3063913827688244383">"ਤਾਈਪੇਈ"</item>
-    <item msgid="3502757135046564209">"ਸਿਓਲ"</item>
-    <item msgid="6107588684519111669">"ਟੋਕਿਓ, ਓਸਾਕਾ"</item>
-    <item msgid="4350769099755608471">"ਯਾਕੁਤਸਕ"</item>
-    <item msgid="2422707004533526462">"ਅਦੈਲੇਡ"</item>
-    <item msgid="1292192084554134339">"ਡਰਵਿਨ"</item>
-    <item msgid="1320883699470001716">"ਬ੍ਰਿਸਬੇਨ"</item>
-    <item msgid="5137198806146386527">"ਹੋਬਾਰਟ"</item>
-    <item msgid="5920063686933941174">"ਸਿਡਨੀ, ਕੈਨਬੈਰਾ"</item>
-    <item msgid="615906039696009425">"ਵਲਾਦਿਵੋਸਤੋਕ"</item>
-    <item msgid="7738680449356275374">"ਗੁਆਮ"</item>
-    <item msgid="2882915026380778227">"ਮਗਾਦਾਨ"</item>
-    <item msgid="8255615641810148152">"ਔਕਲੈਂਡ"</item>
-    <item msgid="3027153773466391728">"ਫਿਜੀ"</item>
-    <item msgid="5911600083231840181">"ਟੋਂਗਾ"</item>
-    <item msgid="5176858645450908751">"ਜਕਾਰਤਾ"</item>
-  </string-array>
-    <string name="alarm_settings" msgid="2947147071388290814">"ਅਲਾਰਮ"</string>
-    <string name="stopwatch_service_desc" msgid="8416624630388063996">"ਸੂਚਨਾ ਚਲਾਉਣ ਲਈ ਸਟੌਪਵੌਚ ਸੇਵਾ।"</string>
-    <string name="swn_stopped" msgid="783124901663086172">"ਰੋਕਿਆ ਗਿਆ"</string>
-    <string name="description_direction_right" msgid="5709209043267548985">"ਬਰਖਾਸਤ ਕਰਨ ਲਈ ਸੱਜੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="description_direction_left" msgid="7448141043674998679">"ਸਨੂਜ਼ ਕਰਨ ਲਈ ਖੱਬੇ ਪਾਸੇ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="description_direction_both" msgid="1841309486023845685">"ਸਨੂਜ਼ ਕਰਨ ਲਈ ਖੱਬੇ ਸਵਾਈਪ ਕਰੋ ਜਾਂ ਬਰਖ਼ਾਸਤ ਕਰਨ ਲਈ ਸੱਜੇ ਸਵਾਈਪ ਕਰੋ"</string>
-    <string name="timer_stopped" msgid="2730331837832462008">"ਟਾਈਮਰ ਰੋਕਿਆ ਗਿਆ"</string>
-    <string name="timers_stopped" msgid="2393640808691864520">"<xliff:g id="NUMBER">%d</xliff:g> ਟਾਈਮਰ ਰੋਕੇ ਗਏ"</string>
-    <string name="all_timers_stopped_notif" msgid="278532320068394600">"ਆਪਣੇ ਟਾਈਮਰ ਦੇਖਣ ਲਈ ਛੋਹਵੋ"</string>
-    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> ਟਾਈਮਰ"</string>
-    <string name="next_timer_notif" msgid="6136454740115613653">"ਅਗਲਾ ਟਾਈਮਰ: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
-    <string name="screensaver_settings" msgid="7013450738357352801">"ਡ੍ਰੀਮ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="night_mode_title" msgid="5983813889469616299">"ਰਾਤ ਮੋਡ"</string>
-    <string name="night_mode_summary" msgid="1017350187324162631">"ਬਹੁਤ ਧੁੰਦਲਾ ਡਿਸਪਲੇ (ਹਨੇਰੇ ਕਮਰਿਆਂ ਲਈ)"</string>
-    <string name="expand_alarm" msgid="7392616528943305020">"ਅਲਾਰਮ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
-    <string name="collapse_alarm" msgid="3561772046433483980">"ਅਲਾਰਮ ਨਸ਼ਟ ਕਰੋ"</string>
-    <string name="alarm_undo" msgid="5710042601177655254">"ਪਹਿਲਾਂ ਵਰਗਾ ਕਰੋ"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"ਅਲਾਰਮ ਮਿਟਾਇਆ।"</string>
-    <string name="slash" msgid="2077577763821006919">"/"</string>
-    <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
-    <string name="next_alarm_description" msgid="2650244835760747046">"ਅਗਲਾ ਅਲਾਰਮ: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
-    <string name="label_unlabeled" msgid="4699506713571930740"></string>
-    <string name="alarms_selected" msgid="1075308195332888260">"<xliff:g id="ALARMS">%d</xliff:g> ਚੁਣੇ ਗਏ"</string>
-    <string name="deleted_message" msgid="1220848140260509437">"ਮਿਟਾਇਆ ਗਿਆ"</string>
-  <plurals name="alarm_delete_confirmation">
-    <item quantity="one" msgid="111940612131906802">"ਕੀ ਚੁਣਿਆ ਗਿਆ ਅਲਾਰਮ ਮਿਟਾਉਣਾ ਹੈ?"</item>
-    <item quantity="other" msgid="6918176478191272189">"ਕੀ ਚੁਣੇ ਗਏ ਅਲਾਰਮ ਮਿਟਾਉਣੇ ਹਨ?"</item>
-  </plurals>
-    <string name="timer_delete_confirmation" msgid="2815524107015816453">"ਕੀ ਇਹ ਟਾਈਮਰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="city_delete_confirmation" msgid="1783441538785676299">"ਕੀ ਇਹ ਸ਼ਹਿਰ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="digital_gadget" msgid="2326954556720571358">"ਡਿਜੀਟਲ ਕਲੌਕ"</string>
-    <string name="no_alarms" msgid="6429431324842022917">"ਕੋਈ ਅਲਾਰਮ ਨਹੀਂ"</string>
-    <string name="no_alarms_set" msgid="4887558279496044764">"ਕੋਈ ਅਲਾਰਮ ਸੈਟ ਨਹੀਂ ਕੀਤੇ"</string>
-    <string name="no_upcoming_alarms" msgid="2889840988069436254">"ਕੋਈ ਅਪਕਮਿੰਗ ਅਲਾਰਮ ਨਹੀਂ"</string>
-    <string name="time_format_12_mode" msgid="1619464909892545536">"h:mm a"</string>
-    <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
-    <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm a"</string>
-    <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
-</resources>

diff --git a/res/values-sq-rAL/array.xml b/res/values-sq-rAL/array.xml
deleted file mode 100644
index 6f1e041..0000000
--- a/res/values-sq-rAL/array.xml
+++ /dev/null

@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    Copyright (C) 2012 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="cities_names">
-    <item msgid="2528360178629244616">"Abixhan"</item>
-    <item msgid="6944239639314079002">"Akra"</item>
-    <item msgid="1882840263263451068">"Adis-Abebë"</item>
-    <item msgid="1028929145486670248">"Algjer"</item>
-    <item msgid="3701057587584676092">"Blantir"</item>
-    <item msgid="2886322632268247117">"Brazavil"</item>
-    <item msgid="6897570881968822043">"Kajro"</item>
-    <item msgid="267605539096913498">"Kazablanka"</item>
-    <item msgid="4211664465580587414">"Konakri"</item>
-    <item msgid="4541602834272820641">"Dakar"</item>
-    <item msgid="8465732069409300950">"Dar-es-Salam"</item>
-    <item msgid="6622510954516549116">"Xhibuti"</item>
-    <item msgid="2276489800209768303">"Fritaun"</item>
-    <item msgid="1240576997711861023">"Gaborone"</item>
-    <item msgid="5349334209171364385">"Harare"</item>
-    <item msgid="6113191477690557327">"Johanesburg"</item>
-    <item msgid="927428576674822400">"Kampala"</item>
-    <item msgid="4026832076115235469">"Kartum"</item>
-    <item msgid="5410782788724286381">"Kigali"</item>
-    <item msgid="7732811111504353705">"Kinshasa"</item>
-    <item msgid="932809008471125011">"Lagos"</item>
-    <item msgid="2795948760365855772">"Maseru"</item>
-    <item msgid="6464910812969504493">"Mogadishu"</item>
-    <item msgid="4620365036488328944">"Najrobi"</item>
-    <item msgid="4196652835056468390">"Sao-Tome"</item>
-    <item msgid="2002053268354813523">"Timbuktu"</item>
-    <item msgid="6789355206260535774">"Tripoli"</item>
-    <item msgid="1662913445892282208">"Tuniz"</item>
-    <item msgid="1958350526592385504">"Ankorixh"</item>
-    <item msgid="4530964415403549431">"Mendoza"</item>
-    <item msgid="5519841965499989640">"Arubë"</item>
-    <item msgid="3619641653330712167">"Asunsion"</item>
-    <item msgid="1807527094848372100">"Barbados"</item>
-    <item msgid="7833099001850188721">"Belizë"</item>
-    <item msgid="5063415446546412441">"Bogota"</item>
-    <item msgid="2839227656429500365">"Buenos-Ajres"</item>
-    <item msgid="1133762043888408997">"Kankun"</item>
-    <item msgid="5326063045518438386">"Karakas"</item>
-    <item msgid="889935230113732517">"Kajman"</item>
-    <item msgid="3444477982230350362">"Çikago"</item>
-    <item msgid="610305270095390771">"Kosta-Rikë"</item>
-    <item msgid="4297448531030514920">"Kurasao"</item>
-    <item msgid="1819003821428989864">"Doson-Krik"</item>
-    <item msgid="4753714764113170675">"Denver"</item>
-    <item msgid="2279315094917045244">"Detroit"</item>
-    <item msgid="1330228105893462956">"Dominikë"</item>
-    <item msgid="3303245425281858320">"Edmonton"</item>
-    <item msgid="6102675683216802960">"Salvador"</item>
-    <item msgid="7404823948632138334">"Fortaleza"</item>
-    <item msgid="5295234178172153733">"Grand-Turk"</item>
-    <item msgid="3015155377774814857">"Grenadë"</item>
-    <item msgid="5124228611616346914">"Guatemalë"</item>
-    <item msgid="890870630819396468">"Guajanë"</item>
-    <item msgid="7195964234494402331">"Halifaks"</item>
-    <item msgid="4983877234758737190">"Havanë"</item>
-    <item msgid="2738888001225341531">"Indianapolis"</item>
-    <item msgid="5335614190119698790">"Noks"</item>
-    <item msgid="9056292535030679310">"Marengo"</item>
-    <item msgid="1049051761793330471">"Pitersburg"</item>
-    <item msgid="4086392912705989429">"Tell-Siti"</item>
-    <item msgid="4953356468739912331">"Vevaj"</item>
-    <item msgid="879918079035739958">"Vinsenes"</item>
-    <item msgid="620064188588916047">"Uinamak"</item>
-    <item msgid="1743310759320576964">"Kingston"</item>
-    <item msgid="5836540468054579646">"Nuestra-Senjora-de-La Paz"</item>
-    <item msgid="9111190480556180457">"Limë"</item>
-    <item msgid="3849323884810644665">"Los Axhelos"</item>
-    <item msgid="9186705637161264387">"Louisvill"</item>
-    <item msgid="6045939557161114820">"Managua"</item>
-    <item msgid="3688923880208568496">"Martinikë"</item>
-    <item msgid="3124245926616896140">"Mendoza"</item>
-    <item msgid="8264013691437690644">"Metlakatla"</item>
-    <item msgid="3242307788223843671">"Meksiko-Siti"</item>
-    <item msgid="3904210242491724008">"Monterej"</item>
-    <item msgid="2049700402307558992">"Montevideo"</item>
-    <item msgid="6972371385309297826">"Montreal"</item>
-    <item msgid="1121150121639680484">"Nasau"</item>
-    <item msgid="8783518093470040300">"Nju-Jork"</item>
-    <item msgid="8685565479120721681">"Beulah"</item>
-    <item msgid="6854366494939955818">"Sentër"</item>
-    <item msgid="7325195282520040665">"Nju-Salem"</item>
-    <item msgid="3368872340258580668">"Panama"</item>
-    <item msgid="58921303248631494">"Feniks"</item>
-    <item msgid="6678389014419621494">"Porti i Spanjës"</item>
-    <item msgid="5255184875289196899">"Porti i Princit"</item>
-    <item msgid="7039428977566254389">"Porto-Riko"</item>
-    <item msgid="1577859671465557300">"Santo-Domingo"</item>
-    <item msgid="3956700126827381905">"Sao-Paulo"</item>
-    <item msgid="3851056559336304908">"Shën-Xhons"</item>
-    <item msgid="7620601490016157459">"Shën-Kits"</item>
-    <item msgid="256494147725561888">"Santa-Luçia"</item>
-    <item msgid="9065982618380084594">"Shën-Tomas"</item>
-    <item msgid="7424657189317481507">"Tihuanë"</item>
-    <item msgid="7378768724772963031">"Toronto"</item>
-    <item msgid="2880175928020421322">"Vankuver"</item>
-    <item msgid="8906495585877998744">"Vinipeg"</item>
-    <item msgid="8681645071790623069">"Poli i Jugut"</item>
-    <item msgid="9066834921549182064">"Longiearbjen"</item>
-    <item msgid="4656709932014204632">"Almati"</item>
-    <item msgid="2173021164159165084">"Aman"</item>
-    <item msgid="5365315490101319010">"Anadir"</item>
-    <item msgid="2203136550754775298">"Aktau"</item>
-    <item msgid="6373057865921966096">"Bagdad"</item>
-    <item msgid="7705451629446449789">"Bahrein"</item>
-    <item msgid="2201480850069597815">"Baku"</item>
-    <item msgid="424770109352500733">"Bangkok"</item>
-    <item msgid="5329081174177673828">"Bejrut"</item>
-    <item msgid="7187135889522860058">"Kalkuta"</item>
-    <item msgid="8261312970920594511">"Damask"</item>
-    <item msgid="6050005781178769107">"Daka"</item>
-    <item msgid="846831973484498790">"Dubai"</item>
-    <item msgid="6320380511060318660">"Gaza"</item>
-    <item msgid="138195076135095830">"Hebron"</item>
-    <item msgid="2792857260329757927">"Ho-Çi-Min"</item>
-    <item msgid="2753915200056183217">"Hong-Kong"</item>
-    <item msgid="6375713877627922624">"Stamboll"</item>
-    <item msgid="164857852656167029">"Xhakartë"</item>
-    <item msgid="514551483895638508">"Jerusalem"</item>
-    <item msgid="7852405794661778785">"Kabul"</item>
-    <item msgid="2733033767438957766">"Karaçi"</item>
-    <item msgid="5644311217186397680">"Katmandu"</item>
-    <item msgid="1242216853434928489">"Kuala-Lumpur"</item>
-    <item msgid="4933780769758115782">"Kuvajt"</item>
-    <item msgid="6882764635090995312">"Makau"</item>
-    <item msgid="3986352476396048104">"Manila"</item>
-    <item msgid="7941758124259560958">"Muskat"</item>
-    <item msgid="2671480270494284192">"Pnom-Pen"</item>
-    <item msgid="3585358766120768888">"Piongiang"</item>
-    <item msgid="282733287703161268">"Katar"</item>
-    <item msgid="8551825553277677949">"Rangun"</item>
-    <item msgid="3510541723342902050">"Riad"</item>
-    <item msgid="7301933049899867383">"Saigon"</item>
-    <item msgid="2859585838402694009">"Seul"</item>
-    <item msgid="33498601045535875">"Shangai"</item>
-    <item msgid="8274790879257759399">"Singapor"</item>
-    <item msgid="4185891512451859606">"Taipei"</item>
-    <item msgid="8272983787037437358">"Teheran"</item>
-    <item msgid="7548402686482506151">"Tel-Aviv"</item>
-    <item msgid="6921751833980197720">"Tokio"</item>
-    <item msgid="59728156515393986">"Ulanbatar"</item>
-    <item msgid="701446121859732513">"Bermuda"</item>
-    <item msgid="6874435045145230527">"Kanarie"</item>
-    <item msgid="1975124795172898686">"Kepi i Gjelbër"</item>
-    <item msgid="5405194758503124447">"Reikjavik"</item>
-    <item msgid="4841506971765063373">"Stenli"</item>
-    <item msgid="3192252088299410199">"Adelajde"</item>
-    <item msgid="4515440099016150233">"Brisbejn"</item>
-    <item msgid="1603342478771190398">"Kanbera"</item>
-    <item msgid="7369443573793537977">"Darvin"</item>
-    <item msgid="6038622967693853356">"Melburn"</item>
-    <item msgid="5987600941235656656">"Uellsi i Jugut i Ri"</item>
-    <item msgid="8993222367897103441">"Përth"</item>
-    <item msgid="2331172541371685437">"Kuinsland"</item>
-    <item msgid="2150912736505182699">"Sidnej"</item>
-    <item msgid="8097029759143077179">"Viktoria"</item>
-    <item msgid="2175264082469352441">"Njufaundlend"</item>
-    <item msgid="5299806709792658953">"Saskaçevan"</item>
-    <item msgid="2742335625880576228">"Ishulli i Pashkës"</item>
-    <item msgid="3401105135843706855">"Amsterdam"</item>
-    <item msgid="7408055867187369479">"Andorrë"</item>
-    <item msgid="7714099594043232998">"Athinë"</item>
-    <item msgid="7588965073415041593">"Belfast"</item>
-    <item msgid="8982755519728730268">"Beograd"</item>
-    <item msgid="5820954942905597949">"Berlin"</item>
-    <item msgid="7624062157455799880">"Bratislavë"</item>
-    <item msgid="6138895798733335888">"Bruksel"</item>
-    <item msgid="8836227282219002613">"Bukuresht"</item>
-    <item msgid="8868098210480147802">"Budapest"</item>
-    <item msgid="114329374155996860">"Kishinau"</item>
-    <item msgid="6487487167873723374">"Kopenhagë"</item>
-    <item msgid="5264002034116955880">"Dublin"</item>
-    <item msgid="7950073703814432186">"Gjibraltar"</item>
-    <item msgid="4616641627708493425">"Helsinki"</item>
-    <item msgid="212359461403262711">"Ishulli i Manit"</item>
-    <item msgid="4245799496293578703">"Stamboll"</item>
-    <item msgid="4477669700025211678">"Kiev"</item>
-    <item msgid="7233802930588725294">"Lisbonë"</item>
-    <item msgid="7186725202454661926">"Londër"</item>
-    <item msgid="5298853578615697920">"Luksemburg"</item>
-    <item msgid="3107227222663823852">"Madrid"</item>
-    <item msgid="6409612387432198642">"Maltë"</item>
-    <item msgid="6955558182074785338">"Minsk"</item>
-    <item msgid="6228242074512253552">"Monako"</item>
-    <item msgid="6544575681565409774">"Moskë"</item>
-    <item msgid="3976815367069730505">"Oslo"</item>
-    <item msgid="2469420333993086275">"Paris"</item>
-    <item msgid="7485656867179996639">"Pragë"</item>
-    <item msgid="988513162091270543">"Riga"</item>
-    <item msgid="3998650297514954079">"Romë"</item>
-    <item msgid="1732427206709814080">"San-Marino"</item>
-    <item msgid="2794131568674225119">"Sarajevë"</item>
-    <item msgid="2400301040855226066">"Simferopol"</item>
-    <item msgid="9186733542818983602">"Shkup"</item>
-    <item msgid="1586570243468059398">"Sofje"</item>
-    <item msgid="564898083230872572">"Stokholm"</item>
-    <item msgid="8462542989781385012">"Talin"</item>
-    <item msgid="6709788967440613264">"Vatikan"</item>
-    <item msgid="8251863344440905549">"Vjenë"</item>
-    <item msgid="3257947331297603891">"Vilnius"</item>
-    <item msgid="2305299694079344212">"Varshavë"</item>
-    <item msgid="4469591142000997702">"Zagreb"</item>
-    <item msgid="3827805692447432666">"Cyrih"</item>
-    <item msgid="7710293346890852314">"Antananarivo"</item>
-    <item msgid="8675463358261691187">"Maldive"</item>
-    <item msgid="8258461076442136172">"Mauricius"</item>
-    <item msgid="3150318624617990367">"Aukland"</item>
-    <item msgid="8427795435830682122">"Fixhi"</item>
-    <item msgid="1158779814198631169">"Guam"</item>
-    <item msgid="5893704879373137457">"Honolulu"</item>
-    <item msgid="1770338947698194275">"Kiritimati"</item>
-    <item msgid="3115018823853432422">"Noumea"</item>
-    <item msgid="8930848797035435014">"Samoa"</item>
-    <item msgid="5520094948583238358">"Tahiti"</item>
-    <item msgid="7301905385854586936">"Antigua"</item>
-    <item msgid="8984152310253274404">"Austin"</item>
-    <item msgid="6874533703004710145">"Boston"</item>
-    <item msgid="7432962958322057136">"Kalgari"</item>
-    <item msgid="8096684279604140978">"Kolumbus"</item>
-    <item msgid="936901718255724986">"Dallas"</item>
-    <item msgid="4015131634823666245">"Niksvil"</item>
-    <item msgid="3978413466663710403">"Memfis"</item>
-    <item msgid="5023838008354228529">"Majami"</item>
-    <item msgid="7182213480667543511">"Mineapolis"</item>
-    <item msgid="869023139270244552">"Otava"</item>
-    <item msgid="8138869957811168440">"Filadelfia"</item>
-    <item msgid="1752278495028380978">"Portland"</item>
-    <item msgid="8972733979389600134">"San-Diego"</item>
-    <item msgid="304925930860094332">"San-Francisko"</item>
-    <item msgid="1092295421727954508">"Solt-Lejk-Siti"</item>
-    <item msgid="2861495155508879945">"San-Hoze"</item>
-    <item msgid="6951841899277574144">"San-Salvador"</item>
-    <item msgid="4063054959106860389">"Siatëll"</item>
-    <item msgid="4985936045757148312">"San-Luis"</item>
-    <item msgid="2498001791404810614">"Uashington"</item>
-    <item msgid="6490744399654978915">"Hjuston"</item>
-    <item msgid="5461172996986211872">"San-Antonio"</item>
-    <item msgid="7955879665647778362">"Xheksonvil"</item>
-    <item msgid="7274737959786806118">"Baltimor"</item>
-    <item msgid="5440109692257991959">"Nashvill"</item>
-    <item msgid="2580598303029580540">"Miluoki"</item>
-    <item msgid="5778397064882342884">"Oklahoma-Siti"</item>
-    <item msgid="60834900460576333">"Las-Vegas"</item>
-    <item msgid="1242224546028941695">"Albakërki"</item>
-    <item msgid="2108508912885156322">"Takson"</item>
-    <item msgid="2736505692163909286">"Sakramento"</item>
-    <item msgid="4244292537769840523">"Atlanta"</item>
-    <item msgid="1458420523389537755">"Klivland"</item>
-    <item msgid="6576927115185043547">"Nju-Orlins"</item>
-    <item msgid="2723274638984844697">"Tampa"</item>
-    <item msgid="1176352970801801624">"Pitsburg"</item>
-    <item msgid="5624802871949256105">"Sinsinati"</item>
-    <item msgid="527393217276418005">"Mauntin-Vju"</item>
-    <item msgid="1744025839066009857">"Reno"</item>
-    <item msgid="6276904698731697502">"Blek-Rok-Siti"</item>
-    <item msgid="2844451059935789778">"Doha"</item>
-    <item msgid="4108653157206192019">"Pekin"</item>
-    <item msgid="6115360044399896579">"Mumbai"</item>
-    <item msgid="7140676596549732117">"Delhi"</item>
-    <item msgid="1236127343975476693">"Osaka"</item>
-    <item msgid="6470041111418276646">"Lahore"</item>
-    <item msgid="5672665774945554582">"Sana"</item>
-    <item msgid="4227294244388933650">"Barcelonë"</item>
-    <item msgid="2404605478532633099">"Munih"</item>
-    <item msgid="2402973841037462176">"Milano"</item>
-    <item msgid="1658609023659261743">"Frankfurt"</item>
-    <item msgid="4214691757607136548">"Hanoi"</item>
-    <item msgid="484506613000693635">"Ankara"</item>
-    <item msgid="1958807113380596945">"Bangalore"</item>
-    <item msgid="2258411542499008700">"Brazilia"</item>
-    <item msgid="770086263560182220">"Kejp-Taun"</item>
-    <item msgid="5936333722350504953">"Islamabad"</item>
-    <item msgid="3631805761163219329">"Rio-de-Zhaneiro"</item>
-    <item msgid="6544644866501929714">"An-Arbor"</item>
-    <item msgid="8675519768651745334">"Boulder"</item>
-    <item msgid="7006632817384692182">"Kembrixh"</item>
-    <item msgid="7233704593042272414">"Kërkland"</item>
-    <item msgid="717352875658559544">"Medison"</item>
-    <item msgid="3567009426051313507">"Guangzhu"</item>
-    <item msgid="2738289235744819761">"Hiderabad"</item>
-    <item msgid="35629823970779893">"Reston"</item>
-    <item msgid="2620375619174484543">"Belo-Horizonte"</item>
-    <item msgid="3949247113051549869">"Santiago"</item>
-    <item msgid="3583568170097050810">"Monrovia"</item>
-    <item msgid="4337041465665825381">"Kolombo"</item>
-    <item msgid="2758533074887258174">"Çiuaua"</item>
-    <item msgid="3904262821019008829">"Salvador"</item>
-    <item msgid="7335556305222315705">"Gurgaon"</item>
-    <item msgid="8092021218913879570">"Mançester"</item>
-    <item msgid="3262376108426000449">"Kiev"</item>
-    <item msgid="1321450515191695851">"Shën-Pjetërsburg"</item>
-    <item msgid="5152144018647717853">"Krakov"</item>
-    <item msgid="3995511368799031783">"Vroklo"</item>
-    <item msgid="7251862005498390469">"Hamburg"</item>
-    <item msgid="4403899516544001462">"Oulu"</item>
-    <item msgid="8378499650951313108">"Haifa"</item>
-    <item msgid="7504732361387330116">"San-Huan"</item>
-    <item msgid="8613864994547669100">"Tegukigalpa"</item>
-    <item msgid="7087691675228926801">"Paramaribo"</item>
-    <item msgid="478384295484578701">"Kuito"</item>
-    <item msgid="4517870253399384206">"Lubljanë"</item>
-  </string-array>
-</resources>

diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
deleted file mode 100644
index b47f2a6..0000000
--- a/res/values-sq-rAL/strings.xml
+++ /dev/null

@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<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">"Ora"</string>
-    <string name="alarm_list_title" msgid="7589940465292950600">"Alarmet"</string>
-    <string name="add_alarm" msgid="5976616107390962899">"Shto alarm"</string>
-    <string name="menu_desk_clock" msgid="3241995064554071588">"Orë tavoline"</string>
-    <string name="menu_edit_alarm" msgid="7204602994918829751">"Redakto alarmin"</string>
-    <string name="delete_alarm" msgid="3457780990646206817">"Fshi alarmin"</string>
-    <string name="enable_alarm" msgid="1834599140632142536">"Aktivizo alarmin"</string>
-    <string name="disable_alarm" msgid="5889378670229554109">"Çaktivizo alarmin"</string>
-    <string name="delete_alarm_confirm" msgid="6578572637340860840">"Të fshihet ky alarm?"</string>
-    <string name="show_clock" msgid="8358759982675616915">"Shfaq orën"</string>
-    <string name="hide_clock" msgid="3217727306480505694">"Fshih orën"</string>
-    <string name="label" msgid="162189613902857319">"Emërtimi"</string>
-    <string name="default_label" msgid="5590025289805630372">"Alarmi"</string>
-    <string name="set_alarm" msgid="9148359866152726808">"Cakto alarm"</string>
-    <string name="alarm_vibrate" msgid="3476686921490362230">"Dridhja"</string>
-    <string name="alarm_repeat" msgid="7242985466344233206">"Përsërit"</string>
-    <string name="alert" msgid="6506982899651975645">"Zilja e alarmit"</string>
-    <string name="ringtone" msgid="9110746249688559579">"Zilja"</string>
-    <string name="time" msgid="8067216534232296518">"Ora"</string>
-    <string name="alarm_tomorrow" msgid="131356848787643420">"Nesër"</string>
-    <string name="alarm_today" msgid="7873594221106531654">"Sot"</string>
-    <string name="alarm_alert_wake_up" msgid="6790780716498252583">"Zgjohu!"</string>
-    <string name="alarm_alert_off_action_text" msgid="2459925305288819812">"Çaktivizuar"</string>
-    <string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Largoje"</string>
-    <string name="alarm_alert_dismiss_now_text" msgid="3272183025444682500">"Largoje tani"</string>
-    <string name="alarm_missed_title" msgid="3828345099754063392">"Alarm i humbur"</string>
-    <string name="alarm_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g>"</string>
-    <string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Dremitur"</string>
-  <plurals name="alarm_alert_snooze_duration">
-    <item quantity="one" msgid="9092917312369131464">"1 minutë"</item>
-    <item quantity="other" msgid="6731274475422132958">"<xliff:g id="NUMBER">%d</xliff:g> minuta"</item>
-  </plurals>
-    <string name="alarm_alert_off_text" msgid="4472073417593915002">"U çaktivizua"</string>
-    <string name="alarm_alert_snooze_text" msgid="1774416052207651584">"Dremit"</string>
-  <plurals name="alarm_alert_snooze_set">
-    <item quantity="one" msgid="7884410398338611019">"Do të dremitë për 1 minutë."</item>
-    <item quantity="other" msgid="7377899473014259727">"Do të dremitë për <xliff:g id="MINUTES">%d</xliff:g> minuta."</item>
-  </plurals>
-    <string name="alarm_alert_snooze_until" msgid="6958013659168344550">"Dremit deri në <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="alarm_alert_predismiss_title" msgid="5723945586913705445">"Alarmi i ardhshëm"</string>
-    <string name="missed_alarm_has_been_deleted" msgid="5295473204045979335">"Alarmi i humbur u fshi"</string>
-  <string-array name="timer_notifications">
-    <item msgid="7760558912503484257">"Ka mbetur më pak se një minutë"</item>
-    <item msgid="83197792732433351">"Kanë mbetur edhe <xliff:g id="HOURS">%1$s</xliff:g>"</item>
-    <item msgid="8919698220200894252">"Kanë mbetur edhe <xliff:g id="MINUTES">%2$s</xliff:g>"</item>
-    <item msgid="8458069283817013813">"Kanë mbetur edhe <xliff:g id="HOURS">%1$s</xliff:g> e <xliff:g id="MINUTES">%2$s</xliff:g>"</item>
-  </string-array>
-  <string-array name="alarm_set">
-    <item msgid="6450913786084215050">"Alarmi është vënë për më pak se 1 minutë nga momenti i tanishëm."</item>
-    <item msgid="6002066367368421848">"Alarmi është vënë për <xliff:g id="DAYS">%1$s</xliff:g> nga momenti i tanishëm."</item>
-    <item msgid="8824719306247973774">"Alarmi është vënë për <xliff:g id="HOURS">%2$s</xliff:g> nga momenti i tanishëm."</item>
-    <item msgid="8182406852935468862">"Alarmi është vënë për <xliff:g id="DAYS">%1$s</xliff:g> e <xliff:g id="HOURS">%2$s</xliff:g> nga momenti i tanishëm."</item>
-    <item msgid="2532279224777213194">"Alarmi është vënë për <xliff:g id="MINUTES">%3$s</xliff:g> nga momenti i tanishëm."</item>
-    <item msgid="5936557894247187717">"Alarmi është vënë për <xliff:g id="DAYS">%1$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g> nga momenti i tanishëm."</item>
-    <item msgid="9115697840826129603">"Alarmi është vënë për <xliff:g id="HOURS">%2$s</xliff:g> e <xliff:g id="MINUTES">%3$s</xliff:g> nga momenti i tanishëm."</item>
-    <item msgid="2332583385137381060">"Alarmi është vënë për <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g>, e <xliff:g id="MINUTES">%3$s</xliff:g> nga momenti i tanishëm."</item>
-  </string-array>
-    <string name="day" msgid="7984755014526510295">"1 ditë"</string>
-    <string name="days" msgid="2070509222727852210">"<xliff:g id="DAYS">%s</xliff:g> ditë"</string>
-    <string name="hour" msgid="2546819039651509323">"1 orë"</string>
-    <string name="hours" msgid="2071487018566991613">"<xliff:g id="HOURS">%s</xliff:g> orë"</string>
-    <string name="minute" msgid="2486157997434653710">"1 minutë"</string>
-    <string name="minutes" msgid="6115838729146292526">"<xliff:g id="MINUTES">%s</xliff:g> minuta"</string>
-    <string name="every_day" msgid="4100909974923444602">"Çdo ditë"</string>
-    <string name="day_concat" msgid="971998564991636532">", "</string>
-    <string name="clock_instructions" msgid="2656876819515011590">"Zgjidh një orë"</string>
-    <string name="analog_gadget" msgid="1670505720837152766">"Orë analoge"</string>
-    <string name="help" msgid="7786263119482654015">"ndihma"</string>
-    <string name="settings" msgid="5849739030579520686">"Cilësimet"</string>
-    <string name="snooze_duration_title" msgid="1097309861110780483">"Kohëzgjatja e dremitjes"</string>
-  <plurals name="snooze_duration">
-    <item quantity="one" msgid="7406963706727564418">"1 minutë"</item>
-    <item quantity="other" msgid="568504136093419703">"<xliff:g id="NUMBER">%d</xliff:g> minuta"</item>
-  </plurals>
-  <plurals name="snooze_picker_label">
-    <item quantity="one" msgid="3783171637798575068">"minutë"</item>
-    <item quantity="other" msgid="1304056759541595077">"minuta"</item>
-  </plurals>
-    <string name="auto_silence_title" msgid="2012754009554434544">"Hesht pas"</string>
-    <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuta"</string>
-    <string name="auto_silence_never" msgid="4821982647348750809">"Asnjeherë"</string>
-  <string-array name="auto_silence_entries">
-    <item msgid="3024545954917711306">"1 minutë"</item>
-    <item msgid="5431906692406316549">"5 minuta"</item>
-    <item msgid="7742728812068919959">"10 minuta"</item>
-    <item msgid="2855948657259647629">"15 minuta"</item>
-    <item msgid="6330196381284475079">"20 minuta"</item>
-    <item msgid="7809240121716151904">"25 minuta"</item>
-    <item msgid="4278641338024561333">"Asnjeherë"</item>
-  </string-array>
-    <string name="week_start_title" msgid="4268917518596832096">"Nise javën në ditën"</string>
-  <string-array name="week_start_entries">
-    <item msgid="9010198173394482639">"E shtunë"</item>
-    <item msgid="3993530639455360921">"E diel"</item>
-    <item msgid="8594709368683324282">"E hënë"</item>
-  </string-array>
-    <string name="done" msgid="6509722361933858451">"U krye!"</string>
-    <string name="revert" msgid="9100911171235162926">"Kthehu"</string>
-    <string name="delete" msgid="5732434972457000541">"Fshi"</string>
-    <string name="alarm_volume_title" msgid="8506245173912428522">"Volumi i alarmit"</string>
-    <string name="silent_alarm_summary" msgid="8605302849408279221">"Hesht"</string>
-    <string name="alarm_notify_text" msgid="4891014685945904766">"Dremit ose largoje alarmin."</string>
-    <string name="alarm_notify_snooze_label" msgid="5404083762646377829">"<xliff:g id="LABEL">%s</xliff:g> (dremitur)"</string>
-    <string name="alarm_notify_snooze_text" msgid="4819324081410990368">"Alarmi u caktua për në <xliff:g id="TIME">%s</xliff:g>. Prek për ta anuluar."</string>
-    <string name="volume_button_setting_title" msgid="6937131248843413357">"Butonat e volumit"</string>
-    <string name="volume_button_dialog_title" msgid="8768042543750036853">"Efekti i butonit"</string>
-  <string-array name="volume_button_setting_entries">
-    <item msgid="7972756698723318690">"Dremit"</item>
-    <item msgid="3450979320164769576">"Largoje"</item>
-    <item msgid="6302517608411378024">"Mos bëj asgjë"</item>
-  </string-array>
-    <string name="default_ringtone_setting_title" msgid="4549726190682964245">"Cakto zilen e parazgjedhur"</string>
-    <string name="alarm_button_description" msgid="740283647046258651">"Alarmet"</string>
-    <string name="gallery_button_description" msgid="1151743663255257668">"Galeria"</string>
-    <string name="music_button_description" msgid="1626593420810117999">"Muzikë"</string>
-    <string name="nightmode_button_description" msgid="990894208217576381">"I zbehtë"</string>
-    <string name="home_button_description" msgid="3383859096809056157">"Nisësi"</string>
-    <string name="desk_clock_button_description" msgid="4207371097361657274">"Shfaqja e orës"</string>
-    <string name="label_description" msgid="8736179296142915727">"Emërtimi"</string>
-    <string name="ringtone_description" msgid="7580922112921069925">"Zilja"</string>
-    <string name="weather_fetch_failure" msgid="3425804832021006835">"Informacioni për kohën nuk mund të përdoret tani."</string>
-    <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Shërbimi i ridëgjimit të zërit për alarmet e vëna tek ora."</string>
-    <string name="loading_ringtone" msgid="6523322777415268044">"Po ngarkon zilen…"</string>
-    <string name="timer_ring_service_desc" msgid="2620214305660322415">"Shërbimi i ridëgjimit të zërit për kohëmatësit është vënë tek ora."</string>
-    <string name="control_set_alarm" msgid="2194676418924016327">"Vendos alarm"</string>
-    <!-- no translation found for control_set_alarm_with_existing (3359285346655630660) -->
-    <skip />
-    <string name="menu_alarm" msgid="4772010125376647519">"Alarmi"</string>
-    <string name="menu_timer" msgid="6459070074762877114">"Kohëmatës"</string>
-    <string name="menu_clock" msgid="5612760670606829805">"Ora"</string>
-    <string name="menu_stopwatch" msgid="3396117705293574701">"Kronometër"</string>
-    <string name="button_alarms" msgid="3907838219512538763">"Shto alarm"</string>
-    <string name="button_cities" msgid="4555761857494501363">"Qytetet"</string>
-    <string name="button_menu" msgid="6050484561842120282">"Opsione të tjera"</string>
-    <string name="menu_item_settings" msgid="1413723516369078665">"Cilësimet"</string>
-    <string name="menu_item_help" msgid="4570953476186849841">"Ndihma"</string>
-    <string name="menu_item_night_mode" msgid="3486930302245398975">"Modaliteti i natës"</string>
-    <string name="menu_item_sort_by_gmt_offset" msgid="3120860422682721706">"Klasifiko sipas orës"</string>
-    <string name="menu_item_sort_by_name" msgid="1762931290495104106">"Klasifiko sipas emrit"</string>
-    <string name="selected_cities_label" msgid="3607479399424246605">"Qytetet e përzgjedhura"</string>
-    <string name="sw_resume_button" msgid="2569360966002022248">"Rifillo"</string>
-    <string name="sw_start_button" msgid="8373422516681242270">"Fillo"</string>
-    <string name="sw_stop_button" msgid="8322958613123274451">"Ndalo"</string>
-    <string name="sw_lap_button" msgid="6992264696039004233">"Xhiro"</string>
-    <string name="sw_reset_button" msgid="6616804728322906117">"Rivendos"</string>
-    <string name="sw_share_button" msgid="4478648110382859382">"Shpërnda"</string>
-    <string name="hours_label" msgid="3393478155635368097">"o"</string>
-    <string name="minutes_label" msgid="3568098128251438588">"m"</string>
-    <string name="seconds_label" msgid="124655952824003246">"s"</string>
-    <string name="hours_label_description" msgid="8652842524970971830">"orë"</string>
-    <string name="minutes_label_description" msgid="965686733490357796">"minuta"</string>
-    <string name="seconds_label_description" msgid="3821620053141299692">"sekonda"</string>
-    <string name="zero" msgid="7102083421938355017">"0"</string>
-    <string name="sw_share_main" msgid="7703563468204234405">"Koha ime është <xliff:g id="TIME">%s</xliff:g>"</string>
-    <string name="sw_share_laps" msgid="614390674795945007">"Kohët e xhiros:"</string>
-    <string name="sw_notification_lap_number" msgid="3535420316052647126">"Xhiroja <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="Nhours_description">
-    <item quantity="one" msgid="371227238759147245">"1 orë"</item>
-    <item quantity="other" msgid="7018184076091344797">"<xliff:g id="NUMBER">%d</xliff:g> orë"</item>
-  </plurals>
-  <plurals name="Nminutes_description">
-    <item quantity="one" msgid="1001391305885322059">"1 minutë"</item>
-    <item quantity="other" msgid="6948360065351547776">"<xliff:g id="NUMBER">%d</xliff:g> minuta"</item>
-  </plurals>
-  <plurals name="Nseconds_description">
-    <item quantity="one" msgid="6589853086641485725">"1 sekondë"</item>
-    <item quantity="other" msgid="7583230315175387547">"<xliff:g id="NUMBER">%d</xliff:g> sekonda"</item>
-  </plurals>
-    <string name="timer_add_timer" msgid="862733633862574752">"Shto kohëmatës"</string>
-    <string name="timer_start" msgid="6158486445614356442">"Fillo"</string>
-    <string name="timer_delete" msgid="8699122001991909302">"Fshi"</string>
-    <string name="timer_descriptive_delete" msgid="8794915342760383536">"Fshi <xliff:g id="NUMBER_STRING">%s</xliff:g>"</string>
-    <string name="timer_plus_one" msgid="6631211310420106116">"Shto 1 minutë"</string>
-    <string name="timer_plus_1_min" msgid="8645224089494875062">"Shto 1 minutë"</string>
-    <string name="timer_stop" msgid="3361154678667736722">"Ndalo"</string>
-    <string name="timer_done" msgid="2375990511982914051">"U krye!"</string>
-    <string name="timer_reset" msgid="7848424809190171640">"Rivendos"</string>
-    <string name="timer_cancel" msgid="3572868404230815644">"Anulo"</string>
-    <string name="timer_times_up" msgid="9190440395938519009">"Koha mbaroi"</string>
-    <string name="timer_notification_label" msgid="4933184831583137249">"Kohëmatësi"</string>
-    <string name="timers_max_count_reached" msgid="9140022846793903813">"Maksimumi 4 kohëmatës"</string>
-  <string-array name="sw_share_strings">
-    <item msgid="842841032273927988">"Je mjaft i shpejtë."</item>
-    <item msgid="6332879039890727169">"Shijo frytet e punës."</item>
-    <item msgid="815382761274660130">"Androidët njihen për të shpejtë, por jo kaq të shpejtë sa ti!"</item>
-    <item msgid="7916250650982813737">"Phu!"</item>
-    <item msgid="6836603904515182333">"L33t herë."</item>
-    <item msgid="7508085100680861631">"Një shpejtësi e jashtëzakonshme."</item>
-    <item msgid="5961245252909589573">"Ta kalojmë edhe një herë shpejtësinë e zërit!"</item>
-    <item msgid="5211891900854545940">"Edhe një kthesë në të majtë."</item>
-    <item msgid="9071353477103826053">"E ke në gjak shpejtësinë."</item>
-    <item msgid="3785193933691117181">"Shpejtësi fotonike."</item>
-  </string-array>
-    <string name="home_label" msgid="4436139365695453870">"Faqja bazë"</string>
-    <string name="cities_activity_title" msgid="8552462751129256730">"Qytetet"</string>
-    <string name="clock_settings" msgid="8317286807280600391">"Ora"</string>
-    <string name="clock_style" msgid="2265011060429742344">"Stili"</string>
-  <string-array name="clock_style_entries">
-    <item msgid="917900462224167608">"Analoge"</item>
-    <item msgid="8483930821046925592">"Dixhitale"</item>
-  </string-array>
-    <string name="automatic_home_clock" msgid="6274174710735449252">"Ora automatike e ekranit bazë"</string>
-    <string name="automatic_home_clock_summary" msgid="6020476321040807273">"Kur udhëton në një zonë ku ora ndryshon, shto një orë për ekranin bazë"</string>
-    <string name="home_time_zone" msgid="9199730676287974501">"Brezi orar i zonës ku gjendesh"</string>
-    <string name="home_time_zone_title" msgid="807894493443834624">"Brezi orar i zonës ku gjendesh"</string>
-    <string name="time_picker_cancel" msgid="7437106489606013077">"Anulo"</string>
-    <string name="time_picker_set" msgid="331153175471468051">"Në rregull"</string>
-    <string name="time_picker_time_seperator" msgid="7484926510054777041">":"</string>
-    <string name="time_picker_ampm_label" msgid="6754113715199751083">"--"</string>
-    <string name="time_picker_00_label" msgid="6001006474735281911">":00"</string>
-    <string name="time_picker_30_label" msgid="1027250857384838129">":30"</string>
-  <string-array name="timezone_labels">
-    <item msgid="5495601234086197399">"Ishujt Marshall"</item>
-    <item msgid="4196408495909011020">"Ishulli Miduej"</item>
-    <item msgid="1414384194857730006">"Havai"</item>
-    <item msgid="2687091371581931926">"Alaskë"</item>
-    <item msgid="1922100269679049660">"Ora e Paqësorit"</item>
-    <item msgid="7156402158716866161">"Tihuanë"</item>
-    <item msgid="1144117502254612241">"Arizonë"</item>
-    <item msgid="101284182011722637">"Çiuaua"</item>
-    <item msgid="689121094232986897">"Ora Malore"</item>
-    <item msgid="5445331923942302756">"Amerika Qendrore"</item>
-    <item msgid="2749806434052452351">"Ora Qendrore"</item>
-    <item msgid="3997138870229703753">"Meksiko-Siti"</item>
-    <item msgid="5425567073027744888">"Saskaçevan"</item>
-    <item msgid="2877342865396629368">"Bogota"</item>
-    <item msgid="568682398893899670">"Ora Lindore"</item>
-    <item msgid="668135984541863866">"Venezuelë"</item>
-    <item msgid="3737474220861486223">"Ora Atlantike (Barbados)"</item>
-    <item msgid="6279116051273436870">"Ora Atlantike (Kanada)"</item>
-    <item msgid="8513382867172014244">"Manaus"</item>
-    <item msgid="7776299003105932407">"Santiago"</item>
-    <item msgid="8636989494746218677">"Njufaundlend"</item>
-    <item msgid="4402541016410147505">"Brazilia"</item>
-    <item msgid="2251184440733164084">"Buenos-Ajres"</item>
-    <item msgid="6202926618569004969">"Grenlandë"</item>
-    <item msgid="2355275037115290628">"Montevideo"</item>
-    <item msgid="1377549694711708945">"Mid-Atlantik"</item>
-    <item msgid="3457671272126347981">"Azoret"</item>
-    <item msgid="3659315141063710840">"Ishujt e Kepit të Gjelbër"</item>
-    <item msgid="1260941741802367635">"Kazablanka"</item>
-    <item msgid="8275203689687954762">"Londër, Dublin"</item>
-    <item msgid="5970179539479320905">"Amsterdam, Berlin"</item>
-    <item msgid="5396319478750517962">"Beograd"</item>
-    <item msgid="8688787475056663004">"Bruksel"</item>
-    <item msgid="3415827874921681622">"Sarajevë"</item>
-    <item msgid="402008965928320066">"Uindhoek"</item>
-    <item msgid="6436942724959275569">"Ora e Afrikës Perëndimore"</item>
-    <item msgid="954536568417204026">"Aman, Jordani"</item>
-    <item msgid="8932745482008902551">"Athinë, Stamboll"</item>
-    <item msgid="320025725949024510">"Bejrut, Liban"</item>
-    <item msgid="7242083112551905970">"Kajro"</item>
-    <item msgid="7241520146011450419">"Helsinki"</item>
-    <item msgid="2717065017510546526">"Jerusalem"</item>
-    <item msgid="8698556287741466553">"Minsk"</item>
-    <item msgid="1797598357342084506">"Harare"</item>
-    <item msgid="5169119919905066998">"Bagdad"</item>
-    <item msgid="2615788116201065182">"Moskë"</item>
-    <item msgid="9084354867885584646">"Kuvajt"</item>
-    <item msgid="1351570519986178268">"Najrobi"</item>
-    <item msgid="7094569580635877460">"Teheran"</item>
-    <item msgid="3953138772617909704">"Baku"</item>
-    <item msgid="2868893113598800752">"Tbilisi"</item>
-    <item msgid="7088581865802476373">"Jerevan"</item>
-    <item msgid="1941122257623887992">"Dubai"</item>
-    <item msgid="9194797225058249720">"Kabul"</item>
-    <item msgid="6486569254364577332">"Islamabad, Karaçi"</item>
-    <item msgid="5487724896895412089">"Uralsk"</item>
-    <item msgid="364906869710826982">"Jekaterinburg"</item>
-    <item msgid="2106505051751383358">"Kalkuta"</item>
-    <item msgid="6851586621581501447">"Sri-Lankë"</item>
-    <item msgid="800438544128213134">"Katmandu"</item>
-    <item msgid="6173621471007643021">"Astana"</item>
-    <item msgid="8645125891971581128">"Jangon"</item>
-    <item msgid="2886407505119737794">"Krasnojarsk"</item>
-    <item msgid="3408222398188107090">"Bangkok"</item>
-    <item msgid="4441612937172851228">"Pekin"</item>
-    <item msgid="4936715789028996930">"Hong-Kong"</item>
-    <item msgid="4261031143777385525">"Irkutsk"</item>
-    <item msgid="3538060959338191835">"Kuala-Lumpur"</item>
-    <item msgid="1438847562643099201">"Përth"</item>
-    <item msgid="3063913827688244383">"Taipei"</item>
-    <item msgid="3502757135046564209">"Seul"</item>
-    <item msgid="6107588684519111669">"Tokio, Osaka"</item>
-    <item msgid="4350769099755608471">"Jakutsk"</item>
-    <item msgid="2422707004533526462">"Adelajde"</item>
-    <item msgid="1292192084554134339">"Darvin"</item>
-    <item msgid="1320883699470001716">"Brisbejn"</item>
-    <item msgid="5137198806146386527">"Hobart"</item>
-    <item msgid="5920063686933941174">"Sidnej, Kanbera"</item>
-    <item msgid="615906039696009425">"Vladivostok"</item>
-    <item msgid="7738680449356275374">"Guam"</item>
-    <item msgid="2882915026380778227">"Magadan"</item>
-    <item msgid="8255615641810148152">"Aukland"</item>
-    <item msgid="3027153773466391728">"Fixhi"</item>
-    <item msgid="5911600083231840181">"Tongë"</item>
-    <item msgid="5176858645450908751">"Xhakartë"</item>
-  </string-array>
-    <string name="alarm_settings" msgid="2947147071388290814">"Alarmet"</string>
-    <string name="stopwatch_service_desc" msgid="8416624630388063996">"Njoftimin do ta japë shërbimi i kronometrit."</string>
-    <string name="swn_stopped" msgid="783124901663086172">"Ndaloi"</string>
-    <string name="description_direction_right" msgid="5709209043267548985">"Rrëshqit djathtas për ta larguar"</string>
-    <string name="description_direction_left" msgid="7448141043674998679">"Rrëshqit majtas për ta dremitur"</string>
-    <string name="description_direction_both" msgid="1841309486023845685">"Rrëshqit majtas për ta shtyrë, ose djathtas për ta hequr"</string>
-    <string name="timer_stopped" msgid="2730331837832462008">"Kohëmatësi ndaloi"</string>
-    <string name="timers_stopped" msgid="2393640808691864520">"<xliff:g id="NUMBER">%d</xliff:g> kohëmatës ndaluan"</string>
-    <string name="all_timers_stopped_notif" msgid="278532320068394600">"Prek për të parë kohëmatësit"</string>
-    <string name="timers_in_use" msgid="5570729467344408506">"<xliff:g id="NUMBER">%d</xliff:g> kohëmatës"</string>
-    <string name="next_timer_notif" msgid="6136454740115613653">"Kohëmatësi tjetër: <xliff:g id="TIME_REMAINING">%s</xliff:g>"</string>
-    <string name="screensaver_settings" msgid="7013450738357352801">"Cilësimet e mbrojtësit të ekranit"</string>
-    <string name="night_mode_title" msgid="5983813889469616299">"Modaliteti i natës"</string>
-    <string name="night_mode_summary" msgid="1017350187324162631">"Ekran shumë i zbehtë (për dhoma të errëta)"</string>
-    <string name="expand_alarm" msgid="7392616528943305020">"Zgjero alarmin"</string>
-    <string name="collapse_alarm" msgid="3561772046433483980">"Shpalos alarmin"</string>
-    <string name="alarm_undo" msgid="5710042601177655254">"zhbëj"</string>
-    <string name="alarm_deleted" msgid="5017075127290219443">"Alarmi u fshi."</string>
-    <string name="slash" msgid="2077577763821006919">"/"</string>
-    <string name="world_day_of_week_label" msgid="5911196322328341288">"/ <xliff:g id="LABEL">%s</xliff:g>"</string>
-    <string name="next_alarm_description" msgid="2650244835760747046">"Alarmi tjetër: <xliff:g id="ALARM_TIME">%s</xliff:g>"</string>
-    <string name="label_unlabeled" msgid="4699506713571930740"></string>
-    <string name="alarms_selected" msgid="1075308195332888260">"U përzgjodhën <xliff:g id="ALARMS">%d</xliff:g>"</string>
-    <string name="deleted_message" msgid="1220848140260509437">"U fshi!"</string>
-  <plurals name="alarm_delete_confirmation">
-    <item quantity="one" msgid="111940612131906802">"Dëshiron ta fshish alarmin e përzgjedhur?"</item>
-    <item quantity="other" msgid="6918176478191272189">"Dëshiron t\'i fshish alarmet e përzgjedhura?"</item>
-  </plurals>
-    <string name="timer_delete_confirmation" msgid="2815524107015816453">"Të fshihet kohëmatësi?"</string>
-    <string name="city_delete_confirmation" msgid="1783441538785676299">"Të hiqet ky qytet?"</string>
-    <string name="digital_gadget" msgid="2326954556720571358">"Orë dixhitale"</string>
-    <string name="no_alarms" msgid="6429431324842022917">"Nuk ka alarme"</string>
-    <string name="no_alarms_set" msgid="4887558279496044764">"Nuk është caktuar asnjë alarm"</string>
-    <string name="no_upcoming_alarms" msgid="2889840988069436254">"NUK KA ALARME TË ARDHSHME"</string>
-    <string name="time_format_12_mode" msgid="1619464909892545536">"h:mm"</string>
-    <string name="time_format_24_mode" msgid="7998512313148074539">"k:mm"</string>
-    <string name="weekday_time_format_12_mode" msgid="8648842975829470646">"EEE, h:mm"</string>
-    <string name="weekday_time_format_24_mode" msgid="152964494051478631">"EEE, k:mm"</string>
-</resources>

diff --git a/res/values/donottranslate_events.xml b/res/values/donottranslate_events.xml
index 52f9d3b..3593620 100644
--- a/res/values/donottranslate_events.xml
+++ b/res/values/donottranslate_events.xml

@@ -33,6 +33,7 @@
     <string name="action_show">Show</string>
     <string name="action_add_minute">Add Minute</string>
     <string name="action_lap">Lap</string>
+    <string name="action_disable">Disable</string>
 
     <!-- Label names for events describe the entity responsible for the event. -->
     <string name="label_deskclock">DeskClock</string>

diff --git a/src/com/android/deskclock/AlarmInitReceiver.java b/src/com/android/deskclock/AlarmInitReceiver.java
index ec5813a..4ff8b2b 100644
--- a/src/com/android/deskclock/AlarmInitReceiver.java
+++ b/src/com/android/deskclock/AlarmInitReceiver.java

@@ -58,6 +58,9 @@
                     TimerObj.resetTimersInSharedPrefs(prefs);
                     Utils.clearSwSharedPref(prefs);
 
+                    // Dismiss snoozed alarms after boot
+                    AlarmStateManager.dismissSnoozedAlarms(context);
+
                     if (!prefs.getBoolean(PREF_VOLUME_DEF_DONE, false)) {
                         // Fix the default
                         LogUtils.v("AlarmInitReceiver - resetting volume button default");

diff --git a/src/com/android/deskclock/CircleTimerView.java b/src/com/android/deskclock/CircleTimerView.java
index 3bce066..798b231 100644
--- a/src/com/android/deskclock/CircleTimerView.java
+++ b/src/com/android/deskclock/CircleTimerView.java

@@ -193,7 +193,7 @@
             drawRedDot(canvas, redPercent, xCenter, yCenter, radius);
         }
         if (mAnimate) {
-            invalidate();
+            postInvalidateOnAnimation();
         }
    }
 

diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 9c9d6c2..5470b36 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java

@@ -28,6 +28,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.annotation.VisibleForTesting;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
@@ -155,7 +156,8 @@
         mActionBar.setSelectedNavigationItem(mSelectedTab);
     }
 
-    private DeskClockFragment getSelectedFragment() {
+    @VisibleForTesting
+    DeskClockFragment getSelectedFragment() {
         return (DeskClockFragment) mTabsAdapter.getItem(getRtlPosition(mSelectedTab));
     }
 

diff --git a/src/com/android/deskclock/HandleApiCalls.java b/src/com/android/deskclock/HandleApiCalls.java
index 4110e78..5b4f4fe 100644
--- a/src/com/android/deskclock/HandleApiCalls.java
+++ b/src/com/android/deskclock/HandleApiCalls.java

@@ -24,6 +24,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.provider.AlarmClock;
 import android.text.TextUtils;
 
 import com.android.deskclock.alarms.AlarmStateManager;
@@ -39,19 +40,6 @@
 import java.util.Calendar;
 import java.util.List;
 
-import static android.provider.AlarmClock.ACTION_SET_ALARM;
-import static android.provider.AlarmClock.ACTION_SET_TIMER;
-import static android.provider.AlarmClock.ACTION_SHOW_ALARMS;
-import static android.provider.AlarmClock.EXTRA_DAYS;
-import static android.provider.AlarmClock.EXTRA_HOUR;
-import static android.provider.AlarmClock.EXTRA_LENGTH;
-import static android.provider.AlarmClock.EXTRA_MESSAGE;
-import static android.provider.AlarmClock.EXTRA_MINUTES;
-import static android.provider.AlarmClock.EXTRA_RINGTONE;
-import static android.provider.AlarmClock.EXTRA_SKIP_UI;
-import static android.provider.AlarmClock.EXTRA_VIBRATE;
-import static android.provider.AlarmClock.VALUE_RINGTONE_SILENT;
-
 public class HandleApiCalls extends Activity {
 
     public static final long TIMER_MIN_LENGTH = 1000;
@@ -61,15 +49,14 @@
     protected void onCreate(Bundle icicle) {
         try {
             super.onCreate(icicle);
-            Intent intent = getIntent();
-            if (intent != null) {
-                if (ACTION_SET_ALARM.equals(intent.getAction())) {
-                    handleSetAlarm(intent);
-                } else if (ACTION_SHOW_ALARMS.equals(intent.getAction())) {
-                    handleShowAlarms();
-                } else if (ACTION_SET_TIMER.equals(intent.getAction())) {
-                    handleSetTimer(intent);
-                }
+            final Intent intent = getIntent();
+            final String action = intent == null ? null : intent.getAction();
+            if (AlarmClock.ACTION_SET_ALARM.equals(action)) {
+                handleSetAlarm(intent);
+            } else if (AlarmClock.ACTION_SHOW_ALARMS.equals(action)) {
+                handleShowAlarms();
+            } else if (AlarmClock.ACTION_SET_TIMER.equals(action)) {
+                handleSetTimer(intent);
             }
         } finally {
             finish();
@@ -78,16 +65,16 @@
 
     /***
      * Processes the SET_ALARM intent
-     * @param intent
+     * @param intent Intent passed to the app
      */
     private void handleSetAlarm(Intent intent) {
         // If not provided or invalid, show UI
-        final int hour = intent.getIntExtra(EXTRA_HOUR, -1);
+        final int hour = intent.getIntExtra(AlarmClock.EXTRA_HOUR, -1);
 
         // If not provided, use zero. If it is provided, make sure it's valid, otherwise, show UI
         final int minutes;
-        if (intent.hasExtra(EXTRA_MINUTES)) {
-            minutes = intent.getIntExtra(EXTRA_MINUTES, -1);
+        if (intent.hasExtra(AlarmClock.EXTRA_MINUTES)) {
+            minutes = intent.getIntExtra(AlarmClock.EXTRA_MINUTES, -1);
         } else {
             minutes = 0;
         }
@@ -102,7 +89,8 @@
             return;
         }
 
-        final boolean skipUi = intent.getBooleanExtra(EXTRA_SKIP_UI, false);
+        final boolean skipUi = intent.getBooleanExtra(AlarmClock.EXTRA_SKIP_UI, false);
+        Events.sendAlarmEvent(R.string.action_create, R.string.label_intent);
 
         final StringBuilder selection = new StringBuilder();
         final List<String> args = new ArrayList<>();
@@ -128,8 +116,8 @@
         // Otherwise insert it and handle it
         final String message = getMessageFromIntent(intent);
         final DaysOfWeek daysOfWeek = getDaysFromIntent(intent);
-        final boolean vibrate = intent.getBooleanExtra(EXTRA_VIBRATE, false);
-        final String alert = intent.getStringExtra(EXTRA_RINGTONE);
+        final boolean vibrate = intent.getBooleanExtra(AlarmClock.EXTRA_VIBRATE, false);
+        final String alert = intent.getStringExtra(AlarmClock.EXTRA_RINGTONE);
 
         Alarm alarm = new Alarm(hour, minutes);
         alarm.enabled = true;
@@ -139,7 +127,7 @@
 
         if (alert == null) {
             alarm.alert = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
-        } else if (VALUE_RINGTONE_SILENT.equals(alert) || alert.isEmpty()) {
+        } else if (AlarmClock.VALUE_RINGTONE_SILENT.equals(alert) || alert.isEmpty()) {
             alarm.alert = Alarm.NO_RINGTONE_URI;
         } else {
             alarm.alert = Uri.parse(alert);
@@ -161,7 +149,7 @@
     private void handleSetTimer(Intent intent) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         // If no length is supplied, show the timer setup view
-        if (!intent.hasExtra(EXTRA_LENGTH)) {
+        if (!intent.hasExtra(AlarmClock.EXTRA_LENGTH)) {
             startActivity(new Intent(this, DeskClock.class)
                   .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX)
                   .putExtra(TimerFullScreenFragment.GOTO_SETUP_VIEW, true));
@@ -169,7 +157,7 @@
             return;
         }
 
-        final long length = 1000l * intent.getIntExtra(EXTRA_LENGTH, 0);
+        final long length = 1000l * intent.getIntExtra(AlarmClock.EXTRA_LENGTH, 0);
         if (length < TIMER_MIN_LENGTH || length > TIMER_MAX_LENGTH) {
             LogUtils.i("Invalid timer length requested: " + length);
             return;
@@ -188,7 +176,7 @@
             }
         }
 
-        boolean skipUi = intent.getBooleanExtra(EXTRA_SKIP_UI, false);
+        boolean skipUi = intent.getBooleanExtra(AlarmClock.EXTRA_SKIP_UI, false);
         if (timer == null) {
             // Use a new timer
             timer = new TimerObj(length, label, this /* context */);
@@ -232,13 +220,13 @@
     }
 
     private String getMessageFromIntent(Intent intent) {
-        final String message = intent.getStringExtra(EXTRA_MESSAGE);
+        final String message = intent.getStringExtra(AlarmClock.EXTRA_MESSAGE);
         return message == null ? "" : message;
     }
 
     private DaysOfWeek getDaysFromIntent(Intent intent) {
         final DaysOfWeek daysOfWeek = new DaysOfWeek(0);
-        final ArrayList<Integer> days = intent.getIntegerArrayListExtra(EXTRA_DAYS);
+        final ArrayList<Integer> days = intent.getIntegerArrayListExtra(AlarmClock.EXTRA_DAYS);
         if (days != null) {
             final int[] daysArray = new int[days.size()];
             for (int i = 0; i < days.size(); i++) {
@@ -247,7 +235,7 @@
             daysOfWeek.setDaysOfWeek(true, daysArray);
         } else {
             // API says to use an ArrayList<Integer> but we allow the user to use a int[] too.
-            final int[] daysArray = intent.getIntArrayExtra(EXTRA_DAYS);
+            final int[] daysArray = intent.getIntArrayExtra(AlarmClock.EXTRA_DAYS);
             if (daysArray != null) {
                 daysOfWeek.setDaysOfWeek(true, daysArray);
             }
@@ -266,7 +254,7 @@
         selection.append(" AND ").append(Alarm.MINUTES).append("=?");
         args.add(String.valueOf(minutes));
 
-        if (intent.hasExtra(EXTRA_MESSAGE)) {
+        if (intent.hasExtra(AlarmClock.EXTRA_MESSAGE)) {
             selection.append(" AND ").append(Alarm.LABEL).append("=?");
             args.add(getMessageFromIntent(intent));
         }
@@ -274,23 +262,23 @@
         // Days is treated differently that other fields because if days is not specified, it
         // explicitly means "not recurring".
         selection.append(" AND ").append(Alarm.DAYS_OF_WEEK).append("=?");
-        args.add(String.valueOf(intent.hasExtra(EXTRA_DAYS)
+        args.add(String.valueOf(intent.hasExtra(AlarmClock.EXTRA_DAYS)
                 ? getDaysFromIntent(intent).getBitSet() : DaysOfWeek.NO_DAYS_SET));
 
-        if (intent.hasExtra(EXTRA_VIBRATE)) {
+        if (intent.hasExtra(AlarmClock.EXTRA_VIBRATE)) {
             selection.append(" AND ").append(Alarm.VIBRATE).append("=?");
-            args.add(intent.getBooleanExtra(EXTRA_VIBRATE, false) ? "1" : "0");
+            args.add(intent.getBooleanExtra(AlarmClock.EXTRA_VIBRATE, false) ? "1" : "0");
         }
 
-        if (intent.hasExtra(EXTRA_RINGTONE)) {
+        if (intent.hasExtra(AlarmClock.EXTRA_RINGTONE)) {
             selection.append(" AND ").append(Alarm.RINGTONE).append("=?");
 
-            String ringTone = intent.getStringExtra(EXTRA_RINGTONE);
+            String ringTone = intent.getStringExtra(AlarmClock.EXTRA_RINGTONE);
             if (ringTone == null) {
                 // If the intent explicitly specified a NULL ringtone, treat it as the default
                 // ringtone.
                 ringTone = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM).toString();
-            } else if (VALUE_RINGTONE_SILENT.equals(ringTone) || ringTone.isEmpty()) {
+            } else if (AlarmClock.VALUE_RINGTONE_SILENT.equals(ringTone) || ringTone.isEmpty()) {
                     ringTone = Alarm.NO_RINGTONE;
             }
             args.add(ringTone);

diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index c0c5269..c62fbe8 100644
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java

@@ -63,6 +63,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -534,8 +535,8 @@
             dateDisplay.setVisibility(View.VISIBLE);
             dateDisplay.setContentDescription(isJBMR2OrLater()
                     ? new SimpleDateFormat(
-                            DateFormat.getBestDateTimePattern(l, dateFormatForAccessibility), l)
-                            .format(now)
+                    DateFormat.getBestDateTimePattern(l, dateFormatForAccessibility), l)
+                    .format(now)
                     : SimpleDateFormat.getDateInstance(java.text.DateFormat.FULL).format(now));
         }
     }
@@ -596,19 +597,29 @@
         Resources r = c.getResources();
         // Read strings array of name,timezone, id
         // make sure the list are the same length
-        String[] cities = r.getStringArray(R.array.cities_names);
+        String[] cityNames = r.getStringArray(R.array.cities_names);
         String[] timezones = r.getStringArray(R.array.cities_tz);
         String[] ids = r.getStringArray(R.array.cities_id);
-        int minLength = cities.length;
-        if (cities.length != timezones.length || ids.length != cities.length) {
-            minLength = Math.min(cities.length, Math.min(timezones.length, ids.length));
+        int minLength = cityNames.length;
+        if (cityNames.length != timezones.length || ids.length != cityNames.length) {
+            minLength = Math.min(cityNames.length, Math.min(timezones.length, ids.length));
             LogUtils.e("City lists sizes are not the same, truncating");
         }
-        CityObj[] tempList = new CityObj[minLength];
+        CityObj[] cities = new CityObj[minLength];
         for (int i = 0; i < cities.length; i++) {
-            tempList[i] = new CityObj(cities[i], timezones[i], ids[i]);
+            cities[i] = new CityObj(cityNames[i], timezones[i], ids[i]);
         }
-        return tempList;
+        return cities;
+    }
+
+    public static HashMap<String, CityObj> loadCityMapFromXml(Context c) {
+        CityObj[] cities = loadCitiesFromXml(c);
+
+        final HashMap<String, CityObj> map = new HashMap<>(cities.length);
+        for (int i = 0; i < cities.length; i++) {
+            map.put(cities[i].mCityName, cities[i]);
+        }
+        return map;
     }
 
     /**

diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java
index 161fd8b..ea09f9d 100644
--- a/src/com/android/deskclock/alarms/AlarmStateManager.java
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.java

@@ -150,14 +150,7 @@
      * @param context application context
      */
     public static void updateNextAlarm(Context context) {
-        AlarmInstance nextAlarm = null;
-        ContentResolver cr = context.getContentResolver();
-        String activeAlarmQuery = AlarmInstance.ALARM_STATE + "<" + AlarmInstance.FIRED_STATE;
-        for (AlarmInstance instance : AlarmInstance.getInstances(cr, activeAlarmQuery)) {
-            if (nextAlarm == null || instance.getAlarmTime().before(nextAlarm.getAlarmTime())) {
-                nextAlarm = instance;
-            }
-        }
+        final AlarmInstance nextAlarm = getNextFiringAlarm(context);
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             updateNextAlarmInSystemSettings(context, nextAlarm);
@@ -167,6 +160,25 @@
     }
 
     /**
+     * Returns an alarm instance of an alarm that's going to fire next.
+     * @param context application context
+     * @return an alarm instance that will fire earliest relative to current time.
+     */
+    public static AlarmInstance getNextFiringAlarm(Context context) {
+        final ContentResolver cr = context.getContentResolver();
+        final String activeAlarmQuery = AlarmInstance.ALARM_STATE + "<" + AlarmInstance.FIRED_STATE;
+        final List<AlarmInstance> alarmInstances = AlarmInstance.getInstances(cr, activeAlarmQuery);
+
+        AlarmInstance nextAlarm = null;
+        for (AlarmInstance instance : alarmInstances) {
+            if (nextAlarm == null || instance.getAlarmTime().before(nextAlarm.getAlarmTime())) {
+                nextAlarm = instance;
+            }
+        }
+        return nextAlarm;
+    }
+
+    /**
      * Used in pre-L devices, where "next alarm" is stored in system settings.
      */
     private static void updateNextAlarmInSystemSettings(Context context, AlarmInstance nextAlarm) {
@@ -322,10 +334,13 @@
         // Create a PendingIntent that will match any one set for this instance
         PendingIntent pendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(),
                 createStateChangeIntent(context, ALARM_MANAGER_TAG, instance, null),
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_NO_CREATE);
 
-        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        am.cancel(pendingIntent);
+        if (pendingIntent != null) {
+            AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+            am.cancel(pendingIntent);
+            pendingIntent.cancel();
+        }
     }
 
 
@@ -693,6 +708,18 @@
     }
 
     /**
+     * Dismiss all snoozed alarms
+     */
+    public static void dismissSnoozedAlarms(Context context) {
+        ContentResolver contentResolver = context.getContentResolver();
+        for (AlarmInstance instance : AlarmInstance.getInstances(contentResolver, null)) {
+            if (instance.mAlarmState == AlarmInstance.SNOOZE_STATE) {
+                AlarmStateManager.setDismissState(context, instance);
+            }
+        }
+    }
+
+    /**
      * Fix and update all alarm instance when a time change event occurs.
      *
      * @param context application context
@@ -702,6 +729,15 @@
         // TODO: Refactor this code to not use the overloaded registerInstance method.
         ContentResolver contentResolver = context.getContentResolver();
         for (AlarmInstance instance : AlarmInstance.getInstances(contentResolver, null)) {
+            // If the alarm is snoozed, keep the current next alarm time; do not set the time to
+            // the next scheduled alarm.
+            // This means that if the time has adjusted past the originally intended fire time,
+            // we will schedule for the old time. AlarmManager will then fire the alarm immediately.
+            if (instance.mAlarmState != AlarmInstance.SNOOZE_STATE) {
+                final Alarm alarm = Alarm.getAlarm(contentResolver, instance.mAlarmId);
+                instance.setAlarmTime(alarm.getNextAlarmTime(Calendar.getInstance()));
+                AlarmInstance.updateInstance(contentResolver, instance);
+            }
             AlarmStateManager.registerInstance(context, instance, false);
         }
         AlarmStateManager.updateNextAlarm(context);

diff --git a/src/com/android/deskclock/events/Events.java b/src/com/android/deskclock/events/Events.java
index 4e18be8..1a5d540 100644
--- a/src/com/android/deskclock/events/Events.java
+++ b/src/com/android/deskclock/events/Events.java

@@ -31,6 +31,10 @@
         sEventTrackers.add(eventTracker);
     }
 
+    public static void removeEventTracker(EventTracker eventTracker) {
+        sEventTrackers.remove(eventTracker);
+    }
+
     /**
      * Tracks an alarm event.
      *

diff --git a/src/com/android/deskclock/provider/Alarm.java b/src/com/android/deskclock/provider/Alarm.java
index 5494cb8..240d135 100644
--- a/src/com/android/deskclock/provider/Alarm.java
+++ b/src/com/android/deskclock/provider/Alarm.java

@@ -57,7 +57,9 @@
             VIBRATE,
             LABEL,
             RINGTONE,
-            DELETE_AFTER_USE
+            DELETE_AFTER_USE,
+            DISMISS_TIME,
+            DISMISS_TYPE
     };
 
     /**
@@ -73,8 +75,10 @@
     private static final int LABEL_INDEX = 6;
     private static final int RINGTONE_INDEX = 7;
     private static final int DELETE_AFTER_USE_INDEX = 8;
+    private static final int DISMISS_TIME_INDEX = 9;
+    private static final int DISMISS_TYPE_INDEX = 10;
 
-    private static final int COLUMN_COUNT = DELETE_AFTER_USE_INDEX + 1;
+    private static final int COLUMN_COUNT = DISMISS_TYPE_INDEX + 1;
 
     public static ContentValues createContentValues(Alarm alarm) {
         ContentValues values = new ContentValues(COLUMN_COUNT);
@@ -89,6 +93,8 @@
         values.put(VIBRATE, alarm.vibrate ? 1 : 0);
         values.put(LABEL, alarm.label);
         values.put(DELETE_AFTER_USE, alarm.deleteAfterUse);
+        values.put(DISMISS_TIME, NO_DISMISS_TIME);
+        values.put(DISMISS_TYPE, NO_RECORDED_DISMISS);
         if (alarm.alert == null) {
             // We want to put null, so default alarm changes
             values.putNull(RINGTONE);
@@ -193,7 +199,7 @@
     }
 
     public static boolean updateAlarm(ContentResolver contentResolver, Alarm alarm) {
-        if (alarm.id == Alarm.INVALID_ID) return false;
+        if (alarm.id == INVALID_ID) return false;
         ContentValues values = createContentValues(alarm);
         long rowsUpdated = contentResolver.update(getUri(alarm.id), values, null, null);
         return rowsUpdated == 1;
@@ -226,6 +232,8 @@
     public String label;
     public Uri alert;
     public boolean deleteAfterUse;
+    public long dismissTime;
+    public int dismissType;
 
     // Creates a default alarm at the current time.
     public Alarm() {
@@ -241,6 +249,8 @@
         this.label = "";
         this.alert = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM);
         this.deleteAfterUse = false;
+        this.dismissTime = NO_DISMISS_TIME;
+        this.dismissType = NO_RECORDED_DISMISS;
     }
 
     public Alarm(Cursor c) {
@@ -252,6 +262,8 @@
         vibrate = c.getInt(VIBRATE_INDEX) == 1;
         label = c.getString(LABEL_INDEX);
         deleteAfterUse = c.getInt(DELETE_AFTER_USE_INDEX) == 1;
+        dismissTime = c.getLong(DISMISS_TIME_INDEX);
+        dismissType = c.getInt(DISMISS_TYPE_INDEX);
 
         if (c.isNull(RINGTONE_INDEX)) {
             // Should we be saving this with the current ringtone or leave it null
@@ -272,6 +284,8 @@
         label = p.readString();
         alert = (Uri) p.readParcelable(null);
         deleteAfterUse = p.readInt() == 1;
+        dismissTime = p.readLong();
+        dismissType = p.readInt();
     }
 
     public String getLabelOrDefault(Context context) {
@@ -291,6 +305,8 @@
         p.writeString(label);
         p.writeParcelable(alert, flags);
         p.writeInt(deleteAfterUse ? 1 : 0);
+        p.writeLong(dismissTime);
+        p.writeInt(dismissType);
     }
 
     public int describeContents() {
@@ -353,6 +369,8 @@
                 ", vibrate=" + vibrate +
                 ", label='" + label + '\'' +
                 ", deleteAfterUse=" + deleteAfterUse +
+                ", mDismissTime=" + dismissTime +
+                ", mDismissType=" + dismissType +
                 '}';
     }
 }

diff --git a/src/com/android/deskclock/provider/ClockContract.java b/src/com/android/deskclock/provider/ClockContract.java
index 0cf1a17..8ef995b 100644
--- a/src/com/android/deskclock/provider/ClockContract.java
+++ b/src/com/android/deskclock/provider/ClockContract.java

@@ -95,6 +95,28 @@
         public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/alarms");
 
         /**
+         *  DISMISS_TIME when the alarm has not yet been dismissed, preemptively or naturally.
+         */
+        public static final long NO_DISMISS_TIME = -1;
+
+        /**
+         * DISMISS_TYPE when this instance has not been dismissed.
+         */
+        public static final int NO_RECORDED_DISMISS = 0;
+
+        /**
+         * DISMISS_TYPE when this instance has been preemptively dismissed (dismissed before the
+         * alarm has actually fired).
+         */
+        public static final int PREEMPTIVE_DISMISS = 1;
+
+        /**
+         * DISMISS_TYPE when this instance has been naturally dismissed (dismissed after the alarm
+         * has fired, possibly after being snoozed).
+         */
+        public static final int NATURAL_DISMISS = 2;
+
+        /**
          * Hour in 24-hour localtime 0 - 23.
          * <p>Type: INTEGER</p>
          */
@@ -125,6 +147,20 @@
          * <p>Type: INTEGER</p>
          */
         public static final String DELETE_AFTER_USE = "delete_after_use";
+
+        /**
+         * Time of last dismiss in ms (preemptive or natural)
+         * <p>Type: long </p>
+         */
+        public static final String DISMISS_TIME = "dismiss_time";
+
+        /**
+         * Type of last dismiss (preemptive or natural)
+         * One of {@link #NO_RECORDED_DISMISS}, {@link #PREEMPTIVE_DISMISS},
+         * {@link #NATURAL_DISMISS}
+         * <p>Type: INTEGER </p>
+         */
+        public static final String DISMISS_TYPE = "dismiss_type";
     }
 
     /**

diff --git a/src/com/android/deskclock/provider/ClockDatabaseHelper.java b/src/com/android/deskclock/provider/ClockDatabaseHelper.java
index 9004471..18aae75 100644
--- a/src/com/android/deskclock/provider/ClockDatabaseHelper.java
+++ b/src/com/android/deskclock/provider/ClockDatabaseHelper.java

@@ -52,11 +52,16 @@
      */
     private static final int VERSION_7 = 7;
 
+    /**
+     * Added dismissTime and dismissType to alarm table.
+     */
+    private static final int VERSION_8 = 8;
+
     // This creates a default alarm at 8:30 for every Mon,Tue,Wed,Thu,Fri
-    private static final String DEFAULT_ALARM_1 = "(8, 30, 31, 0, 0, '', NULL, 0);";
+    private static final String DEFAULT_ALARM_1 = "(8, 30, 31, 0, 0, '', NULL, 0, -1, 0);";
 
     // This creates a default alarm at 9:30 for every Sat,Sun
-    private static final String DEFAULT_ALARM_2 = "(9, 00, 96, 0, 0, '', NULL, 0);";
+    private static final String DEFAULT_ALARM_2 = "(9, 00, 96, 0, 0, '', NULL, 0, -1, 0);";
 
     // Database and table names
     static final String DATABASE_NAME = "alarms.db";
@@ -75,7 +80,11 @@
                 ClockContract.AlarmsColumns.VIBRATE + " INTEGER NOT NULL, " +
                 ClockContract.AlarmsColumns.LABEL + " TEXT NOT NULL, " +
                 ClockContract.AlarmsColumns.RINGTONE + " TEXT, " +
-                ClockContract.AlarmsColumns.DELETE_AFTER_USE + " INTEGER NOT NULL DEFAULT 0);");
+                ClockContract.AlarmsColumns.DELETE_AFTER_USE + " INTEGER NOT NULL DEFAULT 0, " +
+                ClockContract.AlarmsColumns.DISMISS_TIME + " LONG NOT NULL DEFAULT " +
+                        Alarm.NO_DISMISS_TIME + ", " +
+                ClockContract.AlarmsColumns.DISMISS_TYPE + " INTEGER NOT NULL DEFAULT " +
+                    Alarm.NO_RECORDED_DISMISS + ", " + ");");
         LogUtils.i("Alarms Table created");
     }
 
@@ -110,7 +119,7 @@
     private Context mContext;
 
     public ClockDatabaseHelper(Context context) {
-        super(context, DATABASE_NAME, null, VERSION_7);
+        super(context, DATABASE_NAME, null, VERSION_8);
         mContext = context;
     }
 
@@ -131,7 +140,9 @@
                 ClockContract.AlarmsColumns.VIBRATE + cs +
                 ClockContract.AlarmsColumns.LABEL + cs +
                 ClockContract.AlarmsColumns.RINGTONE + cs +
-                ClockContract.AlarmsColumns.DELETE_AFTER_USE + ") VALUES ";
+                ClockContract.AlarmsColumns.DELETE_AFTER_USE + cs +
+                ClockContract.AlarmsColumns.DISMISS_TIME + cs +
+                ClockContract.AlarmsColumns.DISMISS_TYPE + ") VALUES ";
         db.execSQL(insertMe + DEFAULT_ALARM_1);
         db.execSQL(insertMe + DEFAULT_ALARM_2);
     }
@@ -142,61 +153,85 @@
                 + oldVersion + " to " + currentVersion);
 
         if (oldVersion <= VERSION_6) {
-            // These were not used in DB_VERSION_6, so we can just drop them.
-            db.execSQL("DROP TABLE IF EXISTS " + INSTANCES_TABLE_NAME + ";");
-            db.execSQL("DROP TABLE IF EXISTS " + CITIES_TABLE_NAME + ";");
-
-            // Create new alarms table and copy over the data
-            createAlarmsTable(db);
-            createInstanceTable(db);
-            createCitiesTable(db);
-
-            LogUtils.i("Copying old alarms to new table");
-            String[] OLD_TABLE_COLUMNS = {
-                    "_id",
-                    "hour",
-                    "minutes",
-                    "daysofweek",
-                    "enabled",
-                    "vibrate",
-                    "message",
-                    "alert",
-            };
-            Cursor cursor = db.query(OLD_ALARMS_TABLE_NAME, OLD_TABLE_COLUMNS,
-                    null, null, null, null, null);
-            Calendar currentTime = Calendar.getInstance();
-            while (cursor.moveToNext()) {
-                Alarm alarm = new Alarm();
-                alarm.id = cursor.getLong(0);
-                alarm.hour = cursor.getInt(1);
-                alarm.minutes = cursor.getInt(2);
-                alarm.daysOfWeek = new DaysOfWeek(cursor.getInt(3));
-                alarm.enabled = cursor.getInt(4) == 1;
-                alarm.vibrate = cursor.getInt(5) == 1;
-                alarm.label = cursor.getString(6);
-
-                String alertString = cursor.getString(7);
-                if ("silent".equals(alertString)) {
-                    alarm.alert = Alarm.NO_RINGTONE_URI;
-                } else {
-                    alarm.alert = TextUtils.isEmpty(alertString) ? null : Uri.parse(alertString);
-                }
-
-                // Save new version of alarm and create alarminstance for it
-                db.insert(ALARMS_TABLE_NAME, null, Alarm.createContentValues(alarm));
-                if (alarm.enabled) {
-                    AlarmInstance newInstance = alarm.createInstanceAfter(currentTime);
-                    db.insert(INSTANCES_TABLE_NAME, null,
-                            AlarmInstance.createContentValues(newInstance));
-                }
-            }
-            cursor.close();
-
-            LogUtils.i("Dropping old alarm table");
-            db.execSQL("DROP TABLE IF EXISTS " + OLD_ALARMS_TABLE_NAME + ";");
+            upgradeFrom6OrOlder(db);
+        } else if (oldVersion == VERSION_7) {
+            upgradeFrom7(db);
         }
     }
 
+    /**
+     * Upgrade from version 6 or older to version 8
+     * @param db
+     */
+    void upgradeFrom6OrOlder(SQLiteDatabase db) {
+        // These were not used in DB_VERSION_6, so we can just drop them.
+        db.execSQL("DROP TABLE IF EXISTS " + INSTANCES_TABLE_NAME + ";");
+        db.execSQL("DROP TABLE IF EXISTS " + CITIES_TABLE_NAME + ";");
+
+        // Create new alarms table and copy over the data
+        createAlarmsTable(db);
+        createInstanceTable(db);
+        createCitiesTable(db);
+
+        LogUtils.i("Copying old alarms to new table");
+        String[] OLD_TABLE_COLUMNS = {
+                "_id",
+                "hour",
+                "minutes",
+                "daysofweek",
+                "enabled",
+                "vibrate",
+                "message",
+                "alert",
+        };
+        Cursor cursor = db.query(OLD_ALARMS_TABLE_NAME, OLD_TABLE_COLUMNS,
+                null, null, null, null, null);
+        Calendar currentTime = Calendar.getInstance();
+        while (cursor.moveToNext()) {
+            Alarm alarm = new Alarm();
+            alarm.id = cursor.getLong(0);
+            alarm.hour = cursor.getInt(1);
+            alarm.minutes = cursor.getInt(2);
+            alarm.daysOfWeek = new DaysOfWeek(cursor.getInt(3));
+            alarm.enabled = cursor.getInt(4) == 1;
+            alarm.vibrate = cursor.getInt(5) == 1;
+            alarm.label = cursor.getString(6);
+            alarm.dismissTime = Alarm.NO_DISMISS_TIME;
+            alarm.dismissType = Alarm.NO_RECORDED_DISMISS;
+
+            String alertString = cursor.getString(7);
+            if ("silent".equals(alertString)) {
+                alarm.alert = Alarm.NO_RINGTONE_URI;
+            } else {
+                alarm.alert = TextUtils.isEmpty(alertString) ? null : Uri.parse(alertString);
+            }
+
+            // Save new version of alarm and create alarminstance for it
+            db.insert(ALARMS_TABLE_NAME, null, Alarm.createContentValues(alarm));
+            if (alarm.enabled) {
+                AlarmInstance newInstance = alarm.createInstanceAfter(currentTime);
+                db.insert(INSTANCES_TABLE_NAME, null,
+                        AlarmInstance.createContentValues(newInstance));
+            }
+        }
+        cursor.close();
+
+        LogUtils.i("Dropping old alarm table");
+        db.execSQL("DROP TABLE IF EXISTS " + OLD_ALARMS_TABLE_NAME + ";");
+    }
+
+    /**
+     * Upgrade from version 7 to version 8
+     * @param db
+     */
+    void upgradeFrom7(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + ALARMS_TABLE_NAME + " ADD COLUMN "
+                + Alarm.DISMISS_TIME + " LONG NOT NULL DEFAULT " + Alarm.NO_DISMISS_TIME);
+        db.execSQL("ALTER TABLE " + ALARMS_TABLE_NAME + " ADD COLUMN "
+                + Alarm.DISMISS_TYPE + " INTEGER NOT NULL DEFAULT " + Alarm.NO_RECORDED_DISMISS);
+    }
+
+
     long fixAlarmInsert(ContentValues values) {
         // Why are we doing this? Is this not a programming bug if we try to
         // insert an already used id?

diff --git a/src/com/android/deskclock/stopwatch/StopwatchFragment.java b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
index e40a6cb..6eef8ce 100644
--- a/src/com/android/deskclock/stopwatch/StopwatchFragment.java
+++ b/src/com/android/deskclock/stopwatch/StopwatchFragment.java

@@ -46,6 +46,7 @@
 import com.android.deskclock.Utils;
 import com.android.deskclock.events.Events;
 import com.android.deskclock.timer.CountingTimerView;
+import com.android.deskclock.voice.HandleVoiceApiCalls;
 
 import java.util.ArrayList;
 
@@ -288,7 +289,7 @@
                 doStop();
                 Events.sendStopwatchEvent(R.string.action_stop, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.STOP_STOPWATCH);
+                intent.setAction(HandleVoiceApiCalls.VOICE_ACTION_STOP_STOPWATCH);
                 context.startService(intent);
                 releaseWakeLock();
                 break;
@@ -298,7 +299,7 @@
                 doStart(time);
                 Events.sendStopwatchEvent(R.string.action_start, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.START_STOPWATCH);
+                intent.setAction(HandleVoiceApiCalls.VOICE_ACTION_START_STOPWATCH);
                 context.startService(intent);
                 acquireWakeLock();
                 break;
@@ -724,9 +725,7 @@
             if (mTime != null) {
                 mTimeText.setTime(totalTime, true, true);
             }
-            if (mLapsAdapter.getCount() > 0) {
-                updateCurrentLap(totalTime);
-            }
+            updateCurrentLap(totalTime);
             mTime.postDelayed(mTimeUpdateThread, mAccessibilityManager != null &&
                     mAccessibilityManager.isTouchExplorationEnabled()
                     ? STOPWATCH_ACCESSIBILTY_REFRESH_INTERVAL_MILLIS
@@ -847,7 +846,7 @@
                 doLap();
                 Events.sendStopwatchEvent(R.string.action_lap, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.LAP_STOPWATCH);
+                intent.setAction(HandleVoiceApiCalls.VOICE_ACTION_LAP_STOPWATCH);
                 context.startService(intent);
                 break;
             case Stopwatches.STOPWATCH_STOPPED:
@@ -855,7 +854,7 @@
                 doReset();
                 Events.sendStopwatchEvent(R.string.action_reset, R.string.label_deskclock);
 
-                intent.setAction(Stopwatches.RESET_STOPWATCH);
+                intent.setAction(HandleVoiceApiCalls.VOICE_ACTION_RESET_STOPWATCH);
                 context.startService(intent);
                 releaseWakeLock();
                 break;

diff --git a/src/com/android/deskclock/stopwatch/StopwatchService.java b/src/com/android/deskclock/stopwatch/StopwatchService.java
index 8fbb507..815dc29 100644
--- a/src/com/android/deskclock/stopwatch/StopwatchService.java
+++ b/src/com/android/deskclock/stopwatch/StopwatchService.java

@@ -17,6 +17,7 @@
 import com.android.deskclock.DeskClock;
 import com.android.deskclock.R;
 import com.android.deskclock.Utils;
+import com.android.deskclock.voice.HandleVoiceApiCalls;
 
 /**
  * TODO: Insert description here. (generated by sblitz)
@@ -63,61 +64,79 @@
         long actionTime = intent.getLongExtra(Stopwatches.MESSAGE_TIME, Utils.getTimeNow());
         boolean showNotif = intent.getBooleanExtra(Stopwatches.SHOW_NOTIF, true);
         boolean updateCircle = showNotif; // Don't save updates to the cirle if we're in the app.
-        if (actionType.equals(Stopwatches.START_STOPWATCH)) {
-            mStartTime = actionTime;
-            writeSharedPrefsStarted(mStartTime, updateCircle);
-            if (showNotif) {
-                setNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            } else {
-                saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            }
-        } else if (actionType.equals(Stopwatches.LAP_STOPWATCH)) {
-            mNumLaps++;
-            long lapTimeElapsed = actionTime - mStartTime + mElapsedTime;
-            writeSharedPrefsLap(lapTimeElapsed, updateCircle);
-            if (showNotif) {
-                setNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            } else {
-                saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
-            }
-        } else if (actionType.equals(Stopwatches.STOP_STOPWATCH)) {
-            mElapsedTime = mElapsedTime + (actionTime - mStartTime);
-            writeSharedPrefsStopped(mElapsedTime, updateCircle);
-            if (showNotif) {
-                setNotification(actionTime - mElapsedTime, false, mNumLaps);
-            } else {
-                saveNotification(mElapsedTime, false, mNumLaps);
-            }
-        } else if (actionType.equals(Stopwatches.RESET_STOPWATCH)) {
-            mLoadApp = false;
-            writeSharedPrefsReset(updateCircle);
-            clearSavedNotification();
-            stopSelf();
-        } else if (actionType.equals(Stopwatches.RESET_AND_LAUNCH_STOPWATCH)) {
-            mLoadApp = true;
-            writeSharedPrefsReset(updateCircle);
-            clearSavedNotification();
-            closeNotificationShade();
-            stopSelf();
-        } else if (actionType.equals(Stopwatches.SHARE_STOPWATCH)) {
-            closeNotificationShade();
-            Intent shareIntent = new Intent(android.content.Intent.ACTION_SEND);
-            shareIntent.setType("text/plain");
-            shareIntent.putExtra(
-                    Intent.EXTRA_SUBJECT, Stopwatches.getShareTitle(getApplicationContext()));
-            shareIntent.putExtra(Intent.EXTRA_TEXT, Stopwatches.buildShareResults(
-                    getApplicationContext(), mElapsedTime, readLapsFromPrefs()));
-            Intent chooserIntent = Intent.createChooser(shareIntent, null);
-            chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            getApplication().startActivity(chooserIntent);
-        } else if (actionType.equals(Stopwatches.SHOW_NOTIF)) {
-            // SHOW_NOTIF sent from the DeskClock.onPause
-            // If a notification is not displayed, this service's work is over
-            if (!showSavedNotification()) {
+        switch(actionType) {
+            case HandleVoiceApiCalls.VOICE_ACTION_START_STOPWATCH:
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this) ;
+                prefs.edit().putBoolean(Stopwatches.NOTIF_CLOCK_RUNNING, true).apply();
+
+                mStartTime = actionTime;
+                writeSharedPrefsStarted(mStartTime, updateCircle);
+                if (showNotif) {
+                    setNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                } else {
+                    saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                }
+                break;
+            case HandleVoiceApiCalls.VOICE_ACTION_LAP_STOPWATCH:
+                mNumLaps++;
+                long lapTimeElapsed = actionTime - mStartTime + mElapsedTime;
+                writeSharedPrefsLap(lapTimeElapsed, updateCircle);
+                if (showNotif) {
+                    setNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                } else {
+                    saveNotification(mStartTime - mElapsedTime, true, mNumLaps);
+                }
+                break;
+            case HandleVoiceApiCalls.VOICE_ACTION_STOP_STOPWATCH:
+                prefs = PreferenceManager.getDefaultSharedPreferences(this);
+                prefs.edit().putBoolean(Stopwatches.NOTIF_CLOCK_RUNNING, false).apply();
+
+                mElapsedTime = mElapsedTime + (actionTime - mStartTime);
+                writeSharedPrefsStopped(mElapsedTime, updateCircle);
+                if (showNotif) {
+                    setNotification(actionTime - mElapsedTime, false, mNumLaps);
+                } else {
+                    saveNotification(mElapsedTime, false, mNumLaps);
+                }
+                break;
+            case HandleVoiceApiCalls.VOICE_ACTION_RESET_STOPWATCH:
+                mLoadApp = false;
+                writeSharedPrefsReset(updateCircle);
+                clearSavedNotification();
                 stopSelf();
-            }
-        } else if (actionType.equals(Stopwatches.KILL_NOTIF)) {
-            mNotificationManager.cancel(NOTIFICATION_ID);
+                break;
+            case Stopwatches.RESET_AND_LAUNCH_STOPWATCH:
+                mLoadApp = true;
+                writeSharedPrefsReset(updateCircle);
+                clearSavedNotification();
+                closeNotificationShade();
+                stopSelf();
+                break;
+            case Stopwatches.SHARE_STOPWATCH:
+                if  (mElapsedTime > 0) {
+                    closeNotificationShade();
+                    Intent shareIntent = new Intent(android.content.Intent.ACTION_SEND);
+                    shareIntent.setType("text/plain");
+                    shareIntent.putExtra(Intent.EXTRA_SUBJECT, Stopwatches.getShareTitle(
+                            getApplicationContext()));
+                    shareIntent.putExtra(Intent.EXTRA_TEXT, Stopwatches.buildShareResults(
+                            getApplicationContext(), mElapsedTime, readLapsFromPrefs()));
+                    Intent chooserIntent = Intent.createChooser(shareIntent, null);
+                    chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    getApplication().startActivity(chooserIntent);
+                }
+                break;
+            case Stopwatches.SHOW_NOTIF:
+                // SHOW_NOTIF sent from the DeskClock.onPause
+                // If a notification is not displayed, this service's work is over
+                if (!showSavedNotification()) {
+                    stopSelf();
+                }
+                break;
+            case Stopwatches.KILL_NOTIF:
+                mNotificationManager.cancel(NOTIFICATION_ID);
+                break;
+
         }
 
         // We want this service to continue running until it is explicitly
@@ -174,7 +193,7 @@
             remoteViewsExpanded.setTextViewText(
                     R.id.swn_left_button, getResources().getText(R.string.sw_lap_button));
             Intent leftButtonIntent = new Intent(context, StopwatchService.class);
-            leftButtonIntent.setAction(Stopwatches.LAP_STOPWATCH);
+            leftButtonIntent.setAction(HandleVoiceApiCalls.VOICE_ACTION_LAP_STOPWATCH);
             remoteViewsExpanded.setOnClickPendingIntent(R.id.swn_left_button,
                     PendingIntent.getService(context, 0, leftButtonIntent, 0));
             remoteViewsExpanded.
@@ -185,7 +204,7 @@
             remoteViewsExpanded.setTextViewText(
                     R.id.swn_right_button, getResources().getText(R.string.sw_stop_button));
             Intent rightButtonIntent = new Intent(context, StopwatchService.class);
-            rightButtonIntent.setAction(Stopwatches.STOP_STOPWATCH);
+            rightButtonIntent.setAction(HandleVoiceApiCalls.VOICE_ACTION_STOP_STOPWATCH);
             remoteViewsExpanded.setOnClickPendingIntent(R.id.swn_right_button,
                     PendingIntent.getService(context, 0, rightButtonIntent, 0));
             remoteViewsExpanded.
@@ -220,7 +239,7 @@
             remoteViewsExpanded.setTextViewText(
                     R.id.swn_right_button, getResources().getText(R.string.sw_start_button));
             Intent rightButtonIntent = new Intent(context, StopwatchService.class);
-            rightButtonIntent.setAction(Stopwatches.START_STOPWATCH);
+            rightButtonIntent.setAction(HandleVoiceApiCalls.VOICE_ACTION_START_STOPWATCH);
             remoteViewsExpanded.setOnClickPendingIntent(R.id.swn_right_button,
                     PendingIntent.getService(context, 0, rightButtonIntent, 0));
             remoteViewsExpanded.
@@ -237,7 +256,7 @@
         }
 
         Intent dismissIntent = new Intent(context, StopwatchService.class);
-        dismissIntent.setAction(Stopwatches.RESET_STOPWATCH);
+        dismissIntent.setAction(HandleVoiceApiCalls.VOICE_ACTION_RESET_STOPWATCH);
 
         Notification notification = new NotificationCompat.Builder(context)
                 .setAutoCancel(!clockRunning)

diff --git a/src/com/android/deskclock/stopwatch/Stopwatches.java b/src/com/android/deskclock/stopwatch/Stopwatches.java
index a84bb8e..68b2c69 100644
--- a/src/com/android/deskclock/stopwatch/Stopwatches.java
+++ b/src/com/android/deskclock/stopwatch/Stopwatches.java

@@ -28,10 +28,6 @@
  */
 public class Stopwatches {
     // Actions processed by stopwatch receiver
-    public static final String START_STOPWATCH = "start_stopwatch";
-    public static final String LAP_STOPWATCH = "lap_stopwatch";
-    public static final String STOP_STOPWATCH = "stop_stopwatch";
-    public static final String RESET_STOPWATCH = "reset_stopwatch";
     public static final String SHARE_STOPWATCH = "share_stopwatch";
     public static final String RESET_AND_LAUNCH_STOPWATCH = "reset_and_launch_stopwatch";
     public static final String MESSAGE_TIME = "message_time";

diff --git a/src/com/android/deskclock/timer/CountingTimerView.java b/src/com/android/deskclock/timer/CountingTimerView.java
index adcbc84..974cb21 100644
--- a/src/com/android/deskclock/timer/CountingTimerView.java
+++ b/src/com/android/deskclock/timer/CountingTimerView.java

@@ -26,7 +26,6 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.accessibility.AccessibilityManager;
-import android.widget.TextView;
 
 import com.android.deskclock.LogUtils;
 import com.android.deskclock.R;
@@ -406,7 +405,7 @@
         if (update) {
             setContentDescription(getTimeStringForAccessibility((int) hours, (int) minutes,
                     (int) seconds, showNeg, getResources()));
-            invalidate();
+            postInvalidateOnAnimation();
         }
     }
 

diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java
index bc7259e..36a07bd 100644
--- a/src/com/android/deskclock/timer/TimerFragment.java
+++ b/src/com/android/deskclock/timer/TimerFragment.java

@@ -30,6 +30,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.provider.AlarmClock;
 import android.support.v4.view.ViewPager;
 import android.text.format.DateUtils;
 import android.transition.AutoTransition;
@@ -446,7 +447,7 @@
                     timerObj.setState(TimerObj.STATE_RUNNING);
                     Events.sendTimerEvent(R.string.action_create, R.string.label_deskclock);
 
-                    updateTimerState(timerObj, Timers.START_TIMER);
+                    updateTimerState(timerObj, AlarmClock.ACTION_SET_TIMER);
                     Events.sendTimerEvent(R.string.action_start, R.string.label_deskclock);
 
                     // Go to the newly created timer view
@@ -472,7 +473,7 @@
                     t.setState(TimerObj.STATE_STOPPED);
                     t.mView.pause();
                     t.updateTimeLeft(true);
-                    updateTimerState(t, Timers.TIMER_STOP);
+                    updateTimerState(t, Timers.STOP_TIMER);
                     Events.sendTimerEvent(R.string.action_stop, R.string.label_deskclock);
                     break;
                 case TimerObj.STATE_STOPPED:
@@ -481,7 +482,7 @@
                     t.setState(TimerObj.STATE_RUNNING);
                     t.mStartTime = Utils.getTimeNow() - (t.mOriginalLength - t.mTimeLeft);
                     t.mView.start();
-                    updateTimerState(t, Timers.START_TIMER);
+                    updateTimerState(t, AlarmClock.ACTION_SET_TIMER);
                     Events.sendTimerEvent(R.string.action_start, R.string.label_deskclock);
                     break;
                 case TimerObj.STATE_TIMESUP:
@@ -500,7 +501,7 @@
                         t.mView.stop();
                         t.mView.setTime(t.mTimeLeft, false);
                         t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
-                        updateTimerState(t, Timers.TIMER_RESET);
+                        updateTimerState(t, Timers.RESET_TIMER);
                         cancelTimerNotification(t.mTimerId);
                         Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
                     }
@@ -721,7 +722,7 @@
                 t.mView.stop();
                 t.mView.setTime(t.mTimeLeft, false);
                 t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
-                updateTimerState(t, Timers.TIMER_RESET);
+                updateTimerState(t, Timers.RESET_TIMER);
 
                 Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
                 break;
@@ -733,10 +734,10 @@
                 t.mView.setTime(t.mTimeLeft, false);
                 t.mView.set(t.mOriginalLength, t.mTimeLeft, true);
                 t.mView.start();
-                updateTimerState(t, Timers.TIMER_RESET);
+                updateTimerState(t, Timers.RESET_TIMER);
                 Events.sendTimerEvent(R.string.action_add_minute, R.string.label_deskclock);
 
-                updateTimerState(t, Timers.START_TIMER);
+                updateTimerState(t, AlarmClock.ACTION_SET_TIMER);
                 cancelTimerNotification(t.mTimerId);
                 break;
         }

diff --git a/src/com/android/deskclock/timer/TimerFullScreenFragment.java b/src/com/android/deskclock/timer/TimerFullScreenFragment.java
index 8e85d83..a24f5e4 100644
--- a/src/com/android/deskclock/timer/TimerFullScreenFragment.java
+++ b/src/com/android/deskclock/timer/TimerFullScreenFragment.java

@@ -33,6 +33,7 @@
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.provider.AlarmClock;
 import android.support.v4.view.animation.PathInterpolatorCompat;
 import android.text.format.DateUtils;
 import android.util.Log;
@@ -652,7 +653,7 @@
             t.mView.setTime(t.mTimeLeft, false);
             t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
         }
-        updateTimersState(t, Timers.TIMER_RESET);
+        updateTimersState(t, Timers.RESET_TIMER);
         Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
     }
 
@@ -756,7 +757,7 @@
                 // It will stop all activity related to the
                 // timer
                 t.setState(TimerObj.STATE_DELETED);
-                updateTimersState(t, Timers.DELETE_TIMER);
+                updateTimersState(t, AlarmClock.ACTION_SET_TIMER);
 
                 Events.sendTimerEvent(R.string.action_delete, R.string.label_deskclock);
                 break;
@@ -788,10 +789,10 @@
                 t.setState(TimerObj.STATE_RUNNING);
                 t.mStartTime = Utils.getTimeNow();
                 t.mTimeLeft = t.mOriginalLength = TimerObj.MINUTE_IN_MILLIS;
-                updateTimersState(t, Timers.TIMER_RESET);
+                updateTimersState(t, Timers.RESET_TIMER);
                 Events.sendTimerEvent(R.string.action_add_minute, R.string.label_deskclock);
 
-                updateTimersState(t, Timers.START_TIMER);
+                updateTimersState(t, AlarmClock.ACTION_SET_TIMER);
                 Events.sendTimerEvent(R.string.action_start, R.string.label_deskclock);
 
                 updateTimesUpMode(t);
@@ -803,7 +804,7 @@
                 t.mView.stop();
                 t.mView.setTime(t.mTimeLeft, false);
                 t.mView.set(t.mOriginalLength, t.mTimeLeft, false);
-                updateTimersState(t, Timers.TIMER_RESET);
+                updateTimersState(t, Timers.RESET_TIMER);
 
                 Events.sendTimerEvent(R.string.action_reset, R.string.label_deskclock);
                 break;
@@ -819,7 +820,7 @@
                 t.setState(TimerObj.STATE_STOPPED);
                 t.mView.pause();
                 t.updateTimeLeft(true);
-                updateTimersState(t, Timers.TIMER_STOP);
+                updateTimersState(t, Timers.STOP_TIMER);
 
                 Events.sendTimerEvent(R.string.action_stop, R.string.label_deskclock);
                 break;
@@ -828,7 +829,7 @@
                 t.setState(TimerObj.STATE_RUNNING);
                 t.mStartTime = Utils.getTimeNow() - (t.mOriginalLength - t.mTimeLeft);
                 t.mView.start();
-                updateTimersState(t, Timers.START_TIMER);
+                updateTimersState(t, AlarmClock.ACTION_SET_TIMER);
 
                 Events.sendTimerEvent(R.string.action_start, R.string.label_deskclock);
                 break;
@@ -849,7 +850,7 @@
                 t.setState(TimerObj.STATE_RUNNING);
                 t.mStartTime = Utils.getTimeNow() - (t.mOriginalLength - t.mTimeLeft);
                 t.mView.start();
-                updateTimersState(t, Timers.START_TIMER);
+                updateTimersState(t, AlarmClock.ACTION_SET_TIMER);
                 Events.sendTimerEvent(R.string.action_start, R.string.label_deskclock);
                 break;
             default:
@@ -955,7 +956,7 @@
             TimerObj t = new TimerObj(timerLength * DateUtils.SECOND_IN_MILLIS, getActivity());
             t.setState(TimerObj.STATE_RUNNING);
             mAdapter.addTimer(t);
-            updateTimersState(t, Timers.START_TIMER);
+            updateTimersState(t, AlarmClock.ACTION_SET_TIMER);
             Events.sendTimerEvent(R.string.action_start, R.string.label_deskclock);
             gotoTimersView();
             mTimerSetup.reset(); // Make sure the setup is cleared for next time

diff --git a/src/com/android/deskclock/timer/TimerReceiver.java b/src/com/android/deskclock/timer/TimerReceiver.java
index 4c6baab..58c78a9 100644
--- a/src/com/android/deskclock/timer/TimerReceiver.java
+++ b/src/com/android/deskclock/timer/TimerReceiver.java

@@ -122,7 +122,7 @@
             timersAlert.setFlags(
                     Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
             context.startActivity(timersAlert);
-        } else if (Timers.TIMER_RESET.equals(actionType)
+        } else if (Timers.RESET_TIMER.equals(actionType)
                 || Timers.DELETE_TIMER.equals(actionType)
                 || Timers.TIMER_DONE.equals(actionType)) {
             // Stop Ringtone if all timers are not in times-up status
@@ -410,7 +410,7 @@
         }
     }
 
-    private void cancelInUseNotification(final Context context) {
+    public static void cancelInUseNotification(final Context context) {
         NotificationManagerCompat.from(context).cancel(IN_USE_NOTIFICATION_ID);
     }
 

diff --git a/src/com/android/deskclock/timer/Timers.java b/src/com/android/deskclock/timer/Timers.java
index 989eea4..763afd5 100644
--- a/src/com/android/deskclock/timer/Timers.java
+++ b/src/com/android/deskclock/timer/Timers.java

@@ -25,10 +25,10 @@
 
     // Private actions processed by the receiver
     public static final String START_TIMER = "start_timer";
+    public static final String STOP_TIMER = "stop_timer";
     public static final String DELETE_TIMER = "delete_timer";
+    public static final String RESET_TIMER = "reset_timer";
     public static final String TIMES_UP = "times_up";
-    public static final String TIMER_RESET = "timer_reset";
-    public static final String TIMER_STOP = "timer_stop";
     public static final String TIMER_DONE = "timer_done";
     public static final String TIMER_UPDATE = "timer_update";
 

diff --git a/src/com/android/deskclock/voice/HandleVoiceApiCalls.java b/src/com/android/deskclock/voice/HandleVoiceApiCalls.java
new file mode 100644
index 0000000..9656ef8
--- /dev/null
+++ b/src/com/android/deskclock/voice/HandleVoiceApiCalls.java

@@ -0,0 +1,563 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.deskclock.voice;
+
+import android.app.Activity;
+import android.app.VoiceInteractor;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.provider.AlarmClock;
+import android.text.format.DateUtils;
+
+import com.android.deskclock.DeskClock;
+import com.android.deskclock.LogUtils;
+import com.android.deskclock.R;
+import com.android.deskclock.Utils;
+import com.android.deskclock.alarms.AlarmStateManager;
+import com.android.deskclock.events.Events;
+import com.android.deskclock.provider.Alarm;
+import com.android.deskclock.provider.AlarmInstance;
+import com.android.deskclock.stopwatch.StopwatchService;
+import com.android.deskclock.stopwatch.Stopwatches;
+import com.android.deskclock.timer.TimerFullScreenFragment;
+import com.android.deskclock.timer.TimerObj;
+import com.android.deskclock.timer.Timers;
+import com.android.deskclock.worldclock.Cities;
+import com.android.deskclock.worldclock.CitiesActivity;
+import com.android.deskclock.worldclock.CityObj;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class HandleVoiceApiCalls extends Activity {
+    private static final String ACTION_PREFIX = "com.android.deskclock.action.";
+
+    // shows the tab with world clocks
+    public static final String VOICE_ACTION_SHOW_CLOCK = ACTION_PREFIX + "VOICE_SHOW_CLOCK";
+    // add a clock of a selected city, if no city is specified opens the city selection screen
+    public static final String VOICE_ACTION_ADD_CLOCK = ACTION_PREFIX + "VOICE_ADD_CLOCK";
+    // TODO: change default behavior from deleting a random city. Only delete if EXTRA_CITY
+    // is specified.
+    // delete a clock of a selected city, if no city is specified deletes one of the selected cities
+    public static final String VOICE_ACTION_DELETE_CLOCK = ACTION_PREFIX + "VOICE_DELETE_CLOCK";
+    // extra for VOICE_ACTION_ADD_CLOCK and VOICE_ACTION_DELETE_CLOCK
+    public static final String EXTRA_CITY = "com.android.deskclock.extra.clock.CITY";
+
+    // dismiss upcoming alarm (if it's last added)
+    public static final String VOICE_ACTION_DISMISS_UPCOMING_ALARM = ACTION_PREFIX
+            + "VOICE_DISMISS_UPCOMING_ALARM";
+
+    // shows the tab with the stopwatch
+    public static final String VOICE_ACTION_SHOW_STOPWATCH = ACTION_PREFIX + "VOICE_SHOW_STOPWATCH";
+    // starts the current stopwatch
+    public static final String VOICE_ACTION_START_STOPWATCH = ACTION_PREFIX
+            + "VOICE_START_STOPWATCH";
+    // stops the current stopwatch
+    public static final String VOICE_ACTION_STOP_STOPWATCH = ACTION_PREFIX + "VOICE_STOP_STOPWATCH";
+    // laps the stopwatch that's currently running
+    public static final String VOICE_ACTION_LAP_STOPWATCH = ACTION_PREFIX + "VOICE_LAP_STOPWATCH";
+    // resets the stopwatch if it's stopped
+    public static final String VOICE_ACTION_RESET_STOPWATCH = ACTION_PREFIX
+            + "VOICE_RESET_STOPWATCH";
+
+    // shows the tab with timers
+    public static final String VOICE_ACTION_SHOW_TIMERS = ACTION_PREFIX + "VOICE_SHOW_TIMERS";
+    // deletes the topmost timer
+    public static final String VOICE_ACTION_DELETE_TIMER = ACTION_PREFIX + "VOICE_DELETE_TIMER";
+    // stops the running timer
+    public static final String VOICE_ACTION_STOP_TIMER = ACTION_PREFIX + "VOICE_STOP_TIMER";
+    // starts the topmost timer
+    public static final String VOICE_ACTION_START_TIMER = ACTION_PREFIX + "VOICE_START_TIMER";
+    // resets the timer, works for both running and stopped
+    public static final String VOICE_ACTION_RESET_TIMER = ACTION_PREFIX + "VOICE_RESET_TIMER";
+
+    @Override
+    protected void onCreate(Bundle icicle) {
+        try {
+            super.onCreate(icicle);
+
+            final Intent intent = getIntent();
+            if (intent == null) {
+                return;
+            }
+
+            final String action = intent.getAction();
+            switch (action) {
+                case VOICE_ACTION_START_STOPWATCH:
+                case VOICE_ACTION_STOP_STOPWATCH:
+                case VOICE_ACTION_LAP_STOPWATCH:
+                case VOICE_ACTION_SHOW_STOPWATCH:
+                case VOICE_ACTION_RESET_STOPWATCH:
+                    handleStopwatchIntent(action);
+                    break;
+                case AlarmClock.ACTION_VOICE_CANCEL_ALARM:
+                case AlarmClock.ACTION_VOICE_DELETE_ALARM:
+                case VOICE_ACTION_DISMISS_UPCOMING_ALARM:
+                    handleAlarmIntent(action);
+                    break;
+                case VOICE_ACTION_SHOW_TIMERS:
+                case VOICE_ACTION_DELETE_TIMER:
+                case VOICE_ACTION_RESET_TIMER:
+                case VOICE_ACTION_STOP_TIMER:
+                case VOICE_ACTION_START_TIMER:
+                    handleTimerIntent(action);
+                    break;
+                case VOICE_ACTION_SHOW_CLOCK:
+                case VOICE_ACTION_ADD_CLOCK:
+                case VOICE_ACTION_DELETE_CLOCK:
+                    handleClockIntent(action);
+                    break;
+            }
+        } finally {
+            finish();
+        }
+    }
+
+    private void handleAlarmIntent(final String action) {
+        // Opens the UI for Alarms
+        final Intent alarmIntent = Alarm.createIntent(this, DeskClock.class, Alarm.INVALID_ID)
+                .setAction(action)
+                .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.ALARM_TAB_INDEX);
+        startActivity(alarmIntent);
+
+        // choose the most recently created  alarm if there is no other way to find out
+        // which alarm the user means
+        final Context context = this;
+        final Intent intent = getIntent();
+
+        switch (action) {
+            case AlarmClock.ACTION_VOICE_CANCEL_ALARM:
+            case AlarmClock.ACTION_VOICE_DELETE_ALARM:
+                new AsyncTask<Void, Void, List<Alarm>>() {
+                    @Override
+                    protected List<Alarm> doInBackground(Void... parameters) {
+                        // Check if the alarm already exists and handle it
+                        final List<Alarm> alarms = Alarm.getAlarms(getContentResolver(), null);
+                        if (alarms.isEmpty()) {
+                            LogUtils.i("No alarms to cancel or delete.");
+                            return null;
+                        }
+                        final String searchMode =
+                                intent.getStringExtra(AlarmClock.EXTRA_ALARM_SEARCH_MODE);
+                        return processAlarmSearchMode(alarms, searchMode, action);
+                    }
+
+                    @Override
+                    protected void onPostExecute(List<Alarm> alarms) {
+                        if (alarms != null) {
+                            // TODO: if SEARCH_MODE is empty launch UI to pick an alarm
+                            // alarms are used by pickAlarm
+                        }
+                    }
+                }.execute();
+                break;
+            case VOICE_ACTION_DISMISS_UPCOMING_ALARM:
+                new AsyncTask<Void, Void, Void>() {
+                    @Override
+                    protected Void doInBackground(Void... parameters) {
+                        // checks if the next firing alarm is coming up in less than 2 hours
+                        final AlarmInstance nextAlarm =
+                                AlarmStateManager.getNextFiringAlarm(context);
+                        if (nextAlarm != null) {
+                            final Calendar nextAlarmTime = nextAlarm.getAlarmTime();
+                            if (isWithinTwoHours(nextAlarmTime)) {
+                                AlarmStateManager.setDismissState(context, nextAlarm);
+                                LogUtils.i("Dismiss " + nextAlarm.getAlarmTime());
+                                Events.sendAlarmEvent(R.string.action_dismiss,
+                                        R.string.label_voice);
+                            } else {
+                                LogUtils.i("Alarm " + nextAlarm.getAlarmTime().toString()
+                                        + " wasn't dismissed, still more than two hours away.");
+                            }
+                        } else {
+                            LogUtils.i("No upcoming alarms to dismiss");
+                        }
+                        return null;
+                    }
+                 }.execute();
+                break;
+        }
+    }
+
+    private List<Alarm> processAlarmSearchMode(List<Alarm> alarms, String searchMode,
+                String action) {
+        // returns alarms to be processed by pickAlarms that shows the UI to pick an alarm
+        if (searchMode == null) {
+            return alarms;
+        }
+
+        final Collection<Alarm> matchingAlarms = new ArrayList<>();
+        switch (searchMode) {
+            case AlarmClock.ALARM_SEARCH_MODE_TIME:
+                // at least one of these has to be specified in this search mode.
+                final int hour = getIntent().getIntExtra(AlarmClock.EXTRA_HOUR, -1);
+                // if minutes weren't specified default to 0
+                final int minutes = getIntent().getIntExtra(AlarmClock.EXTRA_MINUTES, 0);
+                final boolean isPm = getIntent().getBooleanExtra(AlarmClock.EXTRA_IS_PM, false);
+                final int hour24 = (isPm && hour < 12) ? (hour + 12) : hour;
+
+                if (hour24 < 0 || hour24 > 23 || minutes < 0 || minutes > 59) {
+                    final String pmam = isPm? "pm" : "am";
+                    notifyFailure("Invalid time specified: " + hour24 + ":" + minutes + " " + pmam);
+                    LogUtils.e("Invalid time specified: " + hour24 + ":" + minutes + " " + pmam);
+                    return null;
+                }
+                final List<Alarm> selectedAlarms = getAlarmsByHourMinutes(hour24, minutes);
+                if (selectedAlarms.isEmpty()) {
+                    LogUtils.i("No alarm at %d:%d.", hour24, minutes);
+                    return null;
+                } else if (selectedAlarms.size() == 1){
+                    matchingAlarms.add(selectedAlarms.get(0));
+                } else {
+                    // TODO: if there are multiple matching ones show the UI to pick alarms
+                }
+                break;
+            case AlarmClock.ALARM_SEARCH_MODE_NEXT:
+                // TODO: handle the case when there are multiple alarms firing at the same time
+                final AlarmInstance nextAlarm = AlarmStateManager.getNextFiringAlarm(this);
+                matchingAlarms.add(Alarm.getAlarm(getContentResolver(), nextAlarm.mAlarmId));
+                break;
+            case AlarmClock.ALARM_SEARCH_MODE_ALL:
+                matchingAlarms.addAll(alarms);
+                break;
+            default:
+                // TODO: if SEARCH_MODE is empty launch UI to pick an alarm
+                return null;
+        }
+
+        for (Alarm alarm : matchingAlarms) {
+            switch (action) {
+                case AlarmClock.ACTION_VOICE_CANCEL_ALARM:
+                    disableAlarm(alarm);
+                    break;
+                case AlarmClock.ACTION_VOICE_DELETE_ALARM:
+                    deleteAlarm(alarm);
+                    break;
+            }
+        }
+
+        return null;
+    }
+
+    private List<Alarm> getAlarmsByHourMinutes(int hour24, int minutes) {
+        final List<String> args = new ArrayList<>();
+        final String selection = String.format("%s=? AND %s=?", Alarm.HOUR, Alarm.MINUTES);
+        args.add(String.valueOf(hour24));
+        args.add(String.valueOf(minutes));
+
+        return Alarm.getAlarms(getContentResolver(), selection,
+                args.toArray(new String[args.size()]));
+    }
+
+    private boolean isWithinTwoHours(Calendar nextAlarmTime) {
+        final long nextAlarmTimeMillis =
+                nextAlarmTime.getTimeInMillis();
+        final long twoHours = AlarmInstance.LOW_NOTIFICATION_HOUR_OFFSET * -1 *
+                DateUtils.HOUR_IN_MILLIS;
+        return nextAlarmTimeMillis - System.currentTimeMillis() <= twoHours;
+    }
+
+    protected void notifySuccess(CharSequence prompt) {
+        if (getVoiceInteractor() != null) {
+            getVoiceInteractor().submitRequest(
+                    new VoiceInteractor.CompleteVoiceRequest(prompt, null));
+        }
+    }
+
+    /**
+     * Indicates when the setting could not be changed.
+     */
+    protected void notifyFailure(CharSequence reason) {
+        getVoiceInteractor().submitRequest(
+                new VoiceInteractor.AbortVoiceRequest(reason, null));
+    }
+
+    private void disableAlarm(Alarm alarm) {
+        final ContentResolver cr = getContentResolver();
+        alarm.enabled = false;
+        Alarm.updateAlarm(cr, alarm);
+        LogUtils.i("Cancel alarm %s", alarm);
+        notifySuccess("Alarm " + alarm + " is canceled.");
+        Events.sendAlarmEvent(R.string.action_disable, R.string.label_voice);
+    }
+
+    private void deleteAlarm(Alarm alarm) {
+        final ContentResolver cr = getContentResolver();
+        AlarmStateManager.deleteAllInstances(this, alarm.id);
+        Alarm.deleteAlarm(cr, alarm.id);
+        LogUtils.i("Delete alarm %s", alarm);
+        notifySuccess("Alarm " + alarm + " is deleted.");
+        Events.sendAlarmEvent(R.string.action_delete, R.string.label_voice);
+    }
+
+    private void handleStopwatchIntent(String action) {
+        // Opens the UI for stopwatch
+        final Intent stopwatchIntent = new Intent(this, DeskClock.class)
+                .setAction(action)
+                .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.STOPWATCH_TAB_INDEX);
+        startActivity(stopwatchIntent);
+        LogUtils.i("HandleVoiceApiCalls " + action);
+
+        // checking if the stopwatch is already running
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        final boolean stopwatchAlreadyRunning =
+                prefs.getBoolean(Stopwatches.NOTIF_CLOCK_RUNNING, false);
+
+        if (stopwatchAlreadyRunning) {
+            // don't fire START_STOPWATCH or RESET_STOPWATCH if a stopwatch is already running
+            if (VOICE_ACTION_START_STOPWATCH.equals(action) ||
+                    VOICE_ACTION_RESET_STOPWATCH.equals(action)) {
+                LogUtils.i("Can't fire " + action + " if stopwatch already running");
+                return;
+            }
+        } else {
+            // if a stopwatch isn't running, don't try to stop or lap it
+            if (VOICE_ACTION_STOP_STOPWATCH.equals(action) ||
+                VOICE_ACTION_LAP_STOPWATCH.equals(action)) {
+                notifyFailure("Can't fire " + action + " if stopwatch isn't running");
+                LogUtils.i("Can't fire " + action + " if stopwatch isn't running");
+                return;
+            }
+         }
+
+        // Events setup
+        switch (action) {
+            case VOICE_ACTION_START_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_start, R.string.label_voice);
+                break;
+            case VOICE_ACTION_STOP_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_stop, R.string.label_voice);
+                break;
+            case VOICE_ACTION_LAP_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_lap, R.string.label_voice);
+                break;
+            case VOICE_ACTION_SHOW_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_show, R.string.label_voice);
+                break;
+            case VOICE_ACTION_RESET_STOPWATCH:
+                Events.sendStopwatchEvent(R.string.action_reset, R.string.label_voice);
+                break;
+            default:
+                return;
+        }
+
+        final Intent intent = new Intent(this, StopwatchService.class).setAction(action);
+        startService(intent);
+        notifySuccess("Stopwatch mode was changed.");
+    }
+
+    private void handleTimerIntent(final String action) {
+        // Opens the UI for timers
+        final Intent timerIntent = new Intent(this, DeskClock.class)
+                .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX)
+                .putExtra(TimerFullScreenFragment.GOTO_SETUP_VIEW, false);
+        switch (action) {
+            case VOICE_ACTION_DELETE_TIMER:
+                timerIntent.setAction(Timers.DELETE_TIMER);
+                break;
+            case VOICE_ACTION_START_TIMER:
+                timerIntent.setAction(Timers.START_TIMER);
+                break;
+            case VOICE_ACTION_RESET_TIMER:
+                timerIntent.setAction(Timers.RESET_TIMER);
+                break;
+            case VOICE_ACTION_STOP_TIMER:
+                timerIntent.setAction(Timers.STOP_TIMER);
+                break;
+            case VOICE_ACTION_SHOW_TIMERS:
+                // no action necessary
+                break;
+            default:
+                return;
+        }
+        startActivity(timerIntent);
+        LogUtils.i("HandleVoiceApiCalls " + action);
+
+        if (VOICE_ACTION_SHOW_TIMERS.equals(action)) {
+            Events.sendTimerEvent(R.string.action_show, R.string.label_voice);
+            return;
+        }
+
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... parameters) {
+
+                final List<TimerObj> timers = new ArrayList<>();
+                final SharedPreferences prefs =
+                        PreferenceManager.getDefaultSharedPreferences(HandleVoiceApiCalls.this);
+                TimerObj.getTimersFromSharedPrefs(prefs, timers);
+                if (timers.isEmpty()) {
+                    return null;
+                }
+
+                // Delete the most recently created timer, the one that
+                // shows up first on the Timers tab
+                final TimerObj timer = timers.get(timers.size() - 1);
+
+                switch (action) {
+                    case VOICE_ACTION_DELETE_TIMER:
+                        timer.deleteFromSharedPref(prefs);
+                        Events.sendTimerEvent(R.string.action_delete, R.string.label_voice);
+                        break;
+                    case VOICE_ACTION_START_TIMER:
+                        // adjust mStartTime to reflect that starting time changed,
+                        // VOICE_ACTION_START_TIMER considers that a part of
+                        // the timer's length might have elapsed
+                        if (timer.mState == TimerObj.STATE_RUNNING) {
+                            return null;
+                        }
+                        timer.setState(TimerObj.STATE_RUNNING);
+                        timer.mStartTime = Utils.getTimeNow() -
+                                (timer.mSetupLength - timer.mTimeLeft);
+                        timer.writeToSharedPref(prefs);
+                        Events.sendTimerEvent(R.string.action_start, R.string.label_voice);
+                        break;
+                    case VOICE_ACTION_RESET_TIMER:
+                        // timer can be reset only if it's stopped
+                        if (timer.mState == TimerObj.STATE_STOPPED) {
+                            timer.mTimeLeft = timer.mOriginalLength;
+                            timer.writeToSharedPref(prefs);
+                            Events.sendTimerEvent(R.string.action_reset, R.string.label_voice);
+                        } else {
+                            LogUtils.i("Timer can't be reset because it isn't stopped");
+                            return null;
+                        }
+                        break;
+                    case VOICE_ACTION_STOP_TIMER:
+                        if (timer.mState == TimerObj.STATE_STOPPED) {
+                            return null;
+                        }
+                        timer.setState(TimerObj.STATE_STOPPED);
+                        timer.writeToSharedPref(prefs);
+                        Events.sendTimerEvent(R.string.action_stop, R.string.label_voice);
+                        break;
+                }
+                return null;
+            }
+        }.execute();
+        LogUtils.i("HandleTimerIntent", action);
+    }
+
+
+    private void handleClockIntent(final String action) {
+        // Opens the UI for clocks
+        final Intent handleClock = new Intent(this, DeskClock.class)
+                .setAction(action)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.CLOCK_TAB_INDEX);
+        startActivity(handleClock);
+
+        final Context context = this;
+
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... parameters) {
+                final String cityExtra = getIntent().getStringExtra(EXTRA_CITY);
+                final SharedPreferences prefs =
+                        PreferenceManager.getDefaultSharedPreferences(context);
+                switch (action) {
+                    case VOICE_ACTION_ADD_CLOCK:
+                        // if a city isn't specified open CitiesActivity to choose a city
+                        if (cityExtra == null) {
+                            startActivity( new Intent(context, CitiesActivity.class));
+                            Events.sendClockEvent(R.string.action_create, R.string.label_voice);
+                        } else {
+                            final String cityExtraFormatted = formatToTitleCase(cityExtra);
+                            // if a city is passed add that city to the list
+                            final HashMap<String, CityObj> cities =
+                                    Utils.loadCityMapFromXml(HandleVoiceApiCalls.this);
+                            // check if this city exists in the list of available cities
+                            if (!cities.containsKey(cityExtraFormatted)) {
+                                return null;
+                            }
+                            final HashMap<String, CityObj> selectedCities =
+                                    Cities.readCitiesFromSharedPrefs(prefs);
+                            final CityObj city = cities.get(cityExtraFormatted);
+                            // if this city is already added don't add it
+                            if (selectedCities.containsKey(city.mCityId)) {
+                                return null;
+                            }
+                            final CityObj selectedCity = cities.get(cityExtraFormatted);
+                            selectedCities.put(selectedCity.mCityId, selectedCity);
+                            Cities.saveCitiesToSharedPrefs(prefs, selectedCities);
+                            Events.sendClockEvent(R.string.action_start,
+                                    R.string.label_voice);
+                            return null;
+                        }
+
+                        break;
+                    case VOICE_ACTION_DELETE_CLOCK:
+                        final HashMap<String, CityObj> selectedCities =
+                                Cities.readCitiesFromSharedPrefs(prefs);
+                        final Collection<CityObj> col = selectedCities.values();
+                        // if there's no extra delete a city from the list
+                        if (cityExtra == null) {
+                            // TODO: change default behavior to delete a city only if it's specified
+                            // if it's not specified show a UI to pick the city
+                            final Iterator<CityObj> i = col.iterator();
+                            // gets one of the cities. Cities are not sorted by any logical order.
+                            if (i.hasNext()) {
+                                final CityObj city = i.next();
+                                selectedCities.remove(city.mCityId);
+                                Cities.saveCitiesToSharedPrefs(prefs, selectedCities);
+                                Events.sendClockEvent(R.string.action_delete, R.string.label_voice);
+                            }
+                        } else {
+                            final String cityExtraFormatted = formatToTitleCase(cityExtra);
+                            // if a city is specified check if it's selected and if so delete it
+                            final HashMap<String, CityObj> cities =
+                                    Utils.loadCityMapFromXml(HandleVoiceApiCalls.this);
+                            // check if this city exists in the list of available cities
+                            final CityObj city = cities.get(cityExtraFormatted);
+                            if (city == null) {
+                                return null;
+                            }
+                            if (selectedCities.containsKey(city.mCityId)) {
+                                selectedCities.remove(city.mCityId);
+                                Cities.saveCitiesToSharedPrefs(prefs, selectedCities);
+                                Events.sendClockEvent(R.string.action_delete,
+                                        R.string.label_voice);
+                            }
+                        }
+                        break;
+                    case VOICE_ACTION_SHOW_CLOCK:
+                        Events.sendClockEvent(R.string.action_show, R.string.label_voice);
+                        break;
+                }
+                return null;
+            }
+        }.execute();
+    }
+
+    // TODO: replace with toLowerCase
+    private String formatToTitleCase(String city) {
+        final StringBuilder stringBuilder = new StringBuilder(city);
+        stringBuilder.replace(0, stringBuilder.length(), stringBuilder.toString().toLowerCase())
+                .setCharAt(0, Character.toTitleCase(stringBuilder.charAt(0)));
+        return stringBuilder.toString();
+
+    }
+}

diff --git a/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java b/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java
index a5ce155..636a90e 100644
--- a/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java
+++ b/src/com/android/deskclock/widget/sgv/OverScrollerSGV.java

@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.hardware.SensorManager;
-import android.util.FloatMath;
 import android.util.Log;
 import android.view.ViewConfiguration;
 import android.view.animation.AnimationUtils;
@@ -177,9 +176,7 @@
      * @return The original velocity less the deceleration, norm of the X and Y velocity vector.
      */
     public float getCurrVelocity() {
-        float squaredNorm = mScrollerX.mCurrVelocity * mScrollerX.mCurrVelocity;
-        squaredNorm += mScrollerY.mCurrVelocity * mScrollerY.mCurrVelocity;
-        return FloatMath.sqrt(squaredNorm);
+        return (float) Math.hypot(mScrollerX.mCurrVelocity, mScrollerY.mCurrVelocity);
     }
 
     /**
commit	c31c049b6824ae6fca3d7d78f5220b2b53e5b2c2	[log] [tgz]
author	Annie Chin <afchin@google.com>	Wed Jun 03 19:49:18 2015 +0000
committer	Android Git Automerger <android-git-automerger@android.com>	Wed Jun 03 19:49:18 2015 +0000
tree	c2ff3ee5a0ab0e3e431653804f5ffd2cb0f99680
parent	89fc80a78dc62ab3783a1886136a45d21b68f69d [diff]
parent	46af54e4b91cee8f152f3800dd26acb39fcd7d7c [diff]