Merge branch 'lineage-17.1' into q
Change-Id: I44e71c7dac414b484d3f8b90c0ad250794c840d9
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index af07665..e28e319 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,7 @@
<original-package android:name="com.android.alarmclock" />
<original-package android:name="com.android.deskclock" />
- <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25" />
+ <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -55,9 +55,6 @@
android:supportsRtl="true"
android:theme="@style/Theme.DeskClock">
- <!-- We can deal with all kinds of aspect ratios -->
- <meta-data android:name="android.max_aspect" android:value="0.0" />
-
<!-- ============================================================== -->
<!-- Main app components. -->
<!-- ============================================================== -->
@@ -109,9 +106,12 @@
<!-- ============================================================== -->
<activity
- android:name=".HandleApiCalls"
+ android:name="com.android.deskclock.HandleApiCalls"
+ android:permission="com.android.alarm.permission.SET_ALARM"
+ android:directBootAware="true"
android:excludeFromRecents="true"
android:launchMode="singleInstance"
+ android:showWhenLocked="true"
android:taskAffinity=""
android:theme="@android:style/Theme.NoDisplay">
<intent-filter>
@@ -127,9 +127,9 @@
</activity>
<activity-alias
- android:name=".HandleSetAlarmApiCalls"
+ android:name="com.android.deskclock.HandleSetAlarmApiCalls"
android:permission="com.android.alarm.permission.SET_ALARM"
- android:targetActivity=".HandleApiCalls">
+ android:targetActivity="com.android.deskclock.HandleApiCalls">
<intent-filter>
<action android:name="android.intent.action.SET_ALARM" />
<action android:name="android.intent.action.SET_TIMER" />
diff --git a/res/color/tab_tint_color.xml b/res/color/tab_tint_color.xml
index 912a9fe..3814e50 100644
--- a/res/color/tab_tint_color.xml
+++ b/res/color/tab_tint_color.xml
@@ -15,7 +15,7 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_focused="true" android:color="@color/white" />
- <item android:state_selected="true" android:color="@color/white" />
- <item android:color="@color/white_63p" />
-</selector>
\ No newline at end of file
+ <item android:state_focused="true" android:color="@color/accent_color" />
+ <item android:state_selected="true" android:color="@color/accent_color" />
+ <item android:color="@color/white_50p" />
+</selector>
diff --git a/res/drawable-hdpi/ic_add_white_24dp.png b/res/drawable-hdpi/ic_add_white_24dp.png
deleted file mode 100644
index 694179b..0000000
--- a/res/drawable-hdpi/ic_add_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl/ic_label.xml b/res/drawable-ldrtl/ic_label.xml
index 25f757f..a62018e 100644
--- a/res/drawable-ldrtl/ic_label.xml
+++ b/res/drawable-ldrtl/ic_label.xml
@@ -24,7 +24,7 @@
android:pivotX="12"
android:scaleX="-1">
<path
- android:fillColor="#FFFFFF"
- android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M16,17H5V7H16L19.55,12M17.63,5.84C17.27,5.33 16.67,5 16,5H5A2,2 0 0,0 3,7V17A2,2 0 0,0 5,19H16C16.67,19 17.27,18.66 17.63,18.15L22,12L17.63,5.84Z" />
</group>
</vector>
diff --git a/res/drawable-mdpi/ic_add_white_24dp.png b/res/drawable-mdpi/ic_add_white_24dp.png
deleted file mode 100644
index 3856041..0000000
--- a/res/drawable-mdpi/ic_add_white_24dp.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-v21/ic_add_24dp.xml b/res/drawable-v21/ic_add_24dp.xml
deleted file mode 100644
index 61ef285..0000000
--- a/res/drawable-v21/ic_add_24dp.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_add_white_24dp"
- android:tint="@color/black_54p" />
diff --git a/res/drawable-v21/ic_start_24dp.xml b/res/drawable-v21/ic_start_24dp.xml
deleted file mode 100644
index ebf3083..0000000
--- a/res/drawable-v21/ic_start_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_start_white_24dp"
- android:tint="@color/black_54p" />
diff --git a/res/drawable-v21/ic_stop_24dp.xml b/res/drawable-v21/ic_stop_24dp.xml
deleted file mode 100644
index e3e3431..0000000
--- a/res/drawable-v21/ic_stop_24dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_stop_white_24dp"
- android:tint="@color/black_54p" />
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 5a91ced..bfbe731 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -14,5 +14,12 @@
limitations under the License.
-->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_add_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
diff --git a/res/drawable-v21/ic_pause_24dp.xml b/res/drawable/ic_add_white_24dp.xml
similarity index 67%
rename from res/drawable-v21/ic_pause_24dp.xml
rename to res/drawable/ic_add_white_24dp.xml
index 92c5e93..71ed3d7 100644
--- a/res/drawable-v21/ic_pause_24dp.xml
+++ b/res/drawable/ic_add_white_24dp.xml
@@ -13,6 +13,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_pause_white_24dp"
- android:tint="@color/black_54p" />
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+</vector>
diff --git a/res/drawable/ic_backspace.xml b/res/drawable/ic_backspace.xml
index b4a3040..1adc2d3 100644
--- a/res/drawable/ic_backspace.xml
+++ b/res/drawable/ic_backspace.xml
@@ -24,9 +24,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFF"
- android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53
- 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17
- 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12
- 19,15.59z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59L17.59,17L14,13.41L10.41,17L9,15.59zM21,6H8l-4.5,6L8,18h13V6M21,4c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H8c-0.63,0 -1.22,-0.3 -1.6,-0.8L1,12l5.4,-7.2C6.78,4.3 7.37,4 8,4H21L21,4z" />
</vector>
diff --git a/res/drawable/ic_delete_small.xml b/res/drawable/ic_delete_small.xml
index f08114a..c167952 100644
--- a/res/drawable/ic_delete_small.xml
+++ b/res/drawable/ic_delete_small.xml
@@ -20,6 +20,12 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M9,20h6c1.66,0,3-1.34,3-3V6h0.5c0.41,0,0.75-0.34,0.75-0.75S18.91,4.5,18.5,4.5H18h-3l-1-1h-4l-1,1H6H5.5 c-0.41,0-0.75,0.34-0.75,0.75S5.09,6,5.5,6H6v11C6,18.66,7.34,20,9,20z M16.5,6v11c0,0.83-0.67,1.5-1.5,1.5H9 c-0.83,0-1.5-0.67-1.5-1.5V6H16.5z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M13.97,16c0.41,0,0.75-0.34,0.75-0.75v-6.5c0-0.41-0.34-0.75-0.75-0.75s-0.75,0.34-0.75,0.75v6.5 C13.22,15.66,13.55,16,13.97,16z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M10,16c0.41,0,0.75-0.34,0.75-0.75v-6.5C10.75,8.34,10.41,8,10,8S9.25,8.34,9.25,8.75v6.5C9.25,15.66,9.59,16,10,16z" />
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml
index ec330fd..4a120f2 100644
--- a/res/drawable/ic_label.xml
+++ b/res/drawable/ic_label.xml
@@ -21,6 +21,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFF"
- android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
+ android:fillColor="@android:color/white"
+ android:pathData="M16,17H5V7H16L19.55,12M17.63,5.84C17.27,5.33 16.67,5 16,5H5A2,2 0 0,0 3,7V17A2,2 0 0,0 5,19H16C16.67,19 17.27,18.66 17.63,18.15L22,12L17.63,5.84Z" />
</vector>
diff --git a/res/drawable/ic_pause_24dp.xml b/res/drawable/ic_pause_24dp.xml
index fa2e610..15bbcdd 100644
--- a/res/drawable/ic_pause_24dp.xml
+++ b/res/drawable/ic_pause_24dp.xml
@@ -1,17 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_pause_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M19,19h-6L13,5h6v14zM15,17h2L17,7h-2v10zM11,19L5,19L5,5h6v14zM7,17h2L9,7L7,7v10z" />
+</vector>
diff --git a/res/drawable/ic_public.xml b/res/drawable/ic_public.xml
index ce36b36..330c831 100644
--- a/res/drawable/ic_public.xml
+++ b/res/drawable/ic_public.xml
@@ -20,6 +20,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
-</vector>
\ No newline at end of file
+ android:fillColor="@android:color/black"
+ android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zm6.93 6h-2.95c-.32-1.25-.78-2.45-1.38-3.56 1.84.63 3.37 1.91 4.33 3.56zM12 4.04c.83 1.2 1.48 2.53 1.91 3.96h-3.82c.43-1.43 1.08-2.76 1.91-3.96zM4.26 14C4.1 13.36 4 12.69 4 12s.1-1.36.26-2h3.38c-.08.66-.14 1.32-.14 2 0 .68.06 1.34.14 2H4.26zm.82 2h2.95c.32 1.25.78 2.45 1.38 3.56-1.84-.63-3.37-1.9-4.33-3.56zm2.95-8H5.08c.96-1.66 2.49-2.93 4.33-3.56C8.81 5.55 8.35 6.75 8.03 8zM12 19.96c-.83-1.2-1.48-2.53-1.91-3.96h3.82c-.43 1.43-1.08 2.76-1.91 3.96zM14.34 14H9.66c-.09-.66-.16-1.32-.16-2 0-.68.07-1.35.16-2h4.68c.09.65.16 1.32.16 2 0 .68-.07 1.34-.16 2zm.25 5.56c.6-1.11 1.06-2.31 1.38-3.56h2.95c-.96 1.65-2.49 2.93-4.33 3.56zM16.36 14c.08-.66.14-1.32.14-2 0-.68-.06-1.34-.14-2h3.38c.16.64.26 1.31.26 2s-.1 1.36-.26 2h-3.38z" />
+</vector>
diff --git a/res/drawable/ic_ringtone.xml b/res/drawable/ic_ringtone.xml
index 5fb4e4b..3b5443e 100644
--- a/res/drawable/ic_ringtone.xml
+++ b/res/drawable/ic_ringtone.xml
@@ -20,6 +20,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
+ android:fillColor="@android:color/white"
+ android:pathData="M10,21H14A2,2 0 0,1 12,23A2,2 0 0,1 10,21M21,19V20H3V19L5,17V11C5,7.9 7.03,5.17 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V17L21,19M17,11A5,5 0 0,0 12,6A5,5 0 0,0 7,11V18H17V11M19.75,3.19L18.33,4.61C20.04,6.3 21,8.6 21,11H23C23,8.07 21.84,5.25 19.75,3.19M1,11H3C3,8.6 3.96,6.3 5.67,4.61L4.25,3.19C2.16,5.25 1,8.07 1,11Z" />
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_ringtone_not_found.xml b/res/drawable/ic_ringtone_not_found.xml
index 74a4241..bc7ceeb 100644
--- a/res/drawable/ic_ringtone_not_found.xml
+++ b/res/drawable/ic_ringtone_not_found.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFF"
- android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M12 3l0.01 10.55c-0.59-0.34-1.27-0.55-2-0.55C7.79 13 6 14.79 6 17s1.79 4 4.01 4S14 19.21 14 17V7h4V3h-6zm-10.99 16c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" />
</vector>
diff --git a/res/drawable/ic_ringtone_silent.xml b/res/drawable/ic_ringtone_silent.xml
index 4e6d0ab..fa62afd 100644
--- a/res/drawable/ic_ringtone_silent.xml
+++ b/res/drawable/ic_ringtone_silent.xml
@@ -20,6 +20,6 @@
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M20,18.69L7.84,6.14 5.27,3.49 4,4.76l2.8,2.8v0.01c-0.52,0.99 -0.8,2.16 -0.8,3.42v5l-2,2v1h13.73l2,2L21,19.72l-1,-1.03zM12,22c1.11,0 2,-0.89 2,-2h-4c0,1.11 0.89,2 2,2zM18,14.68L18,11c0,-3.08 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.15,0.03 -0.29,0.08 -0.42,0.12 -0.1,0.03 -0.2,0.07 -0.3,0.11h-0.01c-0.01,0 -0.01,0 -0.02,0.01 -0.23,0.09 -0.46,0.2 -0.68,0.31 0,0 -0.01,0 -0.01,0.01L18,14.68z" />
-</vector>
\ No newline at end of file
+ android:fillColor="@android:color/white"
+ android:pathData="M22.11,21.46L2.39,1.73L1.11,3L5.83,7.72C5.29,8.73 5,9.86 5,11V17L3,19V20H18.11L20.84,22.73L22.11,21.46M7,18V11C7,10.39 7.11,9.79 7.34,9.23L16.11,18H7M10,21H14A2,2 0 0,1 12,23A2,2 0 0,1 10,21M8.29,5.09C8.82,4.75 9.4,4.5 10,4.29C10,4.19 10,4.1 10,4A2,2 0 0,1 12,2A2,2 0 0,1 14,4C14,4.1 14,4.19 14,4.29C16.97,5.17 19,7.9 19,11V15.8L17,13.8V11A5,5 0 0,0 12,6C11.22,6 10.45,6.2 9.76,6.56L8.29,5.09Z" />
+</vector>
diff --git a/res/drawable/ic_start_24dp.xml b/res/drawable/ic_start_24dp.xml
index cb5afbc..96e0449 100644
--- a/res/drawable/ic_start_24dp.xml
+++ b/res/drawable/ic_start_24dp.xml
@@ -1,3 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_start_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M8.5,8.64L13.77,12L8.5,15.36V8.64M6.5,5V19L17.5,12" />
+</vector>
diff --git a/res/drawable/ic_stop_24dp.xml b/res/drawable/ic_stop_24dp.xml
index 02a2cf1..4d9c9d4 100644
--- a/res/drawable/ic_stop_24dp.xml
+++ b/res/drawable/ic_stop_24dp.xml
@@ -1,3 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
- android:src="@drawable/ic_stop_white_24dp" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="@android:color/black"
+ android:pathData="M16,8v8H8V8h8m2-2H6v12h12V6z" />
+</vector>
diff --git a/res/layout/alarm_volume_preference.xml b/res/layout/alarm_volume_preference.xml
index 109c7be..c67fb6a 100644
--- a/res/layout/alarm_volume_preference.xml
+++ b/res/layout/alarm_volume_preference.xml
@@ -18,44 +18,66 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground"
- android:clipToPadding="false"
- android:focusable="true"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
- android:minHeight="?attr/listPreferredItemHeightSmall"
- android:orientation="vertical"
- android:paddingBottom="16dp"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingTop="16dp">
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:clickable="false"
+ android:orientation="horizontal">
- <TextView
- android:id="@android:id/title"
+ <LinearLayout
+ android:id="@+id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:ellipsize="marquee"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceListItem" />
+ android:minWidth="44dp"
+ android:gravity="start|center_vertical"
+ android:orientation="horizontal"
+ android:paddingEnd="12dp"
+ android:paddingTop="4dp"
+ android:paddingBottom="4dp">
+ <com.android.internal.widget.PreferenceImageView
+ android:id="@android:id/icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"/>
+ </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/touch_target_min_size">
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp">
- <ImageView
- android:id="@+id/alarm_icon"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:importantForAccessibility="no" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingStart="12dp"
+ android:singleLine="true"
+ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
+ android:textColor="?android:attr/textColorPrimary"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"/>
+ </LinearLayout>
- <!-- Specify maxHeight to properly set the track height on API < 23 -->
- <SeekBar
- android:id="@+id/alarm_volume_slider"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:maxHeight="@dimen/touch_target_min_size" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <SeekBar
+ android:id="@*android:id/seekbar"
+ android:layout_gravity="center_vertical"
+ android:paddingStart="12dp"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"/>
+
+ </LinearLayout>
</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/clock_fragment.xml b/res/layout/clock_fragment.xml
index ec97381..d1b7619 100644
--- a/res/layout/clock_fragment.xml
+++ b/res/layout/clock_fragment.xml
@@ -18,9 +18,8 @@
<androidx.recyclerview.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/cities"
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_weight="1"
android:clickable="false"
android:clipToPadding="false"
android:paddingBottom="@dimen/fab_height"
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index d25e4f6..e39d1bb 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -15,15 +15,15 @@
limitations under the License.
-->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- app:statusBarBackground="@null">
+ android:orientation="vertical"
+ app:statusBarBackground="@null"
+ android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
@@ -36,96 +36,94 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentInsetStart="0dp"
- tools:ignore="RtlSymmetry">
+ tools:ignore="RtlSymmetry"
+ android:gravity="center">
- <com.google.android.material.tabs.TabLayout
- android:id="@+id/tabs"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:tabGravity="fill"
- app:tabIndicatorColor="@android:color/transparent"
- app:tabMaxWidth="0dp"
- app:tabMode="fixed"
- app:tabPaddingEnd="0dp"
- app:tabPaddingStart="0dp" />
+ <TextView
+ android:id="@+id/title_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
</androidx.appcompat.widget.Toolbar>
-
- <View
- android:id="@+id/tab_hairline"
- android:layout_width="match_parent"
- android:layout_height="@dimen/hairline_height"
- android:layout_gravity="bottom"
- android:background="@color/hairline"
- android:importantForAccessibility="no" />
-
</com.google.android.material.appbar.AppBarLayout>
- <FrameLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
+ android:id="@+id/content"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
+ android:layout_height="0dp"
+ android:layout_weight="1">
- <androidx.viewpager.widget.ViewPager
- android:id="@+id/desk_clock_pager"
+ <FrameLayout
+ android:id="@+id/fragment_container"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:importantForAccessibility="no"
- android:saveEnabled="false" />
+ android:layout_height="match_parent"/>
- <include layout="@layout/drop_shadow" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:baselineAligned="false"
+ android:orientation="horizontal"
+ app:layout_behavior="com.android.deskclock.widget.toast.SnackbarSlidingBehavior">
- </FrameLayout>
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="start|center_vertical"
+ android:layout_weight="1">
- <LinearLayout
+ <Button
+ android:id="@+id/left_button"
+ style="?attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:scaleType="centerInside" />
+
+ </FrameLayout>
+
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ android:id="@+id/fab"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_margin="@dimen/fab_margin"
+ app:borderWidth="0dp"
+ app:elevation="@dimen/fab_elevation" />
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_gravity="end|center_vertical"
+ android:layout_weight="1">
+
+ <Button
+ android:id="@+id/right_button"
+ style="?attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:scaleType="centerInside" />
+
+ </FrameLayout>
+
+ </LinearLayout>
+
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+ <com.google.android.material.bottomnavigation.BottomNavigationView
+ android:id="@+id/bottom_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:baselineAligned="false"
- android:orientation="horizontal"
- app:layout_behavior="com.android.deskclock.widget.toast.SnackbarSlidingBehavior">
+ android:layout_below="@id/content"
+ android:background="@color/secondary_color"
+ app:menu="@menu/bottom_navigation_menu"
+ app:itemIconTint="@color/tab_tint_color"
+ app:itemTextColor="@color/tab_tint_color"
+ app:itemTextAppearanceActive="@style/navText"
+ app:itemTextAppearanceInactive="@style/navText"
+ app:labelVisibilityMode="labeled" />
- <FrameLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_gravity="start|center_vertical"
- android:layout_weight="1">
-
- <Button
- android:id="@+id/left_button"
- style="?attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:scaleType="centerInside" />
-
- </FrameLayout>
-
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_margin="@dimen/fab_margin"
- app:borderWidth="0dp"
- app:elevation="@dimen/fab_elevation" />
-
- <FrameLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_gravity="end|center_vertical"
- android:layout_weight="1">
-
- <Button
- android:id="@+id/right_button"
- style="?attr/borderlessButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:scaleType="centerInside" />
-
- </FrameLayout>
-
- </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/res/layout/tab_item.xml b/res/layout/tab_item.xml
deleted file mode 100644
index 4d8b17c..0000000
--- a/res/layout/tab_item.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/text1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:drawablePadding="10dp"
- android:gravity="center"
- android:includeFontPadding="false"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.Tab" />
diff --git a/res/layout/timer_setup_time.xml b/res/layout/timer_setup_time.xml
index 947723c..572063f 100644
--- a/res/layout/timer_setup_time.xml
+++ b/res/layout/timer_setup_time.xml
@@ -19,9 +19,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:gravity="center"
+ android:minHeight="@dimen/timer_setup_top_size"
android:layoutDirection="ltr"
android:orientation="horizontal">
@@ -42,7 +44,6 @@
android:id="@+id/timer_setup_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/timer_setup_delete_margin"
android:contentDescription="@string/timer_delete"
android:padding="12dp"
android:scaleType="center"
diff --git a/res/layout/timer_setup_view.xml b/res/layout/timer_setup_view.xml
index ec99b42..526862f 100644
--- a/res/layout/timer_setup_view.xml
+++ b/res/layout/timer_setup_view.xml
@@ -21,8 +21,7 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
- android:paddingBottom="@dimen/fab_height"
- android:paddingTop="@dimen/timer_setup_top_margin">
+ android:paddingBottom="@dimen/fab_height">
<include layout="@layout/timer_setup_time" />
diff --git a/res/menu/bottom_navigation_menu.xml b/res/menu/bottom_navigation_menu.xml
new file mode 100644
index 0000000..1ad8469
--- /dev/null
+++ b/res/menu/bottom_navigation_menu.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/page_alarm"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_alarm"
+ android:title="@string/menu_alarm"/>
+ <item
+ android:id="@+id/page_clock"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_clock"
+ android:title="@string/menu_clock"/>
+ <item
+ android:id="@+id/page_timer"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_timer"
+ android:title="@string/menu_timer"/>
+ <item
+ android:id="@+id/page_stopwatch"
+ android:enabled="true"
+ android:icon="@drawable/ic_tab_stopwatch"
+ android:title="@string/menu_stopwatch"/>
+</menu>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1926bc7..7ce663a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Vandag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Maak toe"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Wekker gemis"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Gesluimer"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Afteller gemis: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Laat wag"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Stel alle aftellers terug"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 36b7cc8..df55c24 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ዛሬ"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"አሰናብት"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"አንቀላፍቷል"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ደቂቃ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ያመለጠ ሰዓት ቆጣሪ፦ <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ለአፍታ አቁም"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ሁሉንም ሰዓት ቆጣሪዎች ዳግም አስጀምር"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f9eaf8a..0cfceb8 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"اليوم"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"تجاهل"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"تم التأجيل"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -275,8 +275,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"الموقِّت الفائت: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"إيقاف مؤقت"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"إعادة ضبط الموقتات"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index c6335b7..7887933 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"আজি"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"বাতিল কৰক"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"স্নুজ কৰা হ’ল"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> মিনিট</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"সজাগ হ\'ব নোৱাৰা টাইমাৰ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"পজ কৰক"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"সকলো টাইমাৰ ৰিছেট কৰক"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index a50a67e..b1a25f4 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Bu gün"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Burax"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Buraxılmış zənglər"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Mürgülü"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> dəq</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Buraxılmış taymer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Durdurun"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Bütün taymerləri sıfırlayın"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 988ebec..f5075ca 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danas"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Odbaci"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Propušteni alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Odloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Propušteni tajmer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauziraj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Res. sve tajm."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 8a664e0..21b7c28 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Сёння"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Выключыць"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Адкладзена"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> хв</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Прапушчаны таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Прыпыніць"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Скінуць усе таймеры"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index fa16951..5cbc4e0 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"днес"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Отхвърляне"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Отложено"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> мин</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропуснат таймер: „<xliff:g id="NAME">%s</xliff:g>“"</string>
<string name="timer_pause" msgid="3748323712728398743">"Пауза"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Нулиране на всички таймери"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 94e4c83..ea33f9d 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"আজ"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"খারিজ"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"পরে মনে করানো হবে"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> মিনিট</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"মিস করা টাইমার: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"বিরাম দিন"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"সমস্ত টাইমার আবার সেট করুন"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index d8de867..3028e86 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danas"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Odbaci"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Propušteni alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Odloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Propušteni tajmer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauziraj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Poništi sve tajmere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d79f6c1..883ca84 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Avui"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ignora"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perduda"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Posposada"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporitzador desatès: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Posa en pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restableix tots els temporitz."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index db5bea1..832a23d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Dnes"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Zavřít"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Zmeškaný budík"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Odloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Zmeškaný časovač: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pozastavit"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset časovačů"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8ebd926..a9f46b8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"I dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Slå fra"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Ubesvaret alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Udsat"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> minutter</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Overskredet timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Sæt på pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Nulstil alle timere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 89040ef..4242b7b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Heute"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ausschalten"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Entgangener Weckruf"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g>–<xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Schlummern"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -76,7 +76,7 @@
<item msgid="2332583385137381060">"Der Wecker klingelt in <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> und <xliff:g id="MINUTES">%3$s</xliff:g>."</item>
</string-array>
<plurals name="days" formatted="false" msgid="3706846447285206235">
- <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Tage</item>
+ <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> Tagen</item>
<item quantity="one">1 Tag</item>
</plurals>
<plurals name="hours" formatted="false" msgid="3871283109767171655">
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Verpasster Timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausieren"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Alle Timer zurücksetzen"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 70a7aab..e9b31ab 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Σήμερα"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Παράβλεψη"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Σε αναβολή"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> λεπτά</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Χρονοδιακόπτης που παραλείφθηκε: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Παύση"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Επαν. χρονομ."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 7f33b4a..725d049 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Today"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Missed alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Snoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missed timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset all timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8b9ad7a..688aa1d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoy"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Descartar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perdida"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g>: <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Pospuesta"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Recordatorio perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausar"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restablecer"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5baf887..ee90ae5 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoy"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Descartar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perdida"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Pospuesta"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Recordatorio perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausar"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restablecer todo"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 737c52f..113b8d0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Täna"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Loobu"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Märkamata jäänud alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Ed. lükat."</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Vahelejäänud taimer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Peata"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Lähtesta kõik taimerid"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index e87aa46..6caf801 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Gaur"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Baztertu"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarmari ezikusi egin zaio"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Atzeratuta"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Galdutako tenporizadorea: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausatu"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Berrezarri guztiak"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bbb94f3..6d38b5c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"امروز"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"رد کردن"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"به تعویق افتاده"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> دقیقه</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"تایمر ازدسترفته: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"مکث"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"بازنشانی همه تایمرها"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 79580c8e..bd9f98f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Tänään"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ohita"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Vastaamaton ilmoitus"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Torkutettu"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Ohitettu ajastin: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Keskeytä"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Nollaa ajastimet"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>.<xliff:g id="MINUTES">%02d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>.<xliff:g id="MINUTES">%2$02d</xliff:g>.<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7cbbc35..847e6fc 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Aujourd\'hui"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ignorer"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme manquée"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Reportée"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Rappel manqué : <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Interrompre"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Réinit. toutes les minuteries"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3e17fd9..7550388 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Aujourd\'hui"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Quitter"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme manquée"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Répétée"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Rappel manqué : <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Interrompre"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Réinit. minuteurs"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 075eef5..e654742 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoxe"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Apagar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarma perdida"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Adiada"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporizador perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Restablecer todo"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8511cdd..eeedd7f 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"આજે"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"છોડી દો"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"સ્નૂઝ કરી"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> મિનિટ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ચૂકી ગયેલ ટાઇમર: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"થોભાવો"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"બધા ટાઇમર્સ ફરીથી સેટ કરો"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3fde38c..f3f9e57 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"आज"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"खारिज करें"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"याद दिलाया"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> मिनट</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"छूटा हुआ टाइमर: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"रोकें"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"सभी टाइमर रीसेट करें"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6ec4b34..3adbf6e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danas"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Odbaci"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Propušteni alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Odgođeno"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Propušteni tajmer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauziraj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Poništi tajmere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 673f1ea..228c9e8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Ma"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Elvetés"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Elmulasztott ébresztő"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Szundi"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> perc</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Elmulasztott időzítő: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Szüneteltetés"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Visszaállítás"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 19dac8f..df668da 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Այսօր"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Անջատել"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Հետաձգված է"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> րոպե</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Բաց թողնված ժամաչափ՝ <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Դադարեցնել"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Վերակայել բոլոր ժամաչափերը"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c6b0692..259d31d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hari ini"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Tutup"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarm yang terlewat"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Ditunda"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> mnt</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Timer terlewat: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Jeda"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Setel ulang semua pewaktu"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>.<xliff:g id="MINUTES">%02d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>.<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>.<xliff:g id="MINUTES">%2$02d</xliff:g>.<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>.<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d76e48b..c65c412 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Í dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Hunsa"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Hunsaður vekjari"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Blundað"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> mín.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Ekki á réttum tíma: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Gera hlé"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Núlla teljara"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3b9f1dc..2b0d75b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Oggi"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Spegni"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Sveglia ignorata"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Posticip."</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Timer perso: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reimposta tutti i timer"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e668b71..4664b1f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"היום"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"שמענו אותך"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"מצב נודניק"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="two"><xliff:g id="NUMBER">%d</xliff:g> דקות</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"התראות טיימר שהחמצת: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"השהה"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"אפס את הטיימרים"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8c3f66f..f57f4de 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"今日"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"解除"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"スヌーズ"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>分</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"未応答のタイマー: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"一時停止"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"全タイマーをリセット"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 2874ab5..512283d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"დღეს"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"დახურვა"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"ჩათვლემა"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> წთ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"გამოტოვებული ტაიმერი: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"პაუზა"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ტაიმერებ.ჩამოყრა"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 9c5b8fc..2892a5b 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Бүгін"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Өшіру"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Кейінге қалдырылды"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> мин</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Өткізілген таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Кідірту"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Барлық таймерлерді ысыру"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index bc64734..a5359a6 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ថ្ងៃនេះ"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"បោះបង់"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"បានផ្អាក"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> នាទី</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"កម្មវិធីកំណត់ពេលដែលខកខាន៖ <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ផ្អាក"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"កំណត់ការកំណត់ពេលទាំងអស់ឡើងវិញ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 834ca98..480cb66 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ಇಂದು"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ವಜಾಗೊಳಿಸಿ"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"ಸ್ನೂಜ್ ಮಾಡಲಾಗಿದೆ"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ನಿಮಿಷ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ತಪ್ಪಿದ ಟೈಮರ್: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ವಿರಾಮ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ಎಲ್ಲಾ ಟೈಮರ್ ಮರುಹೊಂದಿಸಿ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 61319de..56db6b7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"오늘"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"알람 해제"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"일시 중지됨"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g>분</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"부재중 타이머: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"일시중지"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"모든 타이머 재설정"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index fa5f0b2..65f2944 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Бүгүн"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Өчүрүп коюу"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Тындырылды"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> мүн.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Байкалбай калган таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Тындыруу"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Бардык таймерлерди кайра коюу"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 0860a68..ea3ec5e 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -20,9 +20,6 @@
<resources>
<dimen name="time_margin_top">24dip</dimen>
- <dimen name="timer_setup_delete_margin">12sp</dimen>
- <dimen name="timer_setup_digit_font_size">26sp</dimen>
-
<!-- Size of margin for circles. -->
<dimen name="analog_clock_margin">70dp</dimen>
<dimen name="analog_clock_size">168dp</dimen>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 60e5082..7b3b706 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ມື້ນີ້"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ປິດ"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"ເລື່ອນແລ້ວ"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ນທ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ການຕັ້ງເວລາທີ່ພາດໄປ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ຢຸດຊົ່ວຄາວ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ຣີເຊັດໂມງນັບຖອຍຫຼັງ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1c7d3af..f7387be 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Šiandien"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Atsisakyti"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Praleistas signalas"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Snausti"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Praleistas laikmatis: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pristabdyti"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Iš n. nust. vis. laikm."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f246267..4abb409 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Šodien"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Noraidīt"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Signāls tika nokavēts."</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> — <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Atlikts"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="zero"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Nokavēts taimeris: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Apturēt"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Atiest. taimerus"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 8a86111..af710d8 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Денес"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Отфрли"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Одложен"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> мин.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропуштен тајмер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Паузирај"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Ресетирај ги сите тајмери"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index d22bfc6..ad3624d 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ഇന്ന്"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"നിരസിക്കുക"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"സ്നൂസ് ചെയ്തു"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> മി.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"വിട്ടുപോയ ടൈമർ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"തൽക്കാലം നിർത്തൂ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"എല്ലാ ടൈമറുകളും പുനഃസജ്ജമാക്കുക"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 6874400..807f8b3 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Өнөөдөр"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Алгасах"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Хойшлуулсан"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> минут</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Цаг хэмжигчийг алгассан: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Түр зогсоох"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Бүх цаг хэмжигчийг шинэчлэх"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0ad2597..9245b64 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"आज"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"डिसमिस करा"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"स्नूझ केले"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनिटे</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"चुकविलेला टायमर: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"विराम"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"सर्व टायमर रीसेट करा"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9aa2462..9359e5b 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hari ini"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Tutup"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Penggera terlepas"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Ditunda"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Pemasa terlepas: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Jeda"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Ttpkn sml pmasa"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 6ecb8d7..54c1136 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ယနေ့"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ပိတ်ရန်"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"မှေးနေ"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> မိနစ်</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"လွတ်သွားသည့် သတိပေးချက်− <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ရပ်တန့်ရန်"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"တိုင်မာ အားလုံး ပြင်ဆင်သတ်မှတ်ရန်"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a8df7a8..30aa4a6 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"I dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Slå av"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Tapt alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Utsatt"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Oversett tidtaker: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Sett på pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Tilbakestill alle tidtakere"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 044901b..c79d9dbf2 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"आज"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"खारेज गर्नुहोस्"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"स्नुज गरियो"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> मिनेट</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"छुटेको टाइमर: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"रोक्नुहोस्"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"सबै टाइमरहरू रिसेट गर्नुहोस्"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
new file mode 100644
index 0000000..be56423
--- /dev/null
+++ b/res/values-night/colors.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2016 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>
+ <color name="default_background">#121212</color>
+ <color name="accent_color">#FEF177</color>
+ <color name="secondary_color">#212121</color>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a9e0b0e..839dc71 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Vandaag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Uitzetten"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Wekker gemist"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Gesnoozed"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Gemiste timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauzeren"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Alle timers resetten"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index a669405..70c3a1b 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ଆଜି"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ଖାରଜ କରନ୍ତୁ"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"ସ୍ନୁଜ୍ କରାଗଲା"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ମିନିଟ୍</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ଛାଡ଼ିଯାଇଥିବା ଟାଇମର୍: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ପଜ୍ କରନ୍ତୁ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ସବୁ ଟାଇମର୍କୁ ରିସେଟ୍ କରନ୍ତୁ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index c0efbe7..6e40a6b 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ਅੱਜ"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ਖਾਰਜ ਕਰੋ"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"ਸਨੂਜ਼ ਕੀਤਾ"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ਮਿੰਟ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ਖੁੰਝਿਆ ਟਾਈਮਰ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"ਰੋਕੋ"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"ਸਾਰੇ ਟਾਈਮਰ ਰੀਸੈੱਟ ਕਰੋ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 45d4b34..37ca95e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Dzisiaj"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Wyłącz"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Przegapiony alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Uśpiony"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Pominięty minutnik: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Wstrzymaj"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Resetuj wszystko"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index cf631b8..d20bd35 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoje"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ignorar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme perdido"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Suspenso"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporizador perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Interromper"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Repor tds temp."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9b355aa..054a274 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hoje"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Encerrar"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarme perdido"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Adiado"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Timer perdido: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausar"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Red. timers"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a2ce6c1..57e7a08 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Astăzi"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Închideți"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarmă ratată"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Amânată"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> minute</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Temporizator ratat: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Întrerupeți"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Resetați-le pe toate"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f4c2cb3..485da46 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Сегодня"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Выключить"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Отложено"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one">на <xliff:g id="NUMBER">%d</xliff:g> минуту</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропущенный таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Приостановить"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Сбросить все"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e16e592..ce71b17 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"අද"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ඉවතලන්න"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"සිහිකැඳවන ලදී"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one">මිනි <xliff:g id="NUMBER">%d</xliff:g></item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"මග හැරුණු කාල ගණකය: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"විරාමය"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"සියලු කාල ගණක යළි සකසන්න"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index c1bf4d3..8eca944 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"dnes"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Zavrieť"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Zmeškaný budík"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Odložené"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Zmeškaný časovač: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pozastaviť"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Reset. časovače"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 75fbcc2..33de705 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Danes"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Opusti"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Zamujen alarm"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Preloženo"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Zamujen časovnik: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Zaustavitev"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Ponastavi vse časovnike"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1c62304..87f215d 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Sot"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Injoro"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Dremitur"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuta</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Kohëmatës i humbur: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauzë"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Rivendos të gjithë kohëmatësit"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b1523d9..9cd453a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Данас"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Одбаци"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Одложено"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> мин</item>
@@ -248,8 +248,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропуштени тајмер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Паузирај"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Рес. све тајм."</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a30cc3b..1b61c79 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"I dag"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Stäng av"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarmet lämnades utan åtgärd"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Snoozar"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minuter</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Missad timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pausa"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Återställ alla"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2c27f02..4e045f7 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Leo"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Ondoa"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Kengele ambayo haikushughulikiwa"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Imeahirishwa"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other">Dak <xliff:g id="NUMBER">%d</xliff:g> </item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Kipima muda ambacho hukusikia: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Sitisha"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Anzisha vipima wakati vyote upya"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-sw320dp-port/dimens.xml b/res/values-sw320dp-port/dimens.xml
index b3b3702..6a3e8ed 100644
--- a/res/values-sw320dp-port/dimens.xml
+++ b/res/values-sw320dp-port/dimens.xml
@@ -16,5 +16,4 @@
<resources>
<dimen name="no_alarms_size">120dp</dimen>
- <dimen name="timer_setup_digit_font_size">40sp</dimen>
</resources>
diff --git a/res/values-sw320dp/dimens.xml b/res/values-sw320dp/dimens.xml
index cb60168..d64c205 100644
--- a/res/values-sw320dp/dimens.xml
+++ b/res/values-sw320dp/dimens.xml
@@ -16,5 +16,4 @@
<resources>
<dimen name="big_font_size">60sp</dimen>
- <dimen name="timer_setup_digit_font_size">32sp</dimen>
</resources>
\ No newline at end of file
diff --git a/res/values-sw360dp-land/dimens.xml b/res/values-sw360dp-land/dimens.xml
deleted file mode 100644
index 33bf986..0000000
--- a/res/values-sw360dp-land/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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>
- <dimen name="timer_setup_digit_font_size">40sp</dimen>
-</resources>
diff --git a/res/values-sw360dp/dimens.xml b/res/values-sw360dp/dimens.xml
index 683eda9..d80b3bb 100644
--- a/res/values-sw360dp/dimens.xml
+++ b/res/values-sw360dp/dimens.xml
@@ -18,5 +18,4 @@
<dimen name="big_font_size">70sp</dimen>
<dimen name="main_clock_font_size">80sp</dimen>
<dimen name="no_alarms_size">120dp</dimen>
- <dimen name="timer_setup_digit_font_size">56sp</dimen>
</resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index 1793832..157e8b4 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -19,9 +19,6 @@
<resources>
<dimen name="time_margin_top">32dip</dimen>
- <dimen name="timer_setup_delete_margin">19sp</dimen>
- <dimen name="timer_setup_digit_font_size">46sp</dimen>
-
<!-- Size of margin for circles. -->
<dimen name="circle_margin_top">0dp</dimen>
<dimen name="analog_clock_margin">48dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index b912546..2c3a50d 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -44,11 +44,6 @@
<dimen name="label_margin_big">8dp</dimen>
- <!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
- <dimen name="timer_setup_top_margin">24sp</dimen>
- <dimen name="timer_setup_delete_margin">21sp</dimen>
- <dimen name="timer_setup_digit_font_size">86sp</dimen>
-
<!-- Size of margin for circles. -->
<dimen name="circle_margin_top">48dp</dimen>
<dimen name="analog_clock_margin">96dp</dimen>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index c6665b6..0000000
--- a/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,22 +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.
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <dimen name="timer_setup_delete_margin">19sp</dimen>
- <dimen name="timer_setup_digit_font_size">76sp</dimen>
-</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 20bab18..c096a09 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"இன்று"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"நிராகரி"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"உறக்கத்தில்"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> நிமிடங்கள்</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"தவறிய டைமர்: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"இடைநிறுத்து"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"எல்லா டைமர்களையும் மீட்டமை"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 88041bd..9a73387 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ఈ రోజు"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"తీసివేయి"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"తాత్కా. ఆపి."</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> నిమి</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ఈ టైమర్ చూసుకోలేదు: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"పాజ్ చేయి"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"టైమర్లన్నీ రీసెట్ చేయి"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index ac351f0..3ff2c1a 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"วันนี้"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"ปิด"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"ปิดเสียง"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> นาที</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ตัวตั้งเวลาที่พลาดไป: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"หยุดชั่วคราว"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"รีเซ็ตตัวจับเวลาทั้งหมด"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5132eef..0e4dd59 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Ngayon"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"I-dismiss"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Napalampas ang alarma"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Naka-snooze"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> min</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Napalampas na timer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"I-pause"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"I-reset lahat ng timer"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 66a5489..66c1cfe 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Bugün"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Kapat"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Alarm kaçırıldı"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Ertelendi"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> dk.</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Kaçırılan zamanlayıcı: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Duraklat"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Tüm zamanlayıcıları sıfırla"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3009f1b..17955e3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Сьогодні"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Вимкнути"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Відкладено"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> хв</item>
@@ -257,8 +257,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Пропущено таймер: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Призупинити"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Скинути таймери"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index ae87fc6..f3d2a55 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"ﺁﺝ"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"برخاست کریں"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"اسنوز کردہ"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> منٹ</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"ٹائمر چھوٹ گیا: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"موقوف کریں"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"تمام ٹائمرز دوبارہ ترتیب دیں"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="SECONDS">%02d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="HOURS">%d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="SECONDS">%02d</xliff:g>:<xliff:g id="MINUTES">%d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="SECONDS">%1$02d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="HOURS">%3$d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="SECONDS">%1$02d</xliff:g>:<xliff:g id="MINUTES">%2$d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 8bb1067..d5cef1e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Bugun"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"O‘chirish"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Javobsiz qoldirilgan signal"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> – <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Kechiktirildi"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> daq</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"O‘tib ketgan taymer: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Pauza"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Nolga qaytarish"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index fc43897..57b96c1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Hôm nay"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Loại bỏ"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"Báo thức bị nhỡ"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Được báo lại"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> phút</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Bộ hẹn giờ bị nhỡ: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Tạm dừng"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Đặt lại hẹn giờ"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ac7b815..a7401af 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"今天"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"关闭"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"已暂停"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分钟</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"错过的定时器：<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"暂停"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"重置所有定时器"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index d8ab91c..e270c16 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"今天"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"關閉"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"已延後"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分鐘</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"已錯失的計時：<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"暫停"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"重設所有計時器"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index bad149b..d93d560 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"今天"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"關閉"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"已延後"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> 分鐘</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"錯過的計時器：<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"暫停"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"重設所有計時器"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1a8e15c..3573da6 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -37,7 +37,7 @@
<string name="alarm_today" msgid="7873594221106531654">"Namhlanje"</string>
<string name="alarm_alert_dismiss_text" msgid="4942914605480888820">"Cashisa"</string>
<string name="alarm_missed_title" msgid="3828345099754063392">"I-Alamu ekuphuthele"</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_missed_text" msgid="6585658367289194023">"<xliff:g id="ALARM_TIME">%1$s</xliff:g> - <xliff:g id="ALARM_LABEL">%2$s</xliff:g>"</string>
<string name="alarm_alert_snoozed_text" msgid="7064642998528766113">"Kusnuziwe"</string>
<plurals name="alarm_alert_snooze_duration" formatted="false" msgid="7844300009062867865">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> amaminithi</item>
@@ -239,8 +239,8 @@
<string name="missed_named_timer_notification_label" msgid="665604640028289175">"Isibali sikhathi esiphuthelwe: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="timer_pause" msgid="3748323712728398743">"Misa isikhashana"</string>
<string name="timer_reset_all" msgid="7530633132757866087">"Setha kabusha zonke izibali sikhathi"</string>
- <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%d</xliff:g>:<xliff:g id="MINUTES">%02d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
- <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%d</xliff:g>:<xliff:g id="SECONDS">%02d</xliff:g>"</string>
+ <string name="hours_minutes_seconds" msgid="5680088738059791288">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
+ <string name="minutes_seconds" msgid="6189446107009577914">"<xliff:g id="MINUTES">%1$d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
<!-- no translation found for seconds (6550091082396571898) -->
<skip />
<string-array name="sw_share_strings">
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 9d51147..2d5184a 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -30,4 +30,11 @@
<item>Nothing</item>
</string-array>
+ <!-- Strings for notification channel. -->
+ <string name="firing_alarms_timers_channel">Firing alarms & timers</string>
+ <string name="alarm_missed_channel">Missed alarms</string>
+ <string name="alarm_snooze_channel">Snoozed alarms</string>
+ <string name="alarm_upcoming_channel">Upcoming alarms</string>
+ <string name="stopwatch_channel">Stopwatch</string>
+ <string name="timer_channel">Timer</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2f1fc87..519b470 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -24,6 +24,7 @@
<color name="white">#FFFFFFFF</color>
<color name="white_08p">#14FFFFFF</color>
<color name="white_63p">#A0FFFFFF</color>
+ <color name="white_50p">#80FFFFFF</color>
<color name="no_alarms">#4CFFFFFF</color>
<color name="transparent">#00000000</color>
@@ -36,4 +37,7 @@
<!-- shadowColor for widget text -->
<color name="widget_shadow_color">#000000</color>
+
+ <color name="accent_color">#FFEB40</color>
+ <color name="secondary_color">#2F378A</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8c11977..6a384e9 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -52,7 +52,8 @@
<dimen name="day_button_font_size">16sp</dimen>
<dimen name="alarm_info_font_size">36sp</dimen>
<dimen name="no_alarm_font_size">16sp</dimen>
- <dimen name="timer_setup_digit_font_size">32sp</dimen>
+ <dimen name="timer_setup_digit_font_size">42sp</dimen>
+ <dimen name="timer_setup_top_size">120dip</dimen>
<dimen name="alarm_picker_dialog_horizontal_margin">30dp</dimen>
<dimen name="alarm_picker_dialog_vertical_margin">20dp</dimen>
@@ -72,12 +73,6 @@
<dimen name="label_margin_big">4dp</dimen>
- <!--margin should be ~ half timer_setup_font_size -->
- <dimen name="timer_setup_delete_margin">14sp</dimen>
-
- <!-- Specified in sp to match the top margin of the time on the adjacent world clock tab. -->
- <dimen name="timer_setup_top_margin">18sp</dimen>
-
<dimen name="cities_list_item_height">56dip</dimen>
<!-- Size of margin for circles. -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f247f65..fbe62ae 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -98,8 +98,7 @@
<style name="SecondaryLabelTextAppearance" parent="SecondaryLabelTextParentAppearance" />
- <style name="TextAppearance.Tab" parent="TextAppearance.Design.Tab">
- <item name="android:fontFamily">sans-serif-medium</item>
+ <style name="navText">
<item name="android:textSize">12sp</item>
</style>
@@ -133,7 +132,6 @@
<item name="android:headerBackground">@android:color/transparent</item>
<item name="android:numbersBackgroundColor">@android:color/transparent</item>
<item name="android:numbersSelectorColor">?attr/colorAccent</item>
- <item name="android:numbersTextColor">?android:attr/textColorPrimary</item>
</style>
</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c1681ee..63216f4 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -28,7 +28,7 @@
<item name="android:windowContentOverlay">@null</item>
<!-- Attributes from androidx.appcompat.appcompat -->
- <item name="colorAccent">#DA4336</item>
+ <item name="colorAccent">@color/accent_color</item>
<item name="colorBackgroundFloating">#303030</item>
<item name="colorControlActivated">@android:color/white</item>
<item name="colorControlNormal">?android:attr/textColorPrimary</item>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index e4e6f32..6e65a3e 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -68,7 +68,8 @@
<com.android.deskclock.settings.AlarmVolumePreference
android:key="volume_setting"
android:layout="@layout/alarm_volume_preference"
- android:title="@string/alarm_volume_title" />
+ android:title="@string/alarm_volume_title"
+ android:icon="@drawable/ic_alarm_small" />
<ListPreference
android:defaultValue="0"
diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java
index 5c02d03..859a977 100644
--- a/src/com/android/deskclock/AlarmClockFragment.java
+++ b/src/com/android/deskclock/AlarmClockFragment.java
@@ -16,24 +16,24 @@
package com.android.deskclock;
-import android.app.LoaderManager;
import android.content.Context;
import android.content.Intent;
-import android.content.Loader;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.SystemClock;
-import androidx.annotation.NonNull;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.loader.content.CursorLoader;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import com.android.deskclock.alarms.AlarmTimeClickHandler;
import com.android.deskclock.alarms.AlarmUpdateHandler;
@@ -48,6 +48,7 @@
import com.android.deskclock.widget.EmptyViewController;
import com.android.deskclock.widget.toast.SnackbarManager;
import com.android.deskclock.widget.toast.ToastManager;
+import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList;
import java.util.List;
@@ -80,7 +81,7 @@
private RecyclerView mRecyclerView;
// Data
- private Loader mCursorLoader;
+ private CursorLoader mCursorLoader;
private long mScrollToAlarmId = Alarm.INVALID_ID;
private long mExpandedAlarmId = Alarm.INVALID_ID;
private long mCurrentUpdateToken;
@@ -102,7 +103,7 @@
@Override
public void onCreate(Bundle savedState) {
super.onCreate(savedState);
- mCursorLoader = getLoaderManager().initLoader(0, null, this);
+ mCursorLoader = (CursorLoader) LoaderManager.getInstance(this).initLoader(0, null, this);
if (savedState != null) {
mExpandedAlarmId = savedState.getLong(KEY_EXPANDED_ID, Alarm.INVALID_ID);
}
@@ -391,7 +392,7 @@
@Override
public void onUpdateFab(@NonNull ImageView fab) {
fab.setVisibility(View.VISIBLE);
- fab.setImageResource(R.drawable.ic_add_white_24dp);
+ fab.setImageResource(R.drawable.ic_add_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.button_alarms));
}
@@ -401,6 +402,11 @@
right.setVisibility(View.INVISIBLE);
}
+ @Override
+ public final int getFabTargetVisibility() {
+ return View.VISIBLE;
+ }
+
private void startCreatingAlarm() {
// Clear the currently selected alarm.
mAlarmTimeClickHandler.setSelectedAlarm(null);
diff --git a/src/com/android/deskclock/AlarmInitReceiver.java b/src/com/android/deskclock/AlarmInitReceiver.java
index d62917d..24ba864 100644
--- a/src/com/android/deskclock/AlarmInitReceiver.java
+++ b/src/com/android/deskclock/AlarmInitReceiver.java
@@ -27,6 +27,7 @@
import com.android.deskclock.alarms.AlarmNotifications;
import com.android.deskclock.controller.Controller;
import com.android.deskclock.data.DataModel;
+import com.android.deskclock.NotificationUtils;
import com.android.deskclock.provider.AlarmInstance;
import java.util.Calendar;
@@ -90,6 +91,7 @@
if (Intent.ACTION_BOOT_COMPLETED.equals(action)
|| Intent.ACTION_LOCALE_CHANGED.equals(action)) {
Controller.getController().updateShortcuts();
+ NotificationUtils.updateNotificationChannels(context);
}
// Notifications are canceled by the system on application upgrade. This broadcast signals
diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index 1536b55..b487e52 100644
--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
@@ -215,6 +215,11 @@
right.setVisibility(INVISIBLE);
}
+ @Override
+ public final int getFabTargetVisibility() {
+ return View.VISIBLE;
+ }
+
/**
* Refresh the next alarm time.
*/
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index 15d75b9..88c7362 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -20,18 +20,10 @@
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ValueAnimator;
-import android.app.Fragment;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.annotation.StringRes;
-import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.tabs.TabLayout;
-import androidx.viewpager.widget.ViewPager;
-import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
@@ -40,6 +32,13 @@
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import com.android.deskclock.actionbarmenu.MenuItemControllerFactory;
import com.android.deskclock.actionbarmenu.NightModeMenuItemController;
@@ -55,6 +54,9 @@
import com.android.deskclock.uidata.UiDataModel;
import com.android.deskclock.widget.toast.SnackbarManager;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.snackbar.Snackbar;
+
import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_DRAGGING;
import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_IDLE;
import static androidx.viewpager.widget.ViewPager.SCROLL_STATE_SETTLING;
@@ -86,9 +88,6 @@
/** Hides, updates, and shows only the {@link #mLeftButton} and {@link #mRightButton}. */
private final AnimatorSet mUpdateButtonsOnlyAnimation = new AnimatorSet();
- /** Automatically starts the {@link #mShowAnimation} after {@link #mHideAnimation} ends. */
- private final AnimatorListenerAdapter mAutoStartShowListener = new AutoStartShowListener();
-
/** Updates the user interface to reflect the selected tab from the backing model. */
private final TabListener mTabChangeWatcher = new TabChangeWatcher();
@@ -114,17 +113,16 @@
/** The button right of the {@link #mFab} shared across all tabs in the user interface. */
private Button mRightButton;
- /** The controller that shows the drop shadow when content is not scrolled to the top. */
- private DropShadowController mDropShadowController;
-
/** The ViewPager that pages through the fragments representing the content of the tabs. */
private ViewPager mFragmentTabPager;
- /** Generates the fragments that are displayed by the {@link #mFragmentTabPager}. */
- private FragmentTabPagerAdapter mFragmentTabPagerAdapter;
+ /** The view that displays the current tab's title */
+ private TextView mTitleView;
- /** The container that stores the tab headers. */
- private TabLayout mTabLayout;
+ /** The bottom navigation bar */
+ private BottomNavigationView mBottomNavigation;
+
+ private FragmentUtils mFragmentUtils;
/** {@code true} when a settings change necessitates recreating this activity. */
private boolean mRecreateActivity;
@@ -170,43 +168,6 @@
// inflation occurs *after* the initial draw and a second layout pass adds in the menu.
onCreateOptionsMenu(toolbar.getMenu());
- // Create the tabs that make up the user interface.
- mTabLayout = (TabLayout) findViewById(R.id.tabs);
- final int tabCount = UiDataModel.getUiDataModel().getTabCount();
- final boolean showTabLabel = getResources().getBoolean(R.bool.showTabLabel);
- final boolean showTabHorizontally = getResources().getBoolean(R.bool.showTabHorizontally);
- for (int i = 0; i < tabCount; i++) {
- final UiDataModel.Tab tabModel = UiDataModel.getUiDataModel().getTab(i);
- final @StringRes int labelResId = tabModel.getLabelResId();
-
- final TabLayout.Tab tab = mTabLayout.newTab()
- .setTag(tabModel)
- .setIcon(tabModel.getIconResId())
- .setContentDescription(labelResId);
-
- if (showTabLabel) {
- tab.setText(labelResId);
- tab.setCustomView(R.layout.tab_item);
-
- @SuppressWarnings("ConstantConditions")
- final TextView text = (TextView) tab.getCustomView()
- .findViewById(android.R.id.text1);
- text.setTextColor(mTabLayout.getTabTextColors());
-
- // Bind the icon to the TextView.
- final Drawable icon = tab.getIcon();
- if (showTabHorizontally) {
- // Remove the icon so it doesn't affect the minimum TabLayout height.
- tab.setIcon(null);
- text.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null);
- } else {
- text.setCompoundDrawablesRelativeWithIntrinsicBounds(null, icon, null, null);
- }
- }
-
- mTabLayout.addTab(tab);
- }
-
// Configure the buttons shared by the tabs.
mFab = (ImageView) findViewById(R.id.fab);
mLeftButton = (Button) findViewById(R.id.left_button);
@@ -283,38 +244,63 @@
.after(leftHideAnimation)
.after(rightHideAnimation);
- // Customize the view pager.
- mFragmentTabPagerAdapter = new FragmentTabPagerAdapter(this);
- mFragmentTabPager = (ViewPager) findViewById(R.id.desk_clock_pager);
- // Keep all four tabs to minimize jank.
- mFragmentTabPager.setOffscreenPageLimit(3);
- // Set Accessibility Delegate to null so view pager doesn't intercept movements and
- // prevent the fab from being selected.
- mFragmentTabPager.setAccessibilityDelegate(null);
- // Mirror changes made to the selected page of the view pager into UiDataModel.
- mFragmentTabPager.addOnPageChangeListener(new PageChangeWatcher());
- mFragmentTabPager.setAdapter(mFragmentTabPagerAdapter);
-
+ mFragmentUtils = new FragmentUtils(this);
// Mirror changes made to the selected tab into UiDataModel.
- mTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
- @Override
- public void onTabSelected(TabLayout.Tab tab) {
- UiDataModel.getUiDataModel().setSelectedTab((UiDataModel.Tab) tab.getTag());
- }
-
- @Override
- public void onTabUnselected(TabLayout.Tab tab) {
- }
-
- @Override
- public void onTabReselected(TabLayout.Tab tab) {
- }
- });
+ mBottomNavigation = findViewById(R.id.bottom_view);
+ mBottomNavigation.setOnNavigationItemSelectedListener(mNavigationListener);
// Honor changes to the selected tab from outside entities.
UiDataModel.getUiDataModel().addTabListener(mTabChangeWatcher);
+
+ mTitleView = findViewById(R.id.title_view);
}
+ private BottomNavigationView.OnNavigationItemSelectedListener mNavigationListener
+ = new BottomNavigationView.OnNavigationItemSelectedListener() {
+
+ @Override
+ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+ UiDataModel.Tab selectedTab = null;
+ switch (item.getItemId()) {
+ case R.id.page_alarm:
+ selectedTab = UiDataModel.Tab.ALARMS;
+ break;
+
+ case R.id.page_clock:
+ selectedTab = UiDataModel.Tab.CLOCKS;
+ break;
+
+ case R.id.page_timer:
+ selectedTab = UiDataModel.Tab.TIMERS;
+ break;
+
+ case R.id.page_stopwatch:
+ selectedTab = UiDataModel.Tab.STOPWATCH;
+ break;
+ }
+
+ if (selectedTab != null) {
+ UiDataModel.Tab currentTab = UiDataModel.getUiDataModel().getSelectedTab();
+ DeskClockFragment currentFrag = mFragmentUtils.getDeskClockFragment(currentTab);
+ DeskClockFragment selectedFrag = mFragmentUtils.getDeskClockFragment(selectedTab);
+
+ int currentVisibility = currentFrag.getFabTargetVisibility();
+ int targetVisibility = selectedFrag.getFabTargetVisibility();
+ if (currentVisibility != targetVisibility) {
+ if (targetVisibility == View.VISIBLE) {
+ mShowAnimation.start();
+ } else {
+ mHideAnimation.start();
+ }
+ }
+ UiDataModel.getUiDataModel().setSelectedTab(selectedTab);
+ return true;
+ }
+
+ return false;
+ }
+ };
+
@Override
protected void onStart() {
super.onStart();
@@ -326,10 +312,6 @@
protected void onResume() {
super.onResume();
- final View dropShadow = findViewById(R.id.drop_shadow);
- mDropShadowController = new DropShadowController(dropShadow, UiDataModel.getUiDataModel(),
- mSnackbarAnchor.findViewById(R.id.tab_hairline));
-
// ViewPager does not save state; this honors the selected tab in the user interface.
updateCurrentTab();
}
@@ -340,29 +322,10 @@
if (mRecreateActivity) {
mRecreateActivity = false;
-
- // A runnable must be posted here or the new DeskClock activity will be recreated in a
- // paused state, even though it is the foreground activity.
- mFragmentTabPager.post(new Runnable() {
- @Override
- public void run() {
- recreate();
- }
- });
}
}
@Override
- public void onPause() {
- if (mDropShadowController != null) {
- mDropShadowController.stop();
- mDropShadowController = null;
- }
-
- super.onPause();
- }
-
- @Override
protected void onStop() {
DataModel.getDataModel().removeSilentSettingsListener(mSilentSettingChangeWatcher);
if (!isChangingConfigurations()) {
@@ -401,7 +364,7 @@
*/
@Override
public void onDialogLabelSet(Alarm alarm, String label, String tag) {
- final Fragment frag = getFragmentManager().findFragmentByTag(tag);
+ final Fragment frag = getSupportFragmentManager().findFragmentByTag(tag);
if (frag instanceof AlarmClockFragment) {
((AlarmClockFragment) frag).setLabel(alarm, label);
}
@@ -486,44 +449,23 @@
}
/**
- * Configure the {@link #mFragmentTabPager} and {@link #mTabLayout} to display UiDataModel's
- * selected tab.
+ * Configure the {@link #mFragmentTabPager} and {@link #mBottomNavigation} to display
+ * UiDataModel's selected tab.
*/
private void updateCurrentTab() {
// Fetch the selected tab from the source of truth: UiDataModel.
final UiDataModel.Tab selectedTab = UiDataModel.getUiDataModel().getSelectedTab();
-
- // Update the selected tab in the tablayout if it does not agree with UiDataModel.
- for (int i = 0; i < mTabLayout.getTabCount(); i++) {
- final TabLayout.Tab tab = mTabLayout.getTabAt(i);
- if (tab != null && tab.getTag() == selectedTab && !tab.isSelected()) {
- tab.select();
- break;
- }
- }
-
- // Update the selected fragment in the viewpager if it does not agree with UiDataModel.
- for (int i = 0; i < mFragmentTabPagerAdapter.getCount(); i++) {
- final DeskClockFragment fragment = mFragmentTabPagerAdapter.getDeskClockFragment(i);
- if (fragment.isTabSelected() && mFragmentTabPager.getCurrentItem() != i) {
- mFragmentTabPager.setCurrentItem(i);
- break;
- }
- }
+ // Update the selected tab in the mBottomNavigation if it does not agree with UiDataModel.
+ mBottomNavigation.setSelectedItemId(selectedTab.getPageResId());
+ mFragmentUtils.showFragment(selectedTab);
+ mTitleView.setText(selectedTab.getLabelResId());
}
/**
* @return the DeskClockFragment that is currently selected according to UiDataModel
*/
private DeskClockFragment getSelectedDeskClockFragment() {
- for (int i = 0; i < mFragmentTabPagerAdapter.getCount(); i++) {
- final DeskClockFragment fragment = mFragmentTabPagerAdapter.getDeskClockFragment(i);
- if (fragment.isTabSelected()) {
- return fragment;
- }
- }
- final UiDataModel.Tab selectedTab = UiDataModel.getUiDataModel().getSelectedTab();
- throw new IllegalStateException("Unable to locate selected fragment (" + selectedTab + ")");
+ return mFragmentUtils.getCurrentFragment();
}
/**
@@ -534,93 +476,6 @@
}
/**
- * As the view pager changes the selected page, update the model to record the new selected tab.
- */
- private final class PageChangeWatcher implements OnPageChangeListener {
-
- /** The last reported page scroll state; used to detect exotic state changes. */
- private int mPriorState = SCROLL_STATE_IDLE;
-
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- // Only hide the fab when a non-zero drag distance is detected. This prevents
- // over-scrolling from needlessly hiding the fab.
- if (mFabState == FabState.HIDE_ARMED && positionOffsetPixels != 0) {
- mFabState = FabState.HIDING;
- mHideAnimation.start();
- }
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- if (mPriorState == SCROLL_STATE_IDLE && state == SCROLL_STATE_SETTLING) {
- // The user has tapped a tab button; play the hide and show animations linearly.
- mHideAnimation.addListener(mAutoStartShowListener);
- mHideAnimation.start();
- mFabState = FabState.HIDING;
- } else if (mPriorState == SCROLL_STATE_SETTLING && state == SCROLL_STATE_DRAGGING) {
- // The user has interrupted settling on a tab and the fab button must be re-hidden.
- if (mShowAnimation.isStarted()) {
- mShowAnimation.cancel();
- }
- if (mHideAnimation.isStarted()) {
- // Let the hide animation finish naturally; don't auto show when it ends.
- mHideAnimation.removeListener(mAutoStartShowListener);
- } else {
- // Start and immediately end the hide animation to jump to the hidden state.
- mHideAnimation.start();
- mHideAnimation.end();
- }
- mFabState = FabState.HIDING;
-
- } else if (state != SCROLL_STATE_DRAGGING && mFabState == FabState.HIDING) {
- // The user has lifted their finger; show the buttons now or after hide ends.
- if (mHideAnimation.isStarted()) {
- // Finish the hide animation and then start the show animation.
- mHideAnimation.addListener(mAutoStartShowListener);
- } else {
- updateFab(FAB_AND_BUTTONS_IMMEDIATE);
- mShowAnimation.start();
-
- // The animation to show the fab has begun; update the state to showing.
- mFabState = FabState.SHOWING;
- }
- } else if (state == SCROLL_STATE_DRAGGING) {
- // The user has started a drag so arm the hide animation.
- mFabState = FabState.HIDE_ARMED;
- }
-
- // Update the last known state.
- mPriorState = state;
- }
-
- @Override
- public void onPageSelected(int position) {
- mFragmentTabPagerAdapter.getDeskClockFragment(position).selectTab();
- }
- }
-
- /**
- * If this listener is attached to {@link #mHideAnimation} when it ends, the corresponding
- * {@link #mShowAnimation} is automatically started.
- */
- private final class AutoStartShowListener extends AnimatorListenerAdapter {
- @Override
- public void onAnimationEnd(Animator animation) {
- // Prepare the hide animation for its next use; by default do not auto-show after hide.
- mHideAnimation.removeListener(mAutoStartShowListener);
-
- // Update the buttons now that they are no longer visible.
- updateFab(FAB_AND_BUTTONS_IMMEDIATE);
-
- // Automatically start the grow animation now that shrinking is complete.
- mShowAnimation.start();
-
- // The animation to show the fab has begun; update the state to showing.
- mFabState = FabState.SHOWING;
- }
- }
-
- /**
* Shows/hides a snackbar as silencing settings are enabled/disabled.
*/
private final class SilentSettingChangeWatcher implements OnSilentSettingsListener {
diff --git a/src/com/android/deskclock/DeskClockFragment.java b/src/com/android/deskclock/DeskClockFragment.java
index a9e3fc6..1f51a33 100644
--- a/src/com/android/deskclock/DeskClockFragment.java
+++ b/src/com/android/deskclock/DeskClockFragment.java
@@ -16,12 +16,12 @@
package com.android.deskclock;
-import android.app.Fragment;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
import android.view.KeyEvent;
import android.widget.Button;
import android.widget.ImageView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
import com.android.deskclock.uidata.UiDataModel;
import com.android.deskclock.uidata.UiDataModel.Tab;
diff --git a/src/com/android/deskclock/FabController.java b/src/com/android/deskclock/FabController.java
index bab7f46..11c5d53 100644
--- a/src/com/android/deskclock/FabController.java
+++ b/src/com/android/deskclock/FabController.java
@@ -57,4 +57,10 @@
* @param right the button to the right of the fab component
*/
void onRightButtonClick(@NonNull Button right);
-}
\ No newline at end of file
+
+ /**
+ *
+ * @return the target visibility of the FAB component
+ */
+ int getFabTargetVisibility();
+}
diff --git a/src/com/android/deskclock/FragmentTabPagerAdapter.java b/src/com/android/deskclock/FragmentTabPagerAdapter.java
deleted file mode 100644
index 3682c86..0000000
--- a/src/com/android/deskclock/FragmentTabPagerAdapter.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2016 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;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import androidx.legacy.app.FragmentCompat;
-import androidx.viewpager.widget.PagerAdapter;
-import android.util.ArrayMap;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.deskclock.uidata.UiDataModel;
-
-import java.util.Map;
-
-/**
- * This adapter produces the DeskClockFragments that are the content of the DeskClock tabs. The
- * adapter presents the tabs in LTR and RTL order depending on the text layout direction for the
- * current locale. To prevent issues when switching between LTR and RTL, fragments are registered
- * with the manager using position-independent tags, which is an important departure from
- * FragmentPagerAdapter.
- */
-final class FragmentTabPagerAdapter extends PagerAdapter {
-
- private final DeskClock mDeskClock;
-
- /** The manager into which fragments are added. */
- private final FragmentManager mFragmentManager;
-
- /** A fragment cache that can be accessed before {@link #instantiateItem} is called. */
- private final Map<UiDataModel.Tab, DeskClockFragment> mFragmentCache;
-
- /** The active fragment transaction if one exists. */
- private FragmentTransaction mCurrentTransaction;
-
- /** The current fragment displayed to the user. */
- private Fragment mCurrentPrimaryItem;
-
- FragmentTabPagerAdapter(DeskClock deskClock) {
- mDeskClock = deskClock;
- mFragmentCache = new ArrayMap<>(getCount());
- mFragmentManager = deskClock.getFragmentManager();
- }
-
- @Override
- public int getCount() {
- return UiDataModel.getUiDataModel().getTabCount();
- }
-
- /**
- * @param position the left-to-right index of the fragment to be returned
- * @return the fragment displayed at the given {@code position}
- */
- DeskClockFragment getDeskClockFragment(int position) {
- // Fetch the tab the UiDataModel reports for the position.
- final UiDataModel.Tab tab = UiDataModel.getUiDataModel().getTabAt(position);
-
- // First check the local cache for the fragment.
- DeskClockFragment fragment = mFragmentCache.get(tab);
- if (fragment != null) {
- return fragment;
- }
-
- // Next check the fragment manager; relevant when app is rebuilt after locale changes
- // because this adapter will be new and mFragmentCache will be empty, but the fragment
- // manager will retain the Fragments built on original application launch.
- fragment = (DeskClockFragment) mFragmentManager.findFragmentByTag(tab.name());
- if (fragment != null) {
- fragment.setFabContainer(mDeskClock);
- mFragmentCache.put(tab, fragment);
- return fragment;
- }
-
- // Otherwise, build the fragment from scratch.
- final String fragmentClassName = tab.getFragmentClassName();
- fragment = (DeskClockFragment) Fragment.instantiate(mDeskClock, fragmentClassName);
- fragment.setFabContainer(mDeskClock);
- mFragmentCache.put(tab, fragment);
- return fragment;
- }
-
- @Override
- public void startUpdate(ViewGroup container) {
- if (container.getId() == View.NO_ID) {
- throw new IllegalStateException("ViewPager with adapter " + this + " has no id");
- }
- }
-
- @Override
- public Object instantiateItem(ViewGroup container, int position) {
- if (mCurrentTransaction == null) {
- mCurrentTransaction = mFragmentManager.beginTransaction();
- }
-
- // Use the fragment located in the fragment manager if one exists.
- final UiDataModel.Tab tab = UiDataModel.getUiDataModel().getTabAt(position);
- Fragment fragment = mFragmentManager.findFragmentByTag(tab.name());
- if (fragment != null) {
- mCurrentTransaction.attach(fragment);
- } else {
- fragment = getDeskClockFragment(position);
- mCurrentTransaction.add(container.getId(), fragment, tab.name());
- }
-
- if (fragment != mCurrentPrimaryItem) {
- FragmentCompat.setMenuVisibility(fragment, false);
- FragmentCompat.setUserVisibleHint(fragment, false);
- }
-
- return fragment;
- }
-
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- if (mCurrentTransaction == null) {
- mCurrentTransaction = mFragmentManager.beginTransaction();
- }
- final DeskClockFragment fragment = (DeskClockFragment) object;
- fragment.setFabContainer(null);
- mCurrentTransaction.detach(fragment);
- }
-
- @Override
- public void setPrimaryItem(ViewGroup container, int position, Object object) {
- final Fragment fragment = (Fragment) object;
- if (fragment != mCurrentPrimaryItem) {
- if (mCurrentPrimaryItem != null) {
- FragmentCompat.setMenuVisibility(mCurrentPrimaryItem, false);
- FragmentCompat.setUserVisibleHint(mCurrentPrimaryItem, false);
- }
- if (fragment != null) {
- FragmentCompat.setMenuVisibility(fragment, true);
- FragmentCompat.setUserVisibleHint(fragment, true);
- }
- mCurrentPrimaryItem = fragment;
- }
- }
-
- @Override
- public void finishUpdate(ViewGroup container) {
- if (mCurrentTransaction != null) {
- mCurrentTransaction.commitAllowingStateLoss();
- mCurrentTransaction = null;
- mFragmentManager.executePendingTransactions();
- }
- }
-
- @Override
- public boolean isViewFromObject(View view, Object object) {
- return ((Fragment) object).getView() == view;
- }
-}
\ No newline at end of file
diff --git a/src/com/android/deskclock/FragmentUtils.java b/src/com/android/deskclock/FragmentUtils.java
new file mode 100644
index 0000000..859e1f5
--- /dev/null
+++ b/src/com/android/deskclock/FragmentUtils.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2020 The LineageOS 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;
+
+import android.util.ArrayMap;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.android.deskclock.uidata.UiDataModel;
+
+import java.util.Map;
+
+/**
+ * This class produces the DeskClockFragments that are the content of the DeskClock tabs.
+ * It presents the tabs in LTR and RTL order depending on the text layout direction for the
+ * current locale. To prevent issues when switching between LTR and RTL, fragments are registered
+ * with the manager using position-independent tags, which is an important departure from
+ * FragmentPagerAdapter.
+ */
+public final class FragmentUtils {
+
+ private final DeskClock mDeskClock;
+
+ /** The manager into which fragments are added. */
+ private final FragmentManager mFragmentManager;
+
+ /** A fragment cache that can be accessed before {@link #instantiateItem} is called. */
+ private final Map<UiDataModel.Tab, DeskClockFragment> mFragmentCache;
+
+ /** The current fragment displayed to the user. */
+ private DeskClockFragment mCurrentPrimaryItem;
+
+ FragmentUtils(DeskClock deskClock) {
+ mDeskClock = deskClock;
+ mFragmentCache = new ArrayMap<>(getCount());
+ mFragmentManager = deskClock.getSupportFragmentManager();
+ }
+
+ private int getCount() {
+ return UiDataModel.getUiDataModel().getTabCount();
+ }
+
+ public DeskClockFragment getDeskClockFragment(UiDataModel.Tab tab) {
+ // First check the local cache for the fragment.
+ DeskClockFragment fragment = mFragmentCache.get(tab);
+ if (fragment != null) {
+ return fragment;
+ }
+
+ // Next check the fragment manager; relevant when app is rebuilt after locale changes
+ // because this adapter will be new and mFragmentCache will be empty, but the fragment
+ // manager will retain the Fragments built on original application launch.
+ fragment = (DeskClockFragment) mFragmentManager.findFragmentByTag(tab.name());
+ if (fragment != null) {
+ fragment.setFabContainer(mDeskClock);
+ mFragmentCache.put(tab, fragment);
+ return fragment;
+ }
+
+ // Otherwise, build the fragment from scratch.
+ final String fragmentClassName = tab.getFragmentClassName();
+ fragment = (DeskClockFragment) Fragment.instantiate(mDeskClock, fragmentClassName);
+ fragment.setFabContainer(mDeskClock);
+
+ FragmentTransaction transaction = mFragmentManager.beginTransaction();
+ transaction.add(R.id.fragment_container, fragment, tab.name());
+ transaction.commit();
+
+ mFragmentCache.put(tab, fragment);
+ return fragment;
+ }
+
+ public void hideAllFragments() {
+ FragmentTransaction transaction = mFragmentManager.beginTransaction();
+ for (UiDataModel.Tab tab : UiDataModel.Tab.values()) {
+ Fragment fragment = mFragmentManager.findFragmentByTag(tab.name());
+ if (fragment != null) {
+ transaction.hide(fragment);
+ }
+ }
+
+ transaction.commit();
+ }
+
+ public void showFragment(UiDataModel.Tab tab) {
+ hideAllFragments();
+ Fragment fragment = getDeskClockFragment(tab);
+ mFragmentManager.beginTransaction().show(fragment).commit();
+ mCurrentPrimaryItem = (DeskClockFragment) fragment;
+ }
+
+ public DeskClockFragment getCurrentFragment() {
+ return mCurrentPrimaryItem;
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/deskclock/LabelDialogFragment.java b/src/com/android/deskclock/LabelDialogFragment.java
index 0fa0eab..eab0545 100644
--- a/src/com/android/deskclock/LabelDialogFragment.java
+++ b/src/com/android/deskclock/LabelDialogFragment.java
@@ -17,16 +17,11 @@
package com.android.deskclock;
import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.os.Bundle;
-import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.AppCompatEditText;
import android.text.Editable;
@@ -37,6 +32,11 @@
import android.view.Window;
import android.view.inputmethod.EditorInfo;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
import com.android.deskclock.data.DataModel;
import com.android.deskclock.data.Timer;
diff --git a/src/com/android/deskclock/NotificationUtils.java b/src/com/android/deskclock/NotificationUtils.java
new file mode 100644
index 0000000..9f54145
--- /dev/null
+++ b/src/com/android/deskclock/NotificationUtils.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2020 The LineageOS 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;
+
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_DEFAULT;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_HIGH;
+import static androidx.core.app.NotificationManagerCompat.IMPORTANCE_LOW;
+
+import android.app.NotificationChannel;
+import android.content.Context;
+import android.util.ArraySet;
+import android.util.Log;
+import androidx.core.app.NotificationManagerCompat;
+
+import com.android.deskclock.Utils;
+import com.android.deskclock.alarms.AlarmNotifications;
+import com.android.deskclock.data.StopwatchNotificationBuilder;
+import com.android.deskclock.data.TimerNotificationBuilder;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class NotificationUtils {
+
+ private static final String TAG = NotificationUtils.class.getSimpleName();
+
+ /**
+ * Notification channel containing all missed alarm notifications.
+ */
+ public static final String ALARM_MISSED_NOTIFICATION_CHANNEL_ID = "alarmMissedNotification";
+
+ /**
+ * Notification channel containing all upcoming alarm notifications.
+ */
+ public static final String ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID = "alarmUpcomingNotification";
+
+ /**
+ * Notification channel containing all snooze notifications.
+ */
+ public static final String ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID = "alarmSnoozingNotification";
+
+ /**
+ * Notification channel containing all firing alarm and timer notifications.
+ */
+ public static final String FIRING_NOTIFICATION_CHANNEL_ID = "firingAlarmsAndTimersNotification";
+
+ /**
+ * Notification channel containing all TimerModel notifications.
+ */
+ public static final String TIMER_MODEL_NOTIFICATION_CHANNEL_ID = "timerNotification";
+
+ /**
+ * Notification channel containing all stopwatch notifications.
+ */
+ public static final String STOPWATCH_NOTIFICATION_CHANNEL_ID = "stopwatchNotification";
+
+ /**
+ * Values used to bitmask certain channel defaults
+ */
+ private static final int PLAY_SOUND = 0x01;
+ private static final int ENABLE_LIGHTS = 0x02;
+ private static final int ENABLE_VIBRATION = 0x04;
+
+ private static Map<String, int[]> CHANNEL_PROPS = new HashMap<String, int[]>();
+ static {
+ CHANNEL_PROPS.put(ALARM_MISSED_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.alarm_missed_channel,
+ IMPORTANCE_HIGH
+ });
+ CHANNEL_PROPS.put(ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.alarm_snooze_channel,
+ IMPORTANCE_LOW
+ });
+ CHANNEL_PROPS.put(ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.alarm_upcoming_channel,
+ IMPORTANCE_LOW
+ });
+ CHANNEL_PROPS.put(FIRING_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.firing_alarms_timers_channel,
+ IMPORTANCE_HIGH,
+ ENABLE_LIGHTS
+ });
+ CHANNEL_PROPS.put(STOPWATCH_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.stopwatch_channel,
+ IMPORTANCE_LOW
+ });
+ CHANNEL_PROPS.put(TIMER_MODEL_NOTIFICATION_CHANNEL_ID, new int[]{
+ R.string.timer_channel,
+ IMPORTANCE_LOW
+ });
+ }
+
+ public static void createChannel(Context context, String id) {
+ if (!Utils.isOOrLater()) {
+ return;
+ }
+
+ if (!CHANNEL_PROPS.containsKey(id)) {
+ Log.e(TAG, "Invalid channel requested: " + id);
+ return;
+ }
+
+ int[] properties = (int[]) CHANNEL_PROPS.get(id);
+ int nameId = properties[0];
+ int importance = properties[1];
+ NotificationChannel channel = new NotificationChannel(
+ id, context.getString(nameId), importance);
+ if (properties.length >= 3) {
+ int bits = properties[2];
+ channel.enableLights((bits & ENABLE_LIGHTS) != 0);
+ channel.enableVibration((bits & ENABLE_VIBRATION) != 0);
+ if ((bits & PLAY_SOUND) == 0) {
+ channel.setSound(null, null);
+ }
+ }
+ NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ nm.createNotificationChannel(channel);
+ }
+
+ private static void deleteChannel(NotificationManagerCompat nm, String channelId) {
+ NotificationChannel channel = nm.getNotificationChannel(channelId);
+ if (channel != null) {
+ nm.deleteNotificationChannel(channelId);
+ }
+ }
+
+ private static Set<String> getAllExistingChannelIds(NotificationManagerCompat nm) {
+ Set<String> result = new ArraySet<>();
+ for (NotificationChannel channel : nm.getNotificationChannels()) {
+ result.add(channel.getId());
+ }
+ return result;
+ }
+
+ public static void updateNotificationChannels(Context context) {
+ if (!Utils.isOOrLater()) {
+ return;
+ }
+
+ NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+
+ // These channels got a new behavior so we need to recreate them with new ids
+ deleteChannel(nm, "alarmLowPriorityNotification");
+ deleteChannel(nm, "alarmHighPriorityNotification");
+ deleteChannel(nm, "StopwatchNotification");
+ deleteChannel(nm, "alarmNotification");
+ deleteChannel(nm, "TimerModelNotification");
+ deleteChannel(nm, "firingAlarmsTimersNotification");
+ deleteChannel(nm, "alarmSnoozeNotification");
+
+ // We recreate all existing channels so any language change or our name changes propagate
+ // to the actual channels
+ Set<String> existingChannelIds = getAllExistingChannelIds(nm);
+ for (String id : existingChannelIds) {
+ createChannel(context, id);
+ }
+ }
+}
diff --git a/src/com/android/deskclock/Utils.java b/src/com/android/deskclock/Utils.java
index 0c9daf6..6d97912 100644
--- a/src/com/android/deskclock/Utils.java
+++ b/src/com/android/deskclock/Utils.java
@@ -157,6 +157,13 @@
}
/**
+ * @return {@code true} if the device is {@link Build.VERSION_CODES#O} or later
+ */
+ public static boolean isOOrLater() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
+ }
+
+ /**
* @param resourceId identifies an application resource
* @return the Uri by which the application resource is accessed
*/
diff --git a/src/com/android/deskclock/alarms/AlarmNotifications.java b/src/com/android/deskclock/alarms/AlarmNotifications.java
index 0f2d0a7..4c3c8ae 100644
--- a/src/com/android/deskclock/alarms/AlarmNotifications.java
+++ b/src/com/android/deskclock/alarms/AlarmNotifications.java
@@ -15,8 +15,14 @@
*/
package com.android.deskclock.alarms;
+import static com.android.deskclock.NotificationUtils.ALARM_MISSED_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.FIRING_NOTIFICATION_CHANNEL_ID;
+
import android.annotation.TargetApi;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
@@ -33,6 +39,7 @@
import com.android.deskclock.AlarmUtils;
import com.android.deskclock.DeskClock;
import com.android.deskclock.LogUtils;
+import com.android.deskclock.NotificationUtils;
import com.android.deskclock.R;
import com.android.deskclock.Utils;
import com.android.deskclock.provider.Alarm;
@@ -82,35 +89,41 @@
*/
private static final int ALARM_FIRING_NOTIFICATION_ID = Integer.MAX_VALUE - 7;
- static synchronized void showLowPriorityNotification(Context context,
- AlarmInstance instance) {
- LogUtils.v("Displaying low priority notification for alarm instance: " + instance.mId);
+ static synchronized void showUpcomingNotification(Context context,
+ AlarmInstance instance, boolean lowPriority) {
+ LogUtils.v("Displaying upcoming alarm notification for alarm instance: " + instance.mId +
+ "low priority: " + lowPriority);
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(context.getString(
- R.string.alarm_alert_predismiss_title))
- .setContentText(AlarmUtils.getAlarmText(context, instance, true /* includeLabel */))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setAutoCancel(false)
- .setSortKey(createSortKey(instance))
- .setPriority(NotificationCompat.PRIORITY_DEFAULT)
- .setCategory(NotificationCompat.CATEGORY_EVENT)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(
+ context, ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID)
+ .setShowWhen(false)
+ .setContentTitle(context.getString(
+ R.string.alarm_alert_predismiss_title))
+ .setContentText(AlarmUtils.getAlarmText(
+ context, instance, true /* includeLabel */))
+ .setColor(ContextCompat.getColor(context, R.color.default_background))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setAutoCancel(false)
+ .setSortKey(createSortKey(instance))
+ .setPriority(NotificationCompat.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
if (Utils.isNOrLater()) {
builder.setGroup(UPCOMING_GROUP_KEY);
}
- // Setup up hide notification
- Intent hideIntent = AlarmStateManager.createStateChangeIntent(context,
- AlarmStateManager.ALARM_DELETE_TAG, instance,
- AlarmInstance.HIDE_NOTIFICATION_STATE);
final int id = instance.hashCode();
- builder.setDeleteIntent(PendingIntent.getService(context, id,
- hideIntent, PendingIntent.FLAG_UPDATE_CURRENT));
+ if (lowPriority) {
+ // Setup up hide notification
+ Intent hideIntent = AlarmStateManager.createStateChangeIntent(context,
+ AlarmStateManager.ALARM_DELETE_TAG, instance,
+ AlarmInstance.HIDE_NOTIFICATION_STATE);
+
+ builder.setDeleteIntent(PendingIntent.getService(context, id,
+ hideIntent, PendingIntent.FLAG_UPDATE_CURRENT));
+ }
// Setup up dismiss action
Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
@@ -126,47 +139,7 @@
viewAlarmIntent, PendingIntent.FLAG_UPDATE_CURRENT));
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
- final Notification notification = builder.build();
- nm.notify(id, notification);
- updateUpcomingAlarmGroupNotification(context, -1, notification);
- }
-
- static synchronized void showHighPriorityNotification(Context context,
- AlarmInstance instance) {
- LogUtils.v("Displaying high priority notification for alarm instance: " + instance.mId);
-
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(context.getString(R.string.alarm_alert_predismiss_title))
- .setContentText(AlarmUtils.getAlarmText(context, instance, true /* includeLabel */))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setAutoCancel(false)
- .setSortKey(createSortKey(instance))
- .setPriority(NotificationCompat.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_EVENT)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
-
- if (Utils.isNOrLater()) {
- builder.setGroup(UPCOMING_GROUP_KEY);
- }
-
- // Setup up dismiss action
- Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,
- AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.PREDISMISSED_STATE);
- final int id = instance.hashCode();
- builder.addAction(R.drawable.ic_alarm_off_24dp,
- context.getString(R.string.alarm_alert_dismiss_text),
- PendingIntent.getService(context, id,
- dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT));
-
- // Setup content action if instance is owned by alarm
- Intent viewAlarmIntent = createViewAlarmIntent(context, instance);
- builder.setContentIntent(PendingIntent.getActivity(context, id,
- viewAlarmIntent, PendingIntent.FLAG_UPDATE_CURRENT));
-
- NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ NotificationUtils.createChannel(context, ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID);
final Notification notification = builder.build();
nm.notify(id, notification);
updateUpcomingAlarmGroupNotification(context, -1, notification);
@@ -232,7 +205,6 @@
}
final NotificationManagerCompat nm = NotificationManagerCompat.from(context);
-
final Notification firstUpcoming = getFirstActiveNotification(context, UPCOMING_GROUP_KEY,
canceledNotificationId, postedNotification);
if (firstUpcoming == null) {
@@ -243,14 +215,16 @@
Notification summary = getActiveGroupSummaryNotification(context, UPCOMING_GROUP_KEY);
if (summary == null
|| !Objects.equals(summary.contentIntent, firstUpcoming.contentIntent)) {
- summary = new NotificationCompat.Builder(context)
+ NotificationUtils.createChannel(context, ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID);
+ summary = new NotificationCompat.Builder(context,
+ ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID)
.setShowWhen(false)
.setContentIntent(firstUpcoming.contentIntent)
.setColor(ContextCompat.getColor(context, R.color.default_background))
.setSmallIcon(R.drawable.stat_notify_alarm)
.setGroup(UPCOMING_GROUP_KEY)
.setGroupSummary(true)
- .setPriority(NotificationCompat.PRIORITY_HIGH)
+ .setPriority(NotificationCompat.PRIORITY_LOW)
.setCategory(NotificationCompat.CATEGORY_EVENT)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setLocalOnly(true)
@@ -266,7 +240,6 @@
}
final NotificationManagerCompat nm = NotificationManagerCompat.from(context);
-
final Notification firstMissed = getFirstActiveNotification(context, MISSED_GROUP_KEY,
canceledNotificationId, postedNotification);
if (firstMissed == null) {
@@ -277,7 +250,8 @@
Notification summary = getActiveGroupSummaryNotification(context, MISSED_GROUP_KEY);
if (summary == null
|| !Objects.equals(summary.contentIntent, firstMissed.contentIntent)) {
- summary = new NotificationCompat.Builder(context)
+ NotificationUtils.createChannel(context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID);
+ summary = new NotificationCompat.Builder(context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID)
.setShowWhen(false)
.setContentIntent(firstMissed.contentIntent)
.setColor(ContextCompat.getColor(context, R.color.default_background))
@@ -297,19 +271,20 @@
AlarmInstance instance) {
LogUtils.v("Displaying snoozed notification for alarm instance: " + instance.mId);
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(instance.getLabelOrDefault(context))
- .setContentText(context.getString(R.string.alarm_alert_snooze_until,
- AlarmUtils.getFormattedTime(context, instance.getAlarmTime())))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setAutoCancel(false)
- .setSortKey(createSortKey(instance))
- .setPriority(NotificationCompat.PRIORITY_MAX)
- .setCategory(NotificationCompat.CATEGORY_EVENT)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(
+ context, ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID)
+ .setShowWhen(false)
+ .setContentTitle(instance.getLabelOrDefault(context))
+ .setContentText(context.getString(R.string.alarm_alert_snooze_until,
+ AlarmUtils.getFormattedTime(context, instance.getAlarmTime())))
+ .setColor(ContextCompat.getColor(context, R.color.default_background))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setAutoCancel(false)
+ .setSortKey(createSortKey(instance))
+ .setPriority(NotificationCompat.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
if (Utils.isNOrLater()) {
builder.setGroup(UPCOMING_GROUP_KEY);
@@ -330,6 +305,7 @@
viewAlarmIntent, PendingIntent.FLAG_UPDATE_CURRENT));
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ NotificationUtils.createChannel(context, ALARM_SNOOZE_NOTIFICATION_CHANNEL_ID);
final Notification notification = builder.build();
nm.notify(id, notification);
updateUpcomingAlarmGroupNotification(context, -1, notification);
@@ -341,18 +317,19 @@
String label = instance.mLabel;
String alarmTime = AlarmUtils.getFormattedTime(context, instance.getAlarmTime());
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
- .setShowWhen(false)
- .setContentTitle(context.getString(R.string.alarm_missed_title))
- .setContentText(instance.mLabel.isEmpty() ? alarmTime :
- context.getString(R.string.alarm_missed_text, alarmTime, label))
- .setColor(ContextCompat.getColor(context, R.color.default_background))
- .setSortKey(createSortKey(instance))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setPriority(NotificationCompat.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_EVENT)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(
+ context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID)
+ .setShowWhen(false)
+ .setContentTitle(context.getString(R.string.alarm_missed_title))
+ .setContentText(instance.mLabel.isEmpty() ? alarmTime :
+ context.getString(R.string.alarm_missed_text, alarmTime, label))
+ .setColor(ContextCompat.getColor(context, R.color.default_background))
+ .setSortKey(createSortKey(instance))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setPriority(NotificationCompat.PRIORITY_HIGH)
+ .setCategory(NotificationCompat.CATEGORY_EVENT)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
if (Utils.isNOrLater()) {
builder.setGroup(MISSED_GROUP_KEY);
@@ -375,6 +352,7 @@
showAndDismiss, PendingIntent.FLAG_UPDATE_CURRENT));
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
+ NotificationUtils.createChannel(context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID);
final Notification notification = builder.build();
nm.notify(id, notification);
updateMissedAlarmGroupNotification(context, -1, notification);
@@ -384,18 +362,20 @@
LogUtils.v("Displaying alarm notification for alarm instance: " + instance.mId);
Resources resources = service.getResources();
- NotificationCompat.Builder notification = new NotificationCompat.Builder(service)
- .setContentTitle(instance.getLabelOrDefault(service))
- .setContentText(AlarmUtils.getFormattedTime(service, instance.getAlarmTime()))
- .setColor(ContextCompat.getColor(service, R.color.default_background))
- .setSmallIcon(R.drawable.stat_notify_alarm)
- .setOngoing(true)
- .setAutoCancel(false)
- .setDefaults(NotificationCompat.DEFAULT_LIGHTS)
- .setWhen(0)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setLocalOnly(true);
+ NotificationCompat.Builder notification = new NotificationCompat.Builder(
+ service, FIRING_NOTIFICATION_CHANNEL_ID)
+ .setContentTitle(instance.getLabelOrDefault(service))
+ .setContentText(AlarmUtils.getFormattedTime(
+ service, instance.getAlarmTime()))
+ .setColor(ContextCompat.getColor(service, R.color.default_background))
+ .setSmallIcon(R.drawable.stat_notify_alarm)
+ .setOngoing(true)
+ .setAutoCancel(false)
+ .setDefaults(NotificationCompat.DEFAULT_LIGHTS)
+ .setWhen(0)
+ .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setLocalOnly(true);
// Setup Snooze Action
Intent snoozeIntent = AlarmStateManager.createStateChangeIntent(service,
@@ -432,8 +412,9 @@
notification.setFullScreenIntent(PendingIntent.getActivity(service,
ALARM_FIRING_NOTIFICATION_ID, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT),
true);
- notification.setPriority(NotificationCompat.PRIORITY_MAX);
+ notification.setPriority(NotificationCompat.PRIORITY_HIGH);
+ NotificationUtils.createChannel(service, FIRING_NOTIFICATION_CHANNEL_ID);
clearNotification(service, instance);
service.startForeground(ALARM_FIRING_NOTIFICATION_ID, notification.build());
}
@@ -453,10 +434,10 @@
static void updateNotification(Context context, AlarmInstance instance) {
switch (instance.mAlarmState) {
case AlarmInstance.LOW_NOTIFICATION_STATE:
- showLowPriorityNotification(context, instance);
+ showUpcomingNotification(context, instance, true);
break;
case AlarmInstance.HIGH_NOTIFICATION_STATE:
- showHighPriorityNotification(context, instance);
+ showUpcomingNotification(context, instance, false);
break;
case AlarmInstance.SNOOZE_STATE:
showSnoozeNotification(context, instance);
diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java
index 6f6664e..4f91f84 100644
--- a/src/com/android/deskclock/alarms/AlarmStateManager.java
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.java
@@ -398,7 +398,7 @@
AlarmInstance.updateInstance(contentResolver, instance);
// Setup instance notification and scheduling timers
- AlarmNotifications.showLowPriorityNotification(context, instance);
+ AlarmNotifications.showUpcomingNotification(context, instance, true);
scheduleInstanceStateChange(context, instance.getHighNotificationTime(),
instance, AlarmInstance.HIGH_NOTIFICATION_STATE);
}
@@ -442,7 +442,7 @@
AlarmInstance.updateInstance(contentResolver, instance);
// Setup instance notification and scheduling timers
- AlarmNotifications.showHighPriorityNotification(context, instance);
+ AlarmNotifications.showUpcomingNotification(context, instance, false);
scheduleInstanceStateChange(context, instance.getAlarmTime(),
instance, AlarmInstance.FIRED_STATE);
}
diff --git a/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java b/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java
index 6c94649..c22bbce 100644
--- a/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java
+++ b/src/com/android/deskclock/alarms/AlarmTimeClickHandler.java
@@ -16,11 +16,11 @@
package com.android.deskclock.alarms;
-import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Vibrator;
+import androidx.fragment.app.Fragment;
import com.android.deskclock.AlarmClockFragment;
import com.android.deskclock.LabelDialogFragment;
diff --git a/src/com/android/deskclock/alarms/TimePickerDialogFragment.java b/src/com/android/deskclock/alarms/TimePickerDialogFragment.java
index 33fc757..653b516 100644
--- a/src/com/android/deskclock/alarms/TimePickerDialogFragment.java
+++ b/src/com/android/deskclock/alarms/TimePickerDialogFragment.java
@@ -17,9 +17,6 @@
package com.android.deskclock.alarms;
import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.app.FragmentManager;
import android.app.TimePickerDialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -27,6 +24,9 @@
import androidx.appcompat.app.AlertDialog;
import android.text.format.DateFormat;
import android.widget.TimePicker;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
import com.android.deskclock.Utils;
diff --git a/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java b/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java
index d9c4986..a39ad61 100644
--- a/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java
+++ b/src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java
@@ -36,8 +36,8 @@
public abstract class AlarmItemViewHolder extends ItemAdapter.ItemViewHolder<AlarmItemHolder>
implements ItemAnimator.OnAnimateChangeListener {
- private static final float CLOCK_ENABLED_ALPHA = 1f;
- private static final float CLOCK_DISABLED_ALPHA = 0.69f;
+ public static final float CLOCK_ENABLED_ALPHA = 1f;
+ public static final float CLOCK_DISABLED_ALPHA = 0.69f;
public static final float ANIM_STANDARD_DELAY_MULTIPLIER = 1f / 6f;
public static final float ANIM_LONG_DURATION_MULTIPLIER = 2f / 3f;
diff --git a/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java b/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java
index 70ed1bb..4c04076 100644
--- a/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java
+++ b/src/com/android/deskclock/alarms/dataadapter/CollapsedAlarmViewHolder.java
@@ -52,6 +52,8 @@
private final TextView upcomingInstanceLabel;
private final View hairLine;
+ private float annotationsAlpha = CLOCK_ENABLED_ALPHA;
+
private CollapsedAlarmViewHolder(View itemView) {
super(itemView);
@@ -105,6 +107,7 @@
bindReadOnlyLabel(context, alarm);
bindUpcomingInstance(context, alarm);
bindPreemptiveDismissButton(context, alarm, alarmInstance);
+ bindAnnotations(context, alarm);
}
private void bindReadOnlyLabel(Context context, Alarm alarm) {
@@ -145,6 +148,11 @@
}
}
+ private void bindAnnotations(Context context, Alarm alarm) {
+ annotationsAlpha = alarm.enabled ? CLOCK_ENABLED_ALPHA : CLOCK_DISABLED_ALPHA;
+ setChangingViewsAlpha(annotationsAlpha);
+ }
+
@Override
public Animator onAnimateChange(List<Object> payloads, int fromLeft, int fromTop, int fromRight,
int fromBottom, long duration) {
@@ -161,7 +169,7 @@
}
final boolean isCollapsing = this == newHolder;
- setChangingViewsAlpha(isCollapsing ? 0f : 1f);
+ setChangingViewsAlpha(isCollapsing ? 0f : annotationsAlpha);
final Animator changeAnimatorSet = isCollapsing
? createCollapsingAnimator((AlarmItemViewHolder) oldHolder, duration)
@@ -173,7 +181,7 @@
onOff.setVisibility(View.VISIBLE);
arrow.setVisibility(View.VISIBLE);
arrow.setTranslationY(0f);
- setChangingViewsAlpha(1f);
+ setChangingViewsAlpha(annotationsAlpha);
arrow.jumpDrawablesToCurrentState();
}
});
@@ -208,11 +216,11 @@
private Animator createCollapsingAnimator(AlarmItemViewHolder oldHolder, long duration) {
final AnimatorSet alphaAnimatorSet = new AnimatorSet();
alphaAnimatorSet.playTogether(
- ObjectAnimator.ofFloat(alarmLabel, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(daysOfWeek, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(upcomingInstanceLabel, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(preemptiveDismissButton, View.ALPHA, 1f),
- ObjectAnimator.ofFloat(hairLine, View.ALPHA, 1f));
+ ObjectAnimator.ofFloat(alarmLabel, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(daysOfWeek, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(upcomingInstanceLabel, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(preemptiveDismissButton, View.ALPHA, annotationsAlpha),
+ ObjectAnimator.ofFloat(hairLine, View.ALPHA, annotationsAlpha));
final long standardDelay = (long) (duration * ANIM_STANDARD_DELAY_MULTIPLIER);
alphaAnimatorSet.setDuration(standardDelay);
alphaAnimatorSet.setStartDelay(duration - standardDelay);
diff --git a/src/com/android/deskclock/data/StopwatchModel.java b/src/com/android/deskclock/data/StopwatchModel.java
index 3d4bc60..764f223 100644
--- a/src/com/android/deskclock/data/StopwatchModel.java
+++ b/src/com/android/deskclock/data/StopwatchModel.java
@@ -17,6 +17,7 @@
package com.android.deskclock.data;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -25,6 +26,8 @@
import androidx.annotation.VisibleForTesting;
import androidx.core.app.NotificationManagerCompat;
+import com.android.deskclock.R;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -252,4 +255,4 @@
updateNotification();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
index 4ca8c7b..9cf4bcb 100644
--- a/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
+++ b/src/com/android/deskclock/data/StopwatchNotificationBuilder.java
@@ -16,7 +16,10 @@
package com.android.deskclock.data;
+import static com.android.deskclock.NotificationUtils.STOPWATCH_NOTIFICATION_CHANNEL_ID;
+
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
@@ -27,9 +30,11 @@
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationCompat.Action;
import androidx.core.app.NotificationCompat.Builder;
+import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import android.widget.RemoteViews;
+import com.android.deskclock.NotificationUtils;
import com.android.deskclock.R;
import com.android.deskclock.Utils;
import com.android.deskclock.events.Events;
@@ -44,7 +49,7 @@
/**
* Builds notification to reflect the latest state of the stopwatch and recorded laps.
*/
-class StopwatchNotificationBuilder {
+public class StopwatchNotificationBuilder {
public Notification build(Context context, NotificationModel nm, Stopwatch stopwatch) {
@StringRes final int eventLabel = R.string.label_notification;
@@ -127,16 +132,17 @@
content.setViewVisibility(R.id.state, VISIBLE);
}
- final Builder notification = new NotificationCompat.Builder(context)
- .setLocalOnly(true)
- .setOngoing(running)
- .setCustomContentView(content)
- .setContentIntent(pendingShowApp)
- .setAutoCancel(stopwatch.isPaused())
- .setPriority(Notification.PRIORITY_MAX)
- .setSmallIcon(R.drawable.stat_notify_stopwatch)
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, STOPWATCH_NOTIFICATION_CHANNEL_ID)
+ .setLocalOnly(true)
+ .setOngoing(running)
+ .setCustomContentView(content)
+ .setContentIntent(pendingShowApp)
+ .setAutoCancel(stopwatch.isPaused())
+ .setPriority(Notification.PRIORITY_LOW)
+ .setSmallIcon(R.drawable.stat_notify_stopwatch)
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
if (Utils.isNOrLater()) {
notification.setGroup(nm.getStopwatchNotificationGroupKey());
@@ -146,6 +152,7 @@
notification.addAction(action);
}
+ NotificationUtils.createChannel(context, STOPWATCH_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
}
diff --git a/src/com/android/deskclock/data/TimerModel.java b/src/com/android/deskclock/data/TimerModel.java
index d24a5a6..33f02c5 100644
--- a/src/com/android/deskclock/data/TimerModel.java
+++ b/src/com/android/deskclock/data/TimerModel.java
@@ -19,6 +19,7 @@
import android.annotation.SuppressLint;
import android.app.AlarmManager;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.app.Service;
import android.content.BroadcastReceiver;
@@ -753,7 +754,6 @@
mNotificationBuilder.build(mContext, mNotificationModel, unexpired);
final int notificationId = mNotificationModel.getUnexpiredTimerNotificationId();
mNotificationManager.notify(notificationId, notification);
-
}
/**
diff --git a/src/com/android/deskclock/data/TimerNotificationBuilder.java b/src/com/android/deskclock/data/TimerNotificationBuilder.java
index 4d93053..c4e63ba 100644
--- a/src/com/android/deskclock/data/TimerNotificationBuilder.java
+++ b/src/com/android/deskclock/data/TimerNotificationBuilder.java
@@ -16,9 +16,13 @@
package com.android.deskclock.data;
+import static com.android.deskclock.NotificationUtils.FIRING_NOTIFICATION_CHANNEL_ID;
+import static com.android.deskclock.NotificationUtils.TIMER_MODEL_NOTIFICATION_CHANNEL_ID;
+
import android.annotation.TargetApi;
import android.app.AlarmManager;
import android.app.Notification;
+import android.app.NotificationChannel;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
@@ -27,11 +31,13 @@
import android.os.SystemClock;
import androidx.annotation.DrawableRes;
import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.widget.RemoteViews;
import com.android.deskclock.AlarmUtils;
+import com.android.deskclock.NotificationUtils;
import com.android.deskclock.R;
import com.android.deskclock.Utils;
import com.android.deskclock.events.Events;
@@ -49,7 +55,7 @@
/**
* Builds notifications to reflect the latest state of the timers.
*/
-class TimerNotificationBuilder {
+public class TimerNotificationBuilder {
private static final int REQUEST_CODE_UPCOMING = 0;
private static final int REQUEST_CODE_MISSING = 1;
@@ -148,19 +154,20 @@
PendingIntent.getService(context, REQUEST_CODE_UPCOMING, showApp,
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
- final Builder notification = new NotificationCompat.Builder(context)
- .setOngoing(true)
- .setLocalOnly(true)
- .setShowWhen(false)
- .setAutoCancel(false)
- .setContentIntent(pendingShowApp)
- .setPriority(Notification.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setSmallIcon(R.drawable.stat_notify_timer)
- .setSortKey(nm.getTimerNotificationSortKey())
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID)
+ .setOngoing(true)
+ .setLocalOnly(true)
+ .setShowWhen(false)
+ .setAutoCancel(false)
+ .setContentIntent(pendingShowApp)
+ .setPriority(Notification.PRIORITY_LOW)
+ .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setSmallIcon(R.drawable.stat_notify_timer)
+ .setSortKey(nm.getTimerNotificationSortKey())
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
for (Action action : actions) {
notification.addAction(action);
@@ -207,6 +214,7 @@
}
}
+ NotificationUtils.createChannel(context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
@@ -261,18 +269,19 @@
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_USER_ACTION);
final PendingIntent pendingFullScreen = Utils.pendingActivityIntent(context, fullScreen);
- final Builder notification = new NotificationCompat.Builder(context)
- .setOngoing(true)
- .setLocalOnly(true)
- .setShowWhen(false)
- .setAutoCancel(false)
- .setContentIntent(contentIntent)
- .setPriority(Notification.PRIORITY_MAX)
- .setDefaults(Notification.DEFAULT_LIGHTS)
- .setSmallIcon(R.drawable.stat_notify_timer)
- .setFullScreenIntent(pendingFullScreen, true)
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, FIRING_NOTIFICATION_CHANNEL_ID)
+ .setOngoing(true)
+ .setLocalOnly(true)
+ .setShowWhen(false)
+ .setAutoCancel(false)
+ .setContentIntent(contentIntent)
+ .setPriority(Notification.PRIORITY_HIGH)
+ .setDefaults(Notification.DEFAULT_LIGHTS)
+ .setSmallIcon(R.drawable.stat_notify_timer)
+ .setFullScreenIntent(pendingFullScreen, true)
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
for (Action action : actions) {
notification.addAction(action);
@@ -288,6 +297,7 @@
notification.setContentTitle(stateText).setContentText(contentTextPreN);
}
+ NotificationUtils.createChannel(context, FIRING_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
@@ -344,19 +354,20 @@
PendingIntent.getService(context, REQUEST_CODE_MISSING, showApp,
PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
- final Builder notification = new NotificationCompat.Builder(context)
- .setLocalOnly(true)
- .setShowWhen(false)
- .setAutoCancel(false)
- .setContentIntent(pendingShowApp)
- .setPriority(Notification.PRIORITY_HIGH)
- .setCategory(NotificationCompat.CATEGORY_ALARM)
- .setSmallIcon(R.drawable.stat_notify_timer)
- .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
- .setSortKey(nm.getTimerNotificationMissedSortKey())
- .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
- .addAction(action)
- .setColor(ContextCompat.getColor(context, R.color.default_background));
+ final Builder notification = new NotificationCompat.Builder(
+ context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID)
+ .setLocalOnly(true)
+ .setShowWhen(false)
+ .setAutoCancel(false)
+ .setContentIntent(pendingShowApp)
+ .setPriority(Notification.PRIORITY_HIGH)
+ .setCategory(NotificationCompat.CATEGORY_ALARM)
+ .setSmallIcon(R.drawable.stat_notify_timer)
+ .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ .setSortKey(nm.getTimerNotificationMissedSortKey())
+ .setStyle(new NotificationCompat.DecoratedCustomViewStyle())
+ .addAction(action)
+ .setColor(ContextCompat.getColor(context, R.color.default_background));
if (Utils.isNOrLater()) {
notification.setCustomContentView(buildChronometer(pname, base, true, stateText))
@@ -367,6 +378,7 @@
notification.setContentText(contentText).setContentTitle(stateText);
}
+ NotificationUtils.createChannel(context, TIMER_MODEL_NOTIFICATION_CHANNEL_ID);
return notification.build();
}
diff --git a/src/com/android/deskclock/provider/Alarm.java b/src/com/android/deskclock/provider/Alarm.java
index 33b6e16..48ee5b7 100644
--- a/src/com/android/deskclock/provider/Alarm.java
+++ b/src/com/android/deskclock/provider/Alarm.java
@@ -20,7 +20,6 @@
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
-import android.content.CursorLoader;
import android.content.Intent;
import android.database.Cursor;
import android.media.RingtoneManager;
@@ -28,6 +27,7 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.ParcelUuid;
+import androidx.loader.content.CursorLoader;
import com.android.deskclock.R;
import com.android.deskclock.data.DataModel;
diff --git a/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java b/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java
index 5cc6fad..906ec60 100644
--- a/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java
+++ b/src/com/android/deskclock/ringtone/AddCustomRingtoneViewHolder.java
@@ -45,7 +45,7 @@
nameView.setAlpha(0.63f);
final ImageView imageView = (ImageView) itemView.findViewById(R.id.ringtone_image);
- imageView.setImageResource(R.drawable.ic_add_white_24dp);
+ imageView.setImageResource(R.drawable.ic_add_24dp);
imageView.setAlpha(0.63f);
}
diff --git a/src/com/android/deskclock/ringtone/RingtoneViewHolder.java b/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
index 3e0a0b8..2ce37bd 100644
--- a/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
+++ b/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
@@ -79,8 +79,6 @@
}
} else if (itemHolder.item == Utils.RINGTONE_SILENT) {
mImageView.setImageResource(R.drawable.ic_ringtone_silent);
- } else if (itemHolder.isPlaying()) {
- mImageView.setImageResource(R.drawable.ic_ringtone_active);
} else {
mImageView.setImageResource(R.drawable.ic_ringtone);
}
diff --git a/src/com/android/deskclock/settings/AlarmVolumePreference.java b/src/com/android/deskclock/settings/AlarmVolumePreference.java
index b1eb8ce..cfb28cc 100644
--- a/src/com/android/deskclock/settings/AlarmVolumePreference.java
+++ b/src/com/android/deskclock/settings/AlarmVolumePreference.java
@@ -61,10 +61,11 @@
// Disable click feedback for this preference.
holder.itemView.setClickable(false);
- mSeekbar = (SeekBar) holder.findViewById(R.id.alarm_volume_slider);
+ mSeekbar = (SeekBar) holder.findViewById(com.android.internal.R.id.seekbar);
mSeekbar.setMax(audioManager.getStreamMaxVolume(STREAM_ALARM));
mSeekbar.setProgress(audioManager.getStreamVolume(STREAM_ALARM));
- mAlarmIcon = (ImageView) holder.findViewById(R.id.alarm_icon);
+ mAlarmIcon = (ImageView) holder.findViewById(com.android.internal.R.id.icon);
+
onSeekbarChanged();
final ContentObserver volumeObserver = new ContentObserver(mSeekbar.getHandler()) {
diff --git a/src/com/android/deskclock/stopwatch/StopwatchFragment.java b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
index fe91b37..381176e 100644
--- a/src/com/android/deskclock/stopwatch/StopwatchFragment.java
+++ b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
@@ -239,40 +239,33 @@
}
}
- private void updateFab(@NonNull ImageView fab, boolean animate) {
+ private void updateFab(@NonNull ImageView fab) {
if (getStopwatch().isRunning()) {
- if (animate) {
- fab.setImageResource(R.drawable.ic_play_pause_animation);
- } else {
- fab.setImageResource(R.drawable.ic_play_pause);
- }
+ fab.setImageResource(R.drawable.ic_pause_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.sw_pause_button));
} else {
- if (animate) {
- fab.setImageResource(R.drawable.ic_pause_play_animation);
- } else {
- fab.setImageResource(R.drawable.ic_pause_play);
- }
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.sw_start_button));
}
fab.setVisibility(VISIBLE);
}
+ @Override
public void onUpdateFab(@NonNull ImageView fab) {
- updateFab(fab, false);
+ updateFab(fab);
}
@Override
public void onMorphFab(@NonNull ImageView fab) {
// Update the fab's drawable to match the current timer state.
- updateFab(fab, Utils.isNOrLater());
+ updateFab(fab);
// Animate the drawable.
AnimatorUtils.startDrawableAnimation(fab);
}
@Override
public void onUpdateFabButtons(@NonNull Button left, @NonNull Button right) {
- final Resources resources = getResources();
+ final Resources resources = left.getContext().getResources();
left.setClickable(true);
left.setText(R.string.sw_reset_button);
left.setContentDescription(resources.getString(R.string.sw_reset_button));
@@ -301,6 +294,11 @@
}
}
+ @Override
+ public final int getFabTargetVisibility() {
+ return View.VISIBLE;
+ }
+
/**
* @param color the newly installed app window color
*/
diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java
index 8b30105..a53f41d 100644
--- a/src/com/android/deskclock/timer/TimerFragment.java
+++ b/src/com/android/deskclock/timer/TimerFragment.java
@@ -236,7 +236,27 @@
}
}
- private void updateFab(@NonNull ImageView fab, boolean animate) {
+ @Override
+ public int getFabTargetVisibility() {
+ if (mCurrentView == mTimersView) {
+ final Timer timer = getTimer();
+ if (timer == null) {
+ return INVISIBLE;
+ } else {
+ return VISIBLE;
+ }
+ } else if (mCurrentView == mCreateTimerView) {
+ if (mCreateTimerView.hasValidInput()) {
+ return VISIBLE;
+ } else {
+ return INVISIBLE;
+ }
+ }
+
+ return INVISIBLE;
+ }
+
+ private void updateFab(@NonNull ImageView fab) {
if (mCurrentView == mTimersView) {
final Timer timer = getTimer();
if (timer == null) {
@@ -247,38 +267,26 @@
fab.setVisibility(VISIBLE);
switch (timer.getState()) {
case RUNNING:
- if (animate) {
- fab.setImageResource(R.drawable.ic_play_pause_animation);
- } else {
- fab.setImageResource(R.drawable.ic_play_pause);
- }
+ fab.setImageResource(R.drawable.ic_pause_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_stop));
break;
case RESET:
- if (animate) {
- fab.setImageResource(R.drawable.ic_stop_play_animation);
- } else {
- fab.setImageResource(R.drawable.ic_pause_play);
- }
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_start));
break;
case PAUSED:
- if (animate) {
- fab.setImageResource(R.drawable.ic_pause_play_animation);
- } else {
- fab.setImageResource(R.drawable.ic_pause_play);
- }
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_start));
break;
case MISSED:
case EXPIRED:
- fab.setImageResource(R.drawable.ic_stop_white_24dp);
+ fab.setImageResource(R.drawable.ic_stop_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_stop));
break;
}
} else if (mCurrentView == mCreateTimerView) {
if (mCreateTimerView.hasValidInput()) {
- fab.setImageResource(R.drawable.ic_start_white_24dp);
+ fab.setImageResource(R.drawable.ic_start_24dp);
fab.setContentDescription(fab.getResources().getString(R.string.timer_start));
fab.setVisibility(VISIBLE);
} else {
@@ -290,13 +298,13 @@
@Override
public void onUpdateFab(@NonNull ImageView fab) {
- updateFab(fab, false);
+ updateFab(fab);
}
@Override
public void onMorphFab(@NonNull ImageView fab) {
// Update the fab's drawable to match the current timer state.
- updateFab(fab, Utils.isNOrLater());
+ updateFab(fab);
// Animate the drawable.
AnimatorUtils.startDrawableAnimation(fab);
}
diff --git a/src/com/android/deskclock/timer/TimerItemFragment.java b/src/com/android/deskclock/timer/TimerItemFragment.java
index 7ce6876..33b9042 100644
--- a/src/com/android/deskclock/timer/TimerItemFragment.java
+++ b/src/com/android/deskclock/timer/TimerItemFragment.java
@@ -16,12 +16,12 @@
package com.android.deskclock.timer;
-import android.app.Fragment;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
import com.android.deskclock.LabelDialogFragment;
import com.android.deskclock.R;
diff --git a/src/com/android/deskclock/timer/TimerPagerAdapter.java b/src/com/android/deskclock/timer/TimerPagerAdapter.java
index 5255f16..a0aec99 100644
--- a/src/com/android/deskclock/timer/TimerPagerAdapter.java
+++ b/src/com/android/deskclock/timer/TimerPagerAdapter.java
@@ -17,15 +17,15 @@
package com.android.deskclock.timer;
import android.annotation.SuppressLint;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import androidx.legacy.app.FragmentCompat;
-import androidx.viewpager.widget.PagerAdapter;
import android.util.ArrayMap;
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.viewpager.widget.PagerAdapter;
+
import com.android.deskclock.data.DataModel;
import com.android.deskclock.data.Timer;
import com.android.deskclock.data.TimerListener;
@@ -179,7 +179,7 @@
}
private static void setItemVisible(Fragment item, boolean visible) {
- FragmentCompat.setMenuVisibility(item, visible);
- FragmentCompat.setUserVisibleHint(item, visible);
+ item.setMenuVisibility(visible);
+ item.setUserVisibleHint(visible);
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/deskclock/uidata/UiDataModel.java b/src/com/android/deskclock/uidata/UiDataModel.java
index f7a6917..3d592d4 100644
--- a/src/com/android/deskclock/uidata/UiDataModel.java
+++ b/src/com/android/deskclock/uidata/UiDataModel.java
@@ -19,7 +19,7 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Typeface;
-import androidx.annotation.DrawableRes;
+import androidx.annotation.IntegerRes;
import androidx.annotation.StringRes;
import com.android.deskclock.AlarmClockFragment;
@@ -39,23 +39,23 @@
/** Identifies each of the primary tabs within the application. */
public enum Tab {
- ALARMS(AlarmClockFragment.class, R.drawable.ic_tab_alarm, R.string.menu_alarm),
- CLOCKS(ClockFragment.class, R.drawable.ic_tab_clock, R.string.menu_clock),
- TIMERS(TimerFragment.class, R.drawable.ic_tab_timer, R.string.menu_timer),
- STOPWATCH(StopwatchFragment.class, R.drawable.ic_tab_stopwatch, R.string.menu_stopwatch);
+ ALARMS(AlarmClockFragment.class, R.id.page_alarm, R.string.menu_alarm),
+ CLOCKS(ClockFragment.class, R.id.page_clock, R.string.menu_clock),
+ TIMERS(TimerFragment.class, R.id.page_timer, R.string.menu_timer),
+ STOPWATCH(StopwatchFragment.class, R.id.page_stopwatch, R.string.menu_stopwatch);
private final String mFragmentClassName;
- private final @DrawableRes int mIconResId;
+ private final @IntegerRes int mPageResId;
private final @StringRes int mLabelResId;
- Tab(Class fragmentClass, @DrawableRes int iconResId, @StringRes int labelResId) {
+ Tab(Class fragmentClass, @IntegerRes int pageResId, @StringRes int labelResId) {
mFragmentClassName = fragmentClass.getName();
- mIconResId = iconResId;
+ mPageResId = pageResId;
mLabelResId = labelResId;
}
public String getFragmentClassName() { return mFragmentClassName; }
- public @DrawableRes int getIconResId() { return mIconResId; }
+ public @IntegerRes int getPageResId() { return mPageResId; }
public @StringRes int getLabelResId() { return mLabelResId; }
}
