diff options
| author | Tom Marshall <tdm@cyngn.com> | 2015-03-12 14:58:41 -0700 |
|---|---|---|
| committer | Tom Marshall <tdm@cyngn.com> | 2015-03-12 14:58:41 -0700 |
| commit | 4908c7abec5407d488829b3996b256eda7ef5334 (patch) | |
| tree | 809e3bca5b72f2ab16a176f5caef62528ddfa917 | |
| parent | ec9cfccbbb87ea0dfe45489c40769f54b8c9c9b0 (diff) | |
| parent | cc89acbc231501c6701925cf20f69e1eba8c1400 (diff) | |
| download | android_packages_apps_DeskClock-4908c7abec5407d488829b3996b256eda7ef5334.tar.gz android_packages_apps_DeskClock-4908c7abec5407d488829b3996b256eda7ef5334.tar.bz2 android_packages_apps_DeskClock-4908c7abec5407d488829b3996b256eda7ef5334.zip | |
Merge tag 'android-5.1.0_r1' into merge-5.1
Android 5.1.0 release 1
Conflicts:
res/layout/stopwatch_notif_collapsed.xml
res/layout/stopwatch_notif_expanded.xml
res/values-en-rIN/array.xml
res/values-zh-rCN/array.xml
res/values/array.xml
src/com/android/deskclock/AlarmClockFragment.java
src/com/android/deskclock/SettingsActivity.java
src/com/android/deskclock/worldclock/CitiesActivity.java
Change-Id: Ic861c90216b82290378be7072d6be760ef5be372
268 files changed, 1803 insertions, 974 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c354dde77..2ec73c7b7 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.deskclock" - android:versionCode="302" android:versionName="3.0.2"> + android:versionCode="303" android:versionName="3.0.3"> <original-package android:name="com.android.alarmclock" /> <original-package android:name="com.android.deskclock" /> @@ -160,7 +160,6 @@ <action android:name="android.intent.action.SCREEN_ON" /> <action android:name="android.intent.action.TIME_SET" /> <action android:name="android.intent.action.LOCALE_CHANGED" /> - <action android:name="android.intent.action.ALARM_CHANGED" /> <action android:name="android.app.action.NEXT_ALARM_CLOCK_CHANGED" /> <action android:name="com.android.deskclock.worldclock.update" /> </intent-filter> diff --git a/res/animator/ic_alarm_animation_button.xml b/res/animator/ic_alarm_animation_button.xml new file mode 100644 index 000000000..83465d303 --- /dev/null +++ b/res/animator/ic_alarm_animation_button.xml @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" > + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="33" + android:propertyName="rotation" + android:valueFrom="0" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="67" + android:propertyName="rotation" + android:valueFrom="8" + android:valueTo="-8" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="33" + android:propertyName="rotation" + android:valueFrom="-8" + android:valueTo="0" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + </set> +</set> diff --git a/res/animator/ic_clock_animation_second_hand.xml b/res/animator/ic_clock_animation_second_hand.xml new file mode 100644 index 000000000..a98e6df36 --- /dev/null +++ b/res/animator/ic_clock_animation_second_hand.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" > + <objectAnimator + android:duration="1333" + android:propertyName="rotation" + android:valueFrom="0" + android:valueTo="360" + android:interpolator="@android:interpolator/fast_out_slow_in" /> +</set> diff --git a/res/animator/ic_stopwatch_animation_button.xml b/res/animator/ic_stopwatch_animation_button.xml new file mode 100644 index 000000000..27e00cf46 --- /dev/null +++ b/res/animator/ic_stopwatch_animation_button.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" > + <objectAnimator + android:duration="267" + android:propertyXName="translateX" + android:propertyYName="translateY" + android:pathData="M 12,12 c 0,0.16667 0,1 0,1 l 0,-1 " + android:interpolator="@interpolator/ic_stopwatch_button_translatex_interpolator" /> +</set> diff --git a/res/animator/ic_stopwatch_animation_hand.xml b/res/animator/ic_stopwatch_animation_hand.xml new file mode 100644 index 000000000..a98e6df36 --- /dev/null +++ b/res/animator/ic_stopwatch_animation_hand.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" > + <objectAnimator + android:duration="1333" + android:propertyName="rotation" + android:valueFrom="0" + android:valueTo="360" + android:interpolator="@android:interpolator/fast_out_slow_in" /> +</set> diff --git a/res/animator/ic_timer_animation_hourglass_fill.xml b/res/animator/ic_timer_animation_hourglass_fill.xml new file mode 100644 index 000000000..2a1fc4682 --- /dev/null +++ b/res/animator/ic_timer_animation_hourglass_fill.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" > + <objectAnimator + android:duration="333" + android:propertyName="rotation" + android:valueFrom="0" + android:valueTo="180" + android:interpolator="@android:interpolator/fast_out_slow_in" /> +</set> diff --git a/res/animator/ic_timer_animation_hourglass_frame.xml b/res/animator/ic_timer_animation_hourglass_frame.xml new file mode 100644 index 000000000..2a1fc4682 --- /dev/null +++ b/res/animator/ic_timer_animation_hourglass_frame.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" > + <objectAnimator + android:duration="333" + android:propertyName="rotation" + android:valueFrom="0" + android:valueTo="180" + android:interpolator="@android:interpolator/fast_out_slow_in" /> +</set> diff --git a/res/animator/ic_timer_animation_mask_1.xml b/res/animator/ic_timer_animation_mask_1.xml new file mode 100644 index 000000000..2e331a714 --- /dev/null +++ b/res/animator/ic_timer_animation_mask_1.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" > + <set + android:ordering="sequentially" > + <objectAnimator + android:duration="333" + android:propertyName="pathData" + android:valueFrom="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z" + android:valueTo="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z" + android:valueType="pathType" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + <objectAnimator + android:duration="1000" + android:propertyName="pathData" + android:valueFrom="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z" + android:valueTo="M 24,0.00173950195312 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6982574463 0,10.6982574463 c 0,0.0 24,0.0 24,0.0 c 0,0.0 0,-10.6982574463 0,-10.6982574463 Z" + android:valueType="pathType" + android:interpolator="@android:interpolator/fast_out_slow_in" /> + </set> +</set> diff --git a/res/drawable-hdpi/ic_noalarms.png b/res/drawable-hdpi/ic_noalarms.png Binary files differindex cb369a9f4..0ab1c7077 100644 --- a/res/drawable-hdpi/ic_noalarms.png +++ b/res/drawable-hdpi/ic_noalarms.png diff --git a/res/drawable-hdpi/ic_notify_reset.png b/res/drawable-hdpi/ic_notify_reset.png Binary files differindex caa4793b1..e58333a13 100644 --- a/res/drawable-hdpi/ic_notify_reset.png +++ b/res/drawable-hdpi/ic_notify_reset.png diff --git a/res/drawable-mdpi/ic_noalarms.png b/res/drawable-mdpi/ic_noalarms.png Binary files differindex 34bf17098..80d30c2a1 100644 --- a/res/drawable-mdpi/ic_noalarms.png +++ b/res/drawable-mdpi/ic_noalarms.png diff --git a/res/drawable-mdpi/ic_notify_reset.png b/res/drawable-mdpi/ic_notify_reset.png Binary files differindex 4c9cc565a..5e033cee6 100644 --- a/res/drawable-mdpi/ic_notify_reset.png +++ b/res/drawable-mdpi/ic_notify_reset.png diff --git a/res/drawable-sw600dp-hdpi/clock_analog_dial.png b/res/drawable-sw600dp-hdpi/clock_analog_dial.png Binary files differindex 5a2c0b3c6..98abe1650 100644 --- a/res/drawable-sw600dp-hdpi/clock_analog_dial.png +++ b/res/drawable-sw600dp-hdpi/clock_analog_dial.png diff --git a/res/drawable-sw600dp-hdpi/clock_analog_hour.png b/res/drawable-sw600dp-hdpi/clock_analog_hour.png Binary files differindex 11ca5d3d8..8cce27007 100644 --- a/res/drawable-sw600dp-hdpi/clock_analog_hour.png +++ b/res/drawable-sw600dp-hdpi/clock_analog_hour.png diff --git a/res/drawable-sw600dp-hdpi/clock_analog_minute.png b/res/drawable-sw600dp-hdpi/clock_analog_minute.png Binary files differindex 86268599d..6c6495424 100644 --- a/res/drawable-sw600dp-hdpi/clock_analog_minute.png +++ b/res/drawable-sw600dp-hdpi/clock_analog_minute.png diff --git a/res/drawable-sw600dp-hdpi/clock_analog_second.png b/res/drawable-sw600dp-hdpi/clock_analog_second.png Binary files differindex 740e17e14..869b02eb5 100644 --- a/res/drawable-sw600dp-hdpi/clock_analog_second.png +++ b/res/drawable-sw600dp-hdpi/clock_analog_second.png diff --git a/res/drawable-sw600dp-hdpi/ic_noalarms.png b/res/drawable-sw600dp-hdpi/ic_noalarms.png Binary files differindex 8785f3626..dfc9dcfff 100644 --- a/res/drawable-sw600dp-hdpi/ic_noalarms.png +++ b/res/drawable-sw600dp-hdpi/ic_noalarms.png diff --git a/res/drawable-sw600dp-mdpi/clock_analog_dial.png b/res/drawable-sw600dp-mdpi/clock_analog_dial.png Binary files differindex 90fa6cf0b..0d11937a0 100644 --- a/res/drawable-sw600dp-mdpi/clock_analog_dial.png +++ b/res/drawable-sw600dp-mdpi/clock_analog_dial.png diff --git a/res/drawable-sw600dp-mdpi/clock_analog_hour.png b/res/drawable-sw600dp-mdpi/clock_analog_hour.png Binary files differindex d7b9fcce9..82eba3be3 100644 --- a/res/drawable-sw600dp-mdpi/clock_analog_hour.png +++ b/res/drawable-sw600dp-mdpi/clock_analog_hour.png diff --git a/res/drawable-sw600dp-mdpi/clock_analog_minute.png b/res/drawable-sw600dp-mdpi/clock_analog_minute.png Binary files differindex 350c48ceb..8430e17fd 100644 --- a/res/drawable-sw600dp-mdpi/clock_analog_minute.png +++ b/res/drawable-sw600dp-mdpi/clock_analog_minute.png diff --git a/res/drawable-sw600dp-mdpi/clock_analog_second.png b/res/drawable-sw600dp-mdpi/clock_analog_second.png Binary files differindex db8e5609f..2e8e486a4 100644 --- a/res/drawable-sw600dp-mdpi/clock_analog_second.png +++ b/res/drawable-sw600dp-mdpi/clock_analog_second.png diff --git a/res/drawable-sw600dp-mdpi/ic_noalarms.png b/res/drawable-sw600dp-mdpi/ic_noalarms.png Binary files differindex c2cdd0939..40b747abd 100644 --- a/res/drawable-sw600dp-mdpi/ic_noalarms.png +++ b/res/drawable-sw600dp-mdpi/ic_noalarms.png diff --git a/res/drawable-sw600dp-xhdpi/clock_analog_dial.png b/res/drawable-sw600dp-xhdpi/clock_analog_dial.png Binary files differindex 5c644df61..67b694101 100644 --- a/res/drawable-sw600dp-xhdpi/clock_analog_dial.png +++ b/res/drawable-sw600dp-xhdpi/clock_analog_dial.png diff --git a/res/drawable-sw600dp-xhdpi/clock_analog_hour.png b/res/drawable-sw600dp-xhdpi/clock_analog_hour.png Binary files differindex b813f9c43..70f194b56 100644 --- a/res/drawable-sw600dp-xhdpi/clock_analog_hour.png +++ b/res/drawable-sw600dp-xhdpi/clock_analog_hour.png diff --git a/res/drawable-sw600dp-xhdpi/clock_analog_minute.png b/res/drawable-sw600dp-xhdpi/clock_analog_minute.png Binary files differindex 8b632c8d9..5d7355931 100644 --- a/res/drawable-sw600dp-xhdpi/clock_analog_minute.png +++ b/res/drawable-sw600dp-xhdpi/clock_analog_minute.png diff --git a/res/drawable-sw600dp-xhdpi/clock_analog_second.png b/res/drawable-sw600dp-xhdpi/clock_analog_second.png Binary files differindex a09cc3bfa..213ed467b 100644 --- a/res/drawable-sw600dp-xhdpi/clock_analog_second.png +++ b/res/drawable-sw600dp-xhdpi/clock_analog_second.png diff --git a/res/drawable-sw600dp-xhdpi/ic_noalarms.png b/res/drawable-sw600dp-xhdpi/ic_noalarms.png Binary files differindex 783ebaed0..1b0ed2f8a 100644 --- a/res/drawable-sw600dp-xhdpi/ic_noalarms.png +++ b/res/drawable-sw600dp-xhdpi/ic_noalarms.png diff --git a/res/drawable-sw600dp-xxhdpi/clock_analog_dial.png b/res/drawable-sw600dp-xxhdpi/clock_analog_dial.png Binary files differindex 8bac27b97..7464145ef 100644 --- a/res/drawable-sw600dp-xxhdpi/clock_analog_dial.png +++ b/res/drawable-sw600dp-xxhdpi/clock_analog_dial.png diff --git a/res/drawable-sw600dp-xxhdpi/clock_analog_hour.png b/res/drawable-sw600dp-xxhdpi/clock_analog_hour.png Binary files differindex 63cbf8fd1..e38681996 100644 --- a/res/drawable-sw600dp-xxhdpi/clock_analog_hour.png +++ b/res/drawable-sw600dp-xxhdpi/clock_analog_hour.png diff --git a/res/drawable-sw600dp-xxhdpi/clock_analog_minute.png b/res/drawable-sw600dp-xxhdpi/clock_analog_minute.png Binary files differindex 34b7a79cb..eeabc2117 100644 --- a/res/drawable-sw600dp-xxhdpi/clock_analog_minute.png +++ b/res/drawable-sw600dp-xxhdpi/clock_analog_minute.png diff --git a/res/drawable-sw600dp-xxhdpi/clock_analog_second.png b/res/drawable-sw600dp-xxhdpi/clock_analog_second.png Binary files differindex d403accab..a6c5f2f34 100644 --- a/res/drawable-sw600dp-xxhdpi/clock_analog_second.png +++ b/res/drawable-sw600dp-xxhdpi/clock_analog_second.png diff --git a/res/drawable-sw600dp-xxhdpi/ic_noalarms.png b/res/drawable-sw600dp-xxhdpi/ic_noalarms.png Binary files differindex 27e900ab4..266c8a03a 100644 --- a/res/drawable-sw600dp-xxhdpi/ic_noalarms.png +++ b/res/drawable-sw600dp-xxhdpi/ic_noalarms.png diff --git a/res/drawable-sw600dp-xxxhdpi/clock_analog_dial.png b/res/drawable-sw600dp-xxxhdpi/clock_analog_dial.png Binary files differindex 13e0a4e1a..6b6bb0a9b 100644 --- a/res/drawable-sw600dp-xxxhdpi/clock_analog_dial.png +++ b/res/drawable-sw600dp-xxxhdpi/clock_analog_dial.png diff --git a/res/drawable-sw600dp-xxxhdpi/clock_analog_hour.png b/res/drawable-sw600dp-xxxhdpi/clock_analog_hour.png Binary files differindex c025a8dec..af040e20e 100644 --- a/res/drawable-sw600dp-xxxhdpi/clock_analog_hour.png +++ b/res/drawable-sw600dp-xxxhdpi/clock_analog_hour.png diff --git a/res/drawable-sw600dp-xxxhdpi/clock_analog_minute.png b/res/drawable-sw600dp-xxxhdpi/clock_analog_minute.png Binary files differindex 24bf0ef47..422357932 100644 --- a/res/drawable-sw600dp-xxxhdpi/clock_analog_minute.png +++ b/res/drawable-sw600dp-xxxhdpi/clock_analog_minute.png diff --git a/res/drawable-sw600dp-xxxhdpi/clock_analog_second.png b/res/drawable-sw600dp-xxxhdpi/clock_analog_second.png Binary files differindex e7d8d7cdb..891c55ee2 100644 --- a/res/drawable-sw600dp-xxxhdpi/clock_analog_second.png +++ b/res/drawable-sw600dp-xxxhdpi/clock_analog_second.png diff --git a/res/drawable-sw600dp-xxxhdpi/ic_noalarms.png b/res/drawable-sw600dp-xxxhdpi/ic_noalarms.png Binary files differindex 0731d74f1..081a7b54d 100644 --- a/res/drawable-sw600dp-xxxhdpi/ic_noalarms.png +++ b/res/drawable-sw600dp-xxxhdpi/ic_noalarms.png diff --git a/res/drawable-sw720dp-hdpi/clock_analog_dial.png b/res/drawable-sw720dp-hdpi/clock_analog_dial.png Binary files differnew file mode 100644 index 000000000..5a2c0b3c6 --- /dev/null +++ b/res/drawable-sw720dp-hdpi/clock_analog_dial.png diff --git a/res/drawable-sw720dp-hdpi/clock_analog_hour.png b/res/drawable-sw720dp-hdpi/clock_analog_hour.png Binary files differnew file mode 100644 index 000000000..11ca5d3d8 --- /dev/null +++ b/res/drawable-sw720dp-hdpi/clock_analog_hour.png diff --git a/res/drawable-sw720dp-hdpi/clock_analog_minute.png b/res/drawable-sw720dp-hdpi/clock_analog_minute.png Binary files differnew file mode 100644 index 000000000..86268599d --- /dev/null +++ b/res/drawable-sw720dp-hdpi/clock_analog_minute.png diff --git a/res/drawable-sw720dp-hdpi/clock_analog_second.png b/res/drawable-sw720dp-hdpi/clock_analog_second.png Binary files differnew file mode 100644 index 000000000..740e17e14 --- /dev/null +++ b/res/drawable-sw720dp-hdpi/clock_analog_second.png diff --git a/res/drawable-sw720dp-mdpi/clock_analog_dial.png b/res/drawable-sw720dp-mdpi/clock_analog_dial.png Binary files differnew file mode 100644 index 000000000..90fa6cf0b --- /dev/null +++ b/res/drawable-sw720dp-mdpi/clock_analog_dial.png diff --git a/res/drawable-sw720dp-mdpi/clock_analog_hour.png b/res/drawable-sw720dp-mdpi/clock_analog_hour.png Binary files differnew file mode 100644 index 000000000..d7b9fcce9 --- /dev/null +++ b/res/drawable-sw720dp-mdpi/clock_analog_hour.png diff --git a/res/drawable-sw720dp-mdpi/clock_analog_minute.png b/res/drawable-sw720dp-mdpi/clock_analog_minute.png Binary files differnew file mode 100644 index 000000000..350c48ceb --- /dev/null +++ b/res/drawable-sw720dp-mdpi/clock_analog_minute.png diff --git a/res/drawable-sw720dp-mdpi/clock_analog_second.png b/res/drawable-sw720dp-mdpi/clock_analog_second.png Binary files differnew file mode 100644 index 000000000..db8e5609f --- /dev/null +++ b/res/drawable-sw720dp-mdpi/clock_analog_second.png diff --git a/res/drawable-sw720dp-xhdpi/clock_analog_dial.png b/res/drawable-sw720dp-xhdpi/clock_analog_dial.png Binary files differnew file mode 100644 index 000000000..5c644df61 --- /dev/null +++ b/res/drawable-sw720dp-xhdpi/clock_analog_dial.png diff --git a/res/drawable-sw720dp-xhdpi/clock_analog_hour.png b/res/drawable-sw720dp-xhdpi/clock_analog_hour.png Binary files differnew file mode 100644 index 000000000..b813f9c43 --- /dev/null +++ b/res/drawable-sw720dp-xhdpi/clock_analog_hour.png diff --git a/res/drawable-sw720dp-xhdpi/clock_analog_minute.png b/res/drawable-sw720dp-xhdpi/clock_analog_minute.png Binary files differnew file mode 100644 index 000000000..8b632c8d9 --- /dev/null +++ b/res/drawable-sw720dp-xhdpi/clock_analog_minute.png diff --git a/res/drawable-sw720dp-xhdpi/clock_analog_second.png b/res/drawable-sw720dp-xhdpi/clock_analog_second.png Binary files differnew file mode 100644 index 000000000..a09cc3bfa --- /dev/null +++ b/res/drawable-sw720dp-xhdpi/clock_analog_second.png diff --git a/res/drawable-sw720dp-xxhdpi/clock_analog_dial.png b/res/drawable-sw720dp-xxhdpi/clock_analog_dial.png Binary files differnew file mode 100644 index 000000000..8bac27b97 --- /dev/null +++ b/res/drawable-sw720dp-xxhdpi/clock_analog_dial.png diff --git a/res/drawable-sw720dp-xxhdpi/clock_analog_hour.png b/res/drawable-sw720dp-xxhdpi/clock_analog_hour.png Binary files differnew file mode 100644 index 000000000..63cbf8fd1 --- /dev/null +++ b/res/drawable-sw720dp-xxhdpi/clock_analog_hour.png diff --git a/res/drawable-sw720dp-xxhdpi/clock_analog_minute.png b/res/drawable-sw720dp-xxhdpi/clock_analog_minute.png Binary files differnew file mode 100644 index 000000000..34b7a79cb --- /dev/null +++ b/res/drawable-sw720dp-xxhdpi/clock_analog_minute.png diff --git a/res/drawable-sw720dp-xxhdpi/clock_analog_second.png b/res/drawable-sw720dp-xxhdpi/clock_analog_second.png Binary files differnew file mode 100644 index 000000000..d403accab --- /dev/null +++ b/res/drawable-sw720dp-xxhdpi/clock_analog_second.png diff --git a/res/drawable-sw720dp-xxxhdpi/clock_analog_dial.png b/res/drawable-sw720dp-xxxhdpi/clock_analog_dial.png Binary files differnew file mode 100644 index 000000000..13e0a4e1a --- /dev/null +++ b/res/drawable-sw720dp-xxxhdpi/clock_analog_dial.png diff --git a/res/drawable-sw720dp-xxxhdpi/clock_analog_hour.png b/res/drawable-sw720dp-xxxhdpi/clock_analog_hour.png Binary files differnew file mode 100644 index 000000000..c025a8dec --- /dev/null +++ b/res/drawable-sw720dp-xxxhdpi/clock_analog_hour.png diff --git a/res/drawable-sw720dp-xxxhdpi/clock_analog_minute.png b/res/drawable-sw720dp-xxxhdpi/clock_analog_minute.png Binary files differnew file mode 100644 index 000000000..24bf0ef47 --- /dev/null +++ b/res/drawable-sw720dp-xxxhdpi/clock_analog_minute.png diff --git a/res/drawable-sw720dp-xxxhdpi/clock_analog_second.png b/res/drawable-sw720dp-xxxhdpi/clock_analog_second.png Binary files differnew file mode 100644 index 000000000..e7d8d7cdb --- /dev/null +++ b/res/drawable-sw720dp-xxxhdpi/clock_analog_second.png diff --git a/res/drawable-xhdpi/ic_noalarms.png b/res/drawable-xhdpi/ic_noalarms.png Binary files differindex c4f21e689..e6195ddae 100644 --- a/res/drawable-xhdpi/ic_noalarms.png +++ b/res/drawable-xhdpi/ic_noalarms.png diff --git a/res/drawable-xhdpi/ic_notify_reset.png b/res/drawable-xhdpi/ic_notify_reset.png Binary files differindex 4859f7c4e..853607532 100644 --- a/res/drawable-xhdpi/ic_notify_reset.png +++ b/res/drawable-xhdpi/ic_notify_reset.png diff --git a/res/drawable-xxhdpi/ic_noalarms.png b/res/drawable-xxhdpi/ic_noalarms.png Binary files differindex b111ee5f3..cb83727c6 100644 --- a/res/drawable-xxhdpi/ic_noalarms.png +++ b/res/drawable-xxhdpi/ic_noalarms.png diff --git a/res/drawable-xxhdpi/ic_notify_reset.png b/res/drawable-xxhdpi/ic_notify_reset.png Binary files differindex e000b73b8..1d6cbf456 100644 --- a/res/drawable-xxhdpi/ic_notify_reset.png +++ b/res/drawable-xxhdpi/ic_notify_reset.png diff --git a/res/drawable-xxxhdpi/ic_noalarms.png b/res/drawable-xxxhdpi/ic_noalarms.png Binary files differindex b17169d4e..e59fa7155 100644 --- a/res/drawable-xxxhdpi/ic_noalarms.png +++ b/res/drawable-xxxhdpi/ic_noalarms.png diff --git a/res/drawable-xxxhdpi/ic_notify_reset.png b/res/drawable-xxxhdpi/ic_notify_reset.png Binary files differindex fbb61f2c7..8e7cff73d 100644 --- a/res/drawable-xxxhdpi/ic_notify_reset.png +++ b/res/drawable-xxxhdpi/ic_notify_reset.png diff --git a/res/drawable/alarm_tab.xml b/res/drawable/alarm_tab.xml deleted file mode 100644 index 2debaf715..000000000 --- a/res/drawable/alarm_tab.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> - <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_pressed="false" - android:drawable="@drawable/ic_tab_alarm_activated" /> - <item android:state_focused="true" android:state_pressed="true" - android:drawable="@drawable/ic_tab_alarm_activated" /> - <item android:state_focused="false" android:state_pressed="true" - android:drawable="@drawable/ic_tab_alarm_activated" /> - <item android:state_selected="true" - android:drawable="@drawable/ic_tab_alarm_activated" /> - <item android:drawable="@drawable/ic_tab_alarm_normal" /> -</selector> diff --git a/res/drawable/clock_tab.xml b/res/drawable/clock_tab.xml deleted file mode 100644 index 6fc277912..000000000 --- a/res/drawable/clock_tab.xml +++ /dev/null @@ -1,26 +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. ---> - <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_pressed="false" - android:drawable="@drawable/ic_tab_clock_activated" /> - <item android:state_focused="true" android:state_pressed="true" - android:drawable="@drawable/ic_tab_clock_activated" /> - <item android:state_focused="false" android:state_pressed="true" - android:drawable="@drawable/ic_tab_clock_activated" /> - <item android:state_selected="true" - android:drawable="@drawable/ic_tab_clock_activated" /> - <item android:drawable="@drawable/ic_tab_clock_normal" /> -</selector> diff --git a/res/drawable/ic_alarm.xml b/res/drawable/ic_alarm.xml new file mode 100644 index 000000000..575b960fe --- /dev/null +++ b/res/drawable/ic_alarm.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportHeight="24" + android:viewportWidth="24" > + <group + android:name="button" + android:translateX="12" + android:translateY="12" > + <group + android:name="button_pivot" + android:translateX="-12" + android:translateY="-12" > + <group + android:name="right_button" + android:translateX="19.0722" + android:translateY="4.5758" > + <path + android:name="path_1" + android:pathData="M 2.9409942627,1.16249084473 c 0.0,0.0 -4.59599304199,-3.85699462891 -4.59599304199,-3.85699462891 c 0.0,0.0 -1.2859954834,1.53300476074 -1.2859954834,1.53300476074 c 0.0,0.0 4.59599304199,3.85600280762 4.59599304199,3.85600280762 c 0.0,0.0 1.2859954834,-1.53201293945 1.2859954834,-1.53201293945 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + <group + android:name="left_button" + android:translateX="4.9262" + android:translateY="4.5729" > + <path + android:name="left_button_path" + android:pathData="M 2.9409942627,-1.16250610352 c 0.0,0.0 -1.2859954834,-1.53199768066 -1.2859954834,-1.53199768066 c 0.0,0.0 -4.59599304199,3.85600280762 -4.59599304199,3.85600280762 c 0.0,0.0 1.2859954834,1.53300476074 1.2859954834,1.53300476074 c 0.0,0.0 4.59599304199,-3.8570098877 4.59599304199,-3.8570098877 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> + </group> + <group + android:name="alarm" + android:translateX="12" + android:translateY="12" > + <group + android:name="alarm_pivot" + android:translateX="-12" + android:translateY="-12" > + <group + android:name="alarm_hands" + android:translateX="13.75" + android:translateY="12.4473" > + <path + android:name="alarm_hands_path" + android:pathData="M -1.25,-4.42700195312 c 0.0,0.0 -1.5,0.0 -1.5,0.0 c 0.0,0.0 0.0,6.0 0.0,6.0 c 0.0,0.0 4.74699401855,2.85400390625 4.74699401855,2.85400390625 c 0.0,0.0 0.753005981445,-1.23199462891 0.753005981445,-1.23199462891 c 0.0,0.0 -4.0,-2.37200927734 -4.0,-2.37200927734 c 0.0,0.0 0.0,-5.25 0.0,-5.25 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + <group + android:name="alarm_body" + android:translateX="12" + android:translateY="13.0203" > + <path + android:name="alarm_outline_path" + android:pathData="M -0.0050048828125,-9 c -4.97399902344,0 -8.99499511719,4.0299987793 -8.99499511719,9 c 0,4.9700012207 4.02099609375,9 8.99499511719,9 c 4.97399902344,0 9.00500488281,-4.0299987793 9.00500488281,-9 c 0,-4.9700012207 -4.03100585938,-9 -9.00500488281,-9 Z M 0,7 c -3.86700439453,0 -7,-3.13400268555 -7,-7 c 0,-3.86599731445 3.13299560547,-7 7,-7 c 3.86700439453,0 7,3.13400268555 7,7 c 0,3.86599731445 -3.13299560547,7 -7,7 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> + </group> +</vector> diff --git a/res/drawable/ic_alarm_animation.xml b/res/drawable/ic_alarm_animation.xml new file mode 100644 index 000000000..f439ed6f2 --- /dev/null +++ b/res/drawable/ic_alarm_animation.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_selected="false" android:state_focused="true" + android:drawable="@drawable/ic_tab_alarm_activated" /> + + <item android:id="@+id/on" android:state_selected="true" + android:drawable="@drawable/ic_tab_alarm_activated" /> + + <item android:id="@+id/off" + android:drawable="@drawable/ic_tab_alarm_normal" /> + + <transition android:fromId="@id/off" android:toId="@id/on"> + <animated-vector android:drawable="@drawable/ic_alarm"> + <target + android:name="button" + android:animation="@animator/ic_alarm_animation_button" /> + </animated-vector> + </transition> + +</animated-selector>
\ No newline at end of file diff --git a/res/drawable/ic_clock.xml b/res/drawable/ic_clock.xml new file mode 100644 index 000000000..9fb2cfc8d --- /dev/null +++ b/res/drawable/ic_clock.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportHeight="24" + android:viewportWidth="24" > + <group + android:name="clock_frame" + android:translateX="12" + android:translateY="12" > + <group + android:name="clock_frame_pivot" + android:translateX="-12" + android:translateY="-12" > + <group + android:name="hour_hand" + android:translateX="12.00763" + android:translateY="9.992" > + <path + android:name="hour_hand_path" + android:pathData="M 0.742004394531,2.99200439453 c 0.0,0.0 -1.48400878906,0.0 -1.48400878906,0.0 c 0.0,0.0 0.0,-5.98400878906 0.0,-5.98400878906 c 0.0,0.0 1.48400878906,0.0 1.48400878906,0.0 c 0.0,0.0 0.0,5.98400878906 0.0,5.98400878906 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + <group + android:name="clock_frame_1" + android:translateX="12" + android:translateY="12" > + <path + android:name="clock_ouline_path" + android:pathData="M -0.0050048828125,-10 c -5.52699279785,0 -9.99499511719,4.47700500488 -9.99499511719,10 c 0,5.52299499512 4.46800231934,10 9.99499511719,10 c 5.52600097656,0 10.0050048828,-4.47700500488 10.0050048828,-10 c 0,-5.52299499512 -4.47900390625,-10 -10.0050048828,-10 Z M 0,8 c -4.41999816895,0 -8,-3.58200073242 -8,-8 c 0,-4.41799926758 3.58000183105,-8 8,-8 c 4.41999816895,0 8,3.58200073242 8,8 c 0,4.41799926758 -3.58000183105,8 -8,8 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> + </group> + <group + android:name="second_hand" + android:translateX="12" + android:translateY="12" > + <group + android:name="second_hand_pivot" + android:translateX="-12" + android:translateY="-12" > + <path + android:name="second_hand_path" + android:pathData="M 12.7418060303,12.9839935303 c 0.0,0.0 -1.48399353027,0.0 -1.48399353027,0.0 c 0.0,0.0 0.0,-5.98399353027 0.0,-5.98399353027 c 0.0,0 1.48399353027,0 1.48399353027,0 c 0.0,0 0.0,5.98399353027 0.0,5.98399353027 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> +</vector> diff --git a/res/drawable/ic_clock_animation.xml b/res/drawable/ic_clock_animation.xml new file mode 100644 index 000000000..608fbb747 --- /dev/null +++ b/res/drawable/ic_clock_animation.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_selected="false" android:state_focused="true" + android:drawable="@drawable/ic_tab_clock_activated" /> + + <item android:id="@+id/on" android:state_selected="true" + android:drawable="@drawable/ic_tab_clock_activated" /> + + <item android:id="@+id/off" + android:drawable="@drawable/ic_tab_clock_normal" /> + + <transition android:fromId="@id/off" android:toId="@id/on"> + <animated-vector android:drawable="@drawable/ic_clock"> + <target + android:name="second_hand" + android:animation="@animator/ic_clock_animation_second_hand" /> + </animated-vector> + </transition> + + +</animated-selector> + diff --git a/res/drawable/ic_stopwatch.xml b/res/drawable/ic_stopwatch.xml new file mode 100644 index 000000000..1ea01c98b --- /dev/null +++ b/res/drawable/ic_stopwatch.xml @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportHeight="24" + android:viewportWidth="24" > + <group + android:name="timer" + android:translateX="12" + android:translateY="12" > + <group + android:name="timer_pivot" + android:translateX="-12" + android:translateY="-12" > + <group + android:name="timer_body" > + <path + android:name="timer_interior_path" + android:pathData="M 19.0269927979,7.40730285645 c 0.0,0.0 1.42401123047,-1.42399597168 1.42401123047,-1.42399597168 c -0.428009033203,-0.513000488281 -0.902008056641,-0.98600769043 -1.41500854492,-1.41400146484 c 0.0,0.0 -1.4229888916,1.42399597168 -1.4229888916,1.42399597168 c -1.54000854492,-1.23199462891 -3.49101257324,-1.97300720215 -5.61801147461,-1.97300720215 c -4.97399902344,0.0 -8.99499511719,4.0299987793 -8.99499511719,9.0 c 0,4.9700012207 4.02099609375,9.0 8.99499511719,9.0 c 4.97399902344,0.0 9.00500488281,-4.0299987793 9.00500488281,-9.0 c 0,-2.125 -0.740997314453,-4.07398986816 -1.97300720215,-5.61299133301 Z M 12,20.0202941895 c -3.86700439453,0.0 -7,-3.13398742676 -7,-7.0 c 0,-3.86599731445 3.13299560547,-7.0 7,-7.0 c 3.86700439453,0.0 7,3.13400268555 7,7.0 c 0,3.86601257324 -3.13299560547,7.0 -7,7.0 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> + </group> + <group + android:name="hand" + android:translateX="11.96875" + android:translateY="13.17188" > + <group + android:name="hand_pivot" + android:translateX="-12" + android:translateY="-13.17188" > + <path + android:name="hand_path" + android:pathData="M 11,14.0200042725 c 0,0.0 2,0.0 2,0.0 c 0,0.0 0,-6.0 0,-6.0 c 0,0.0 -2,0.0 -2,0.0 c 0,0.0 0,6.0 0,6.0 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> + <group + android:name="button" + android:translateX="12" + android:translateY="12" > + <group + android:name="button_pivot" + android:translateX="-12" + android:translateY="-12" > + <path + android:name="button_path" + android:pathData="M 15,1.02000427246 c 0,0.0 -6,0.0 -6,0.0 c 0,0.0 0,2.0 0,2.0 c 0,0.0 6,0.0 6,0.0 c 0,0.0 0,-2.0 0,-2.0 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> +</vector> diff --git a/res/drawable/ic_stopwatch_animation.xml b/res/drawable/ic_stopwatch_animation.xml new file mode 100644 index 000000000..c9a235cd9 --- /dev/null +++ b/res/drawable/ic_stopwatch_animation.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_selected="false" android:state_focused="true" + android:drawable="@drawable/ic_tab_stopwatch_activated" /> + + <item android:id="@+id/on" android:state_selected="true" + android:drawable="@drawable/ic_tab_stopwatch_activated" /> + + <item android:id="@+id/off" + android:drawable="@drawable/ic_tab_stopwatch_normal" /> + + <transition android:fromId="@id/off" android:toId="@id/on"> + <animated-vector android:drawable="@drawable/ic_stopwatch"> + <target + android:name="hand" + android:animation="@animator/ic_stopwatch_animation_hand" /> + <target + android:name="button" + android:animation="@animator/ic_stopwatch_animation_button" /> + </animated-vector> + </transition> + +</animated-selector> diff --git a/res/drawable/ic_timer.xml b/res/drawable/ic_timer.xml new file mode 100644 index 000000000..d0663d99d --- /dev/null +++ b/res/drawable/ic_timer.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportHeight="24" + android:viewportWidth="24" > + <group + android:name="hourglass_frame" + android:translateX="12" + android:translateY="12" + android:scaleX="0.7" + android:scaleY="0.7" > + <group + android:name="hourglass_frame_pivot" + android:translateX="-12" + android:translateY="-12" > + <group + android:name="hourglass_bottom" + android:translateX="12" + android:translateY="6.5" > + <path + android:name="bottom_inner_path" + android:pathData="M 6.52099609375,-3.89300537109 c 0.0,0.0 -6.52099609375,6.87901306152 -6.52099609375,6.87901306152 c 0,0.0 -6.52099609375,-6.87901306152 -6.52099609375,-6.87901306152 c 0.0,0.0 13.0419921875,0.0 13.0419921875,0.0 Z M 9.99800109863,-6.5 c 0.0,0.0 -19.9960021973,0.0 -19.9960021973,0.0 c -0.890991210938,0.0 -1.33700561523,1.07699584961 -0.707000732422,1.70700073242 c 0.0,0.0 10.7050018311,11.2929992676 10.7050018311,11.2929992676 c 0,0.0 10.7050018311,-11.2929992676 10.7050018311,-11.2929992676 c 0.630004882812,-0.630004882812 0.183990478516,-1.70700073242 -0.707000732422,-1.70700073242 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + <group + android:name="hourglass_top" + android:translateX="12" + android:translateY="17.5" > + <path + android:name="top_inner_path" + android:pathData="M 0,-2.98600769043 c 0,0.0 6.52099609375,6.87901306152 6.52099609375,6.87901306152 c 0.0,0.0 -13.0419921875,0.0 -13.0419921875,0.0 c 0.0,0.0 6.52099609375,-6.87901306152 6.52099609375,-6.87901306152 Z M 0,-6.5 c 0,0.0 -10.7050018311,11.2929992676 -10.7050018311,11.2929992676 c -0.630004882812,0.630004882812 -0.184005737305,1.70700073242 0.707000732422,1.70700073242 c 0.0,0.0 19.9960021973,0.0 19.9960021973,0.0 c 0.890991210938,0.0 1.33699035645,-1.07699584961 0.707000732422,-1.70700073242 c 0.0,0.0 -10.7050018311,-11.2929992676 -10.7050018311,-11.2929992676 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> + </group> + <group + android:name="hourglass_fill" + android:translateX="12" + android:translateY="12" + android:scaleX="0.7" + android:scaleY="0.7" > + <group + android:name="hourglass_fill_pivot" + android:translateX="-12" + android:translateY="-12" > + <clip-path + android:name="mask_1" + android:pathData="M 24,13.3999938965 c 0,0.0 -24,0.0 -24,0.0 c 0,0.0 0,10.6000061035 0,10.6000061035 c 0,0 24,0 24,0 c 0,0 0,-10.6000061035 0,-10.6000061035 Z" /> + <path + android:name="fill_path" + android:pathData="M 22.7100067139,22.2900085449 c 0.629989624023,0.629989624023 0.179992675781,1.70999145508 -0.710006713867,1.70999145508 c 0,0 -20,0 -20,0 c -0.889999389648,0 -1.33999633789,-1.08000183105 -0.710006713867,-1.70999145508 c 0.0,0.0 9.76000976562,-10.2900085449 9.76000976562,-10.2900085449 c 0.0,0 -9.76000976562,-10.2899932861 -9.76000976562,-10.2899932861 c -0.629989624023,-0.630004882812 -0.179992675781,-1.71000671387 0.710006713867,-1.71000671387 c 0,0 20,0 20,0 c 0.889999389648,0 1.33999633789,1.08000183105 0.710006713867,1.71000671387 c 0.0,0.0 -9.76000976562,10.2899932861 -9.76000976563,10.2899932861 c 0.0,0 9.76000976563,10.2900085449 9.76000976563,10.2900085449 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> +</vector> diff --git a/res/drawable/ic_timer_animation.xml b/res/drawable/ic_timer_animation.xml new file mode 100644 index 000000000..31d9f12ee --- /dev/null +++ b/res/drawable/ic_timer_animation.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<animated-selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_selected="false" android:state_focused="true" + android:drawable="@drawable/ic_tab_timer_activated" /> + + <item android:id="@+id/on" android:state_selected="true" + android:drawable="@drawable/ic_tab_timer_activated" /> + + <item android:id="@+id/off" + android:drawable="@drawable/ic_tab_timer_normal" /> + + <transition android:fromId="@id/off" android:toId="@id/on"> + <animated-vector android:drawable="@drawable/ic_timer"> + <target + android:name="hourglass_frame" + android:animation="@animator/ic_timer_animation_hourglass_frame" /> + <target + android:name="hourglass_fill" + android:animation="@animator/ic_timer_animation_hourglass_fill" /> + <target + android:name="mask_1" + android:animation="@animator/ic_timer_animation_mask_1" /> + </animated-vector> + </transition> + +</animated-selector> diff --git a/res/drawable/notification_background.xml b/res/drawable/notification_background.xml new file mode 100644 index 000000000..78e4c8ea1 --- /dev/null +++ b/res/drawable/notification_background.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:attr/colorButtonNormal"> + <item android:id="@android:id/mask"> + <color android:color="?android:attr/colorButtonNormal" /> + </item> +</ripple>
\ No newline at end of file diff --git a/res/drawable/stopwatch_tab.xml b/res/drawable/stopwatch_tab.xml deleted file mode 100644 index 9404da01d..000000000 --- a/res/drawable/stopwatch_tab.xml +++ /dev/null @@ -1,26 +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. ---> - <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_pressed="false" - android:drawable="@drawable/ic_tab_stopwatch_activated" /> - <item android:state_focused="true" android:state_pressed="true" - android:drawable="@drawable/ic_tab_stopwatch_activated" /> - <item android:state_focused="false" android:state_pressed="true" - android:drawable="@drawable/ic_tab_stopwatch_activated" /> - <item android:state_selected="true" - android:drawable="@drawable/ic_tab_stopwatch_activated" /> - <item android:drawable="@drawable/ic_tab_stopwatch_normal" /> -</selector> diff --git a/res/drawable/timer_tab.xml b/res/drawable/timer_tab.xml deleted file mode 100644 index 75daefe05..000000000 --- a/res/drawable/timer_tab.xml +++ /dev/null @@ -1,26 +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. ---> - <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:state_pressed="false" - android:drawable="@drawable/ic_tab_timer_activated" /> - <item android:state_focused="true" android:state_pressed="true" - android:drawable="@drawable/ic_tab_timer_activated" /> - <item android:state_focused="false" android:state_pressed="true" - android:drawable="@drawable/ic_tab_timer_activated" /> - <item android:state_selected="true" - android:drawable="@drawable/ic_tab_timer_activated" /> - <item android:drawable="@drawable/ic_tab_timer_normal" /> -</selector> diff --git a/res/interpolator/ic_stopwatch_button_translatex_interpolator.xml b/res/interpolator/ic_stopwatch_button_translatex_interpolator.xml new file mode 100644 index 000000000..b9a5349a2 --- /dev/null +++ b/res/interpolator/ic_stopwatch_button_translatex_interpolator.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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. +--> + +<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android" + android:pathData="M 0.000000,0.000000 C 0.2,0 0.1,0.5 0.5,0.5 C 0.7,0.5 0.6,1 1,1 " /> diff --git a/res/layout-land/clock_fragment.xml b/res/layout-land/clock_fragment.xml index 02ce812cc..d5804b426 100644 --- a/res/layout-land/clock_fragment.xml +++ b/res/layout-land/clock_fragment.xml @@ -16,30 +16,34 @@ <!-- Use this clock_fragment for landscape, which has main clock frame next to cities, with a spacing ratio dependent on the number of clocks per row (phone has 1, tablet has 2). --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="@dimen/clock_side_padding" android:paddingEnd="@dimen/clock_side_padding" android:paddingTop="?android:attr/actionBarSize" - android:paddingBottom="@dimen/footer_button_size" > + android:orientation="horizontal"> + <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="2" + android:layout_marginBottom="@dimen/main_clock_bottom_margin" android:gravity="center"> + <include layout="@layout/main_clock_frame" android:id="@+id/main_clock_left_pane" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="2" - android:layout_gravity="center" /> - <ListView + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> + + <ListView android:id="@+id/cities" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="@integer/world_clocks_per_row" - android:clickable="false" - android:layout_gravity="center" /> - </LinearLayout> -</FrameLayout> + android:layout_gravity="center" + android:clickable="false" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-land/stopwatch_fragment.xml b/res/layout-land/stopwatch_fragment.xml index f5bc8ad0a..d7271f149 100644 --- a/res/layout-land/stopwatch_fragment.xml +++ b/res/layout-land/stopwatch_fragment.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:paddingTop="32dip" + android:paddingTop="?android:attr/actionBarSize" android:baselineAligned="false"> <Space @@ -27,37 +27,43 @@ android:layout_width="0dip" android:layout_height="match_parent"/> - <com.android.deskclock.CircleButtonsLayout - android:id="@+id/stopwatch_circle" - android:layout_width="@dimen/circle_size" - android:layout_height="@dimen/circle_size" - android:layout_gravity="center" - android:layout_marginLeft="32dip" - android:layout_marginBottom="32dip" - android:layout_marginRight="32dip"> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginBottom="@dimen/stopwatch_circle_margin_bottom" + android:gravity="center" + android:orientation="vertical"> + + <com.android.deskclock.CircleButtonsLayout + android:id="@+id/stopwatch_circle" + android:layout_width="@dimen/circle_size" + android:layout_height="@dimen/circle_size" + android:layout_marginStart="32dip" + android:layout_marginEnd="32dip" + android:gravity="center"> - <com.android.deskclock.timer.CountingTimerView - android:id="@+id/stopwatch_time_text" - android:layout_width="match_parent" - android:layout_height="match_parent" /> + <com.android.deskclock.timer.CountingTimerView + android:id="@+id/stopwatch_time_text" + android:layout_width="match_parent" + android:layout_height="match_parent" /> - <com.android.deskclock.CircleTimerView - android:id="@+id/stopwatch_time" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@null" /> + <com.android.deskclock.CircleTimerView + android:id="@+id/stopwatch_time" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@null" /> - </com.android.deskclock.CircleButtonsLayout> + </com.android.deskclock.CircleButtonsLayout> + + </LinearLayout> <ListView android:id="@+id/laps_list" - android:layout_marginTop="32dip" - android:layout_marginBottom="48dip" - android:layout_marginStart="@dimen/stopwatch_list_margin_start" - android:layout_marginEnd="16dip" - android:layout_gravity="center" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="2" + android:layout_marginBottom="8dip" + android:layout_gravity="center" /> <Space android:id="@+id/end_space" diff --git a/res/layout-land/time_setup_view.xml b/res/layout-land/time_setup_view.xml index 87d4f8e37..f07d182ce 100644 --- a/res/layout-land/time_setup_view.xml +++ b/res/layout-land/time_setup_view.xml @@ -20,7 +20,6 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginBottom="@dimen/footer_button_size" android:orientation="horizontal"> <!-- This nested ltr layout cannot be combined with the parent because @@ -30,9 +29,11 @@ android:layout_width="0dip" android:layout_height="match_parent" android:layout_weight="3" + android:layout_marginBottom="@dimen/footer_button_size" android:layoutDirection="ltr" android:gravity="center" - android:orientation="vertical"> + android:orientation="vertical" + > <com.android.deskclock.timer.TimerView android:id="@+id/timer_time_text" @@ -68,7 +69,7 @@ android:layout_width="0dip" android:layout_height="match_parent" android:layout_weight="2" - android:orientation="vertical"> + android:orientation="vertical" > <include android:id="@+id/first" diff --git a/res/layout-land/timer_fragment.xml b/res/layout-land/timer_fragment.xml index 2bcade293..6254e4fa0 100644 --- a/res/layout-land/timer_fragment.xml +++ b/res/layout-land/timer_fragment.xml @@ -19,7 +19,7 @@ android:id="@+id/timers_list_page" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="32dip" + android:paddingTop="?android:attr/actionBarSize" android:baselineAligned="false"> <include layout="@layout/timer_timer_view"/> diff --git a/res/layout/alarm_activity.xml b/res/layout/alarm_activity.xml index 056b250da..b46b0b741 100644 --- a/res/layout/alarm_activity.xml +++ b/res/layout/alarm_activity.xml @@ -59,30 +59,6 @@ android:textAppearance="@style/big_thin" android:textColor="@android:color/white" /> - <Space - android:layout_width="0dip" - android:layout_height="0dip" - android:layout_row="2" - android:layout_column="0" - android:layout_columnWeight="1" - android:layout_gravity="fill" /> - - <Space - android:layout_width="0dip" - android:layout_height="0dip" - android:layout_row="2" - android:layout_column="1" - android:layout_columnWeight="1" - android:layout_gravity="fill" /> - - <Space - android:layout_width="0dip" - android:layout_height="0dip" - android:layout_row="2" - android:layout_column="2" - android:layout_columnWeight="1" - android:layout_gravity="fill" /> - <View android:id="@+id/pulse" android:layout_width="@dimen/alarm_lockscreen_pulse_size" @@ -93,35 +69,37 @@ android:layout_gravity="center" android:background="@drawable/bg_circle_white" /> - <ImageButton + <ImageView android:id="@+id/snooze" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_row="2" android:layout_column="0" + android:layout_columnWeight="1" android:layout_gravity="center" android:background="@drawable/bg_circle_pink" - android:contentDescription="@string/alarm_alert_snooze_text" + android:contentDescription="@string/description_direction_left" android:src="@drawable/ic_snooze" /> - <ImageButton + <ImageView android:id="@+id/dismiss" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_row="2" android:layout_column="2" + android:layout_columnWeight="1" android:layout_gravity="center" android:background="@drawable/bg_circle_white" - android:contentDescription="@string/alarm_alert_dismiss_text" + android:contentDescription="@string/description_direction_right" android:src="@drawable/ic_alarm_off" /> - <ImageButton + <ImageView android:id="@+id/alarm" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_row="2" - android:layout_column="0" - android:layout_columnSpan="3" + android:layout_column="1" + android:layout_columnWeight="1" android:layout_gravity="center" android:background="@android:color/transparent" android:contentDescription="@string/description_direction_right" diff --git a/res/layout/alarm_clock.xml b/res/layout/alarm_clock.xml index 0157c71d7..056b7081f 100644 --- a/res/layout/alarm_clock.xml +++ b/res/layout/alarm_clock.xml @@ -40,6 +40,7 @@ android:layout_gravity="center" android:contentDescription="@string/no_alarms" android:drawableTop="@drawable/ic_noalarms" + android:gravity="center" android:text="@string/no_alarms" android:textColor="#4cffffff" android:paddingBottom="88dp" /> diff --git a/res/layout/alarm_time.xml b/res/layout/alarm_time.xml index af200d306..d095f0183 100755 --- a/res/layout/alarm_time.xml +++ b/res/layout/alarm_time.xml @@ -175,19 +175,19 @@ android:id="@+id/collapse_expand" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:contentDescription="@string/collapse_alarm"> + android:layout_gravity="bottom"> <ImageButton android:id="@+id/delete" - android:layout_width="wrap_content" - android:layout_height="48dip" + android:layout_width="@dimen/touch_target_min_size" + android:layout_height="@dimen/touch_target_min_size" + android:layout_gravity="center_vertical|start" android:layout_marginTop="@dimen/alarm_clock_vertical_margin" android:layout_marginBottom="@dimen/alarm_clock_vertical_margin" android:layout_marginStart="4dip" - android:layout_gravity="start" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/delete_alarm" + android:scaleType="center" android:src="@drawable/ic_delete_small" /> <View @@ -240,12 +240,13 @@ <ImageView android:id="@+id/arrow" - android:layout_width="wrap_content" - android:layout_height="48dip" + android:layout_width="@dimen/touch_target_min_size" + android:layout_height="@dimen/touch_target_min_size" android:layout_gravity="center_vertical|end" android:layout_marginTop="@dimen/alarm_clock_vertical_margin" android:layout_marginBottom="@dimen/alarm_clock_vertical_margin" android:contentDescription="@string/expand_alarm" + android:scaleType="center" android:src="@drawable/ic_expand_down" /> </FrameLayout> </FrameLayout> diff --git a/res/layout/cities_activity.xml b/res/layout/cities_activity.xml index b1f770a87..49822a58b 100644 --- a/res/layout/cities_activity.xml +++ b/res/layout/cities_activity.xml @@ -17,6 +17,7 @@ <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/cities_list" + android:theme="@style/CitiesListViewTheme" android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@null" diff --git a/res/layout/day_button.xml b/res/layout/day_button.xml index ccf679a01..9328e149e 100644 --- a/res/layout/day_button.xml +++ b/res/layout/day_button.xml @@ -17,11 +17,11 @@ <Button xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/body" android:layout_width="0dp" android:layout_height="48dp" android:layout_weight="1" android:background="@drawable/toggle_circle" android:gravity="center" android:minWidth="0dp" - android:minHeight="0dp" /> + android:minHeight="0dp" + android:textSize="@dimen/day_button_font_size" /> diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml index 0c17b4c0f..13cb78394 100644 --- a/res/layout/desk_clock.xml +++ b/res/layout/desk_clock.xml @@ -60,6 +60,7 @@ android:layout_margin="@dimen/footer_button_layout_margin" android:layout_gravity="center_horizontal" android:background="@drawable/floating_action_button" + android:elevation="8dip" android:scaleType="center" android:contentDescription="@null" /> diff --git a/res/layout/lap_view.xml b/res/layout/lap_view.xml index bc1b0542e..5130c115e 100644 --- a/res/layout/lap_view.xml +++ b/res/layout/lap_view.xml @@ -16,32 +16,32 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_marginTop="4dip" - android:layout_marginBottom="4dip" - android:gravity="center" + android:layout_width="match_parent" + android:layout_height="match_parent" android:layoutDirection="ltr" android:paddingTop="@dimen/body_font_padding" android:paddingBottom="@dimen/body_font_padding" - android:layout_width="match_parent" - android:layout_height="match_parent" > + android:gravity="center" + android:orientation="horizontal"> + <TextView android:id="@+id/lap_number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/sw_item_space" android:layout_marginEnd="@dimen/sw_item_space" android:gravity="start" android:textAllCaps="false" android:textAppearance="@style/SecondaryLabelTextAppearance" /> + <TextView android:id="@+id/lap_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/sw_item_space" android:layout_marginEnd="@dimen/sw_item_space" android:gravity="end" android:textAllCaps="false" android:textAppearance="@style/PrimaryLabelTextAppearance" /> + <TextView android:id="@+id/lap_total" android:layout_height="wrap_content" @@ -49,5 +49,5 @@ android:gravity="end" android:textAllCaps="false" android:textAppearance="@style/PrimaryLabelTextAppearance" /> -</LinearLayout> +</LinearLayout> diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml index e134ab71d..9805a8fd2 100644 --- a/res/layout/main_clock_frame.xml +++ b/res/layout/main_clock_frame.xml @@ -18,7 +18,8 @@ android:id="@+id/main_clock_frame" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + android:paddingEnd="@dimen/clock_fragment_end_padding" > <FrameLayout android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/res/layout/stopwatch_fragment.xml b/res/layout/stopwatch_fragment.xml index 6310ea20e..32b78de7e 100644 --- a/res/layout/stopwatch_fragment.xml +++ b/res/layout/stopwatch_fragment.xml @@ -62,6 +62,8 @@ android:layout_height="0dip" /> <Space + android:id="@+id/bottom_space" + android:visibility="gone" android:layout_width="match_parent" android:layout_height="@dimen/footer_button_size" android:layout_margin="@dimen/footer_button_layout_margin" /> diff --git a/res/layout/stopwatch_notif_expanded.xml b/res/layout/stopwatch_notif_expanded.xml index adbfffd33..840737382 100644 --- a/res/layout/stopwatch_notif_expanded.xml +++ b/res/layout/stopwatch_notif_expanded.xml @@ -93,10 +93,10 @@ <TextView android:id="@+id/swn_left_button" - android:background="?android:attr/selectableItemBackground" android:layout_width="0dp" android:layout_height="48dp" android:layout_weight="1" + android:background="@drawable/notification_background" android:drawablePadding="8dp" android:ellipsize="end" android:gravity="start|center_vertical" @@ -106,10 +106,10 @@ <TextView android:id="@+id/swn_right_button" - android:background="?android:attr/selectableItemBackground" android:layout_width="0dp" android:layout_height="48dp" android:layout_weight="1" + android:background="@drawable/notification_background" android:drawablePadding="8dp" android:ellipsize="end" android:gravity="start|center_vertical" diff --git a/res/layout/stopwatch_spacer.xml b/res/layout/stopwatch_spacer.xml new file mode 100644 index 000000000..31b648b93 --- /dev/null +++ b/res/layout/stopwatch_spacer.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<Space + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="@dimen/stopwatch_list_bottom_spacing" /> diff --git a/res/layout/world_clock_list_item.xml b/res/layout/world_clock_list_item.xml index ba4273b9f..49519dfa8 100644 --- a/res/layout/world_clock_list_item.xml +++ b/res/layout/world_clock_list_item.xml @@ -22,7 +22,7 @@ android:layout_marginEnd="@dimen/world_clock_margin" android:layout_marginLeft="@dimen/world_clock_margin" android:layout_marginStart="@dimen/world_clock_margin" - android:paddingEnd="@dimen/world_clock_end_padding" + android:paddingEnd="@dimen/clock_fragment_end_padding" android:orientation="horizontal"> <include layout="@layout/world_clock_item" diff --git a/res/values-af/array.xml b/res/values-af/array.xml index 9e9a54b34..9fd808b2e 100644 --- a/res/values-af/array.xml +++ b/res/values-af/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index a824cb90d..9e6173e1e 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minute"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nooit"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minute"</item> - <item msgid="3663730603519549990">"10 minute"</item> - <item msgid="1385481095199681200">"15 minute"</item> - <item msgid="420479821767342125">"20 minute"</item> - <item msgid="2107936130151066746">"25 minute"</item> - <item msgid="7219791437023378544">"30 minute"</item> + <item msgid="3024545954917711306">"1 minuut"</item> + <item msgid="5431906692406316549">"5 minute"</item> + <item msgid="7742728812068919959">"10 minute"</item> + <item msgid="2855948657259647629">"15 minute"</item> + <item msgid="6330196381284475079">"20 minute"</item> + <item msgid="7809240121716151904">"25 minute"</item> <item msgid="4278641338024561333">"Nooit"</item> </string-array> <string name="done" msgid="6509722361933858451">"Klaar"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Horlosieskerm"</string> <string name="label_description" msgid="8736179296142915727">"Etiket"</string> <string name="ringtone_description" msgid="7580922112921069925">"Luitoon"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Weerinligting is nie nou beskikbaar nie."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Klankterugspeel-diens vir wekkers word in Clock gestel."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Laai tans luitoon…"</string> diff --git a/res/values-am/array.xml b/res/values-am/array.xml index 5b5d82fad..e89c8a7bf 100644 --- a/res/values-am/array.xml +++ b/res/values-am/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"ቴጉሲጋልፓ"</item> <item msgid="7087691675228926801">"ፓራማሪቦ"</item> <item msgid="478384295484578701">"ኩይቶ"</item> + <item msgid="4517870253399384206">"ልዩብልያና"</item> </string-array> </resources> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 04d5870b3..0c8c2e5b5 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ደቂቃዎች"</string> <string name="auto_silence_never" msgid="4821982647348750809">"በጭራሽ"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 ደቂቃዎች"</item> - <item msgid="3663730603519549990">"10 ደቂቃዎች"</item> - <item msgid="1385481095199681200">"15 ደቂቃዎች"</item> - <item msgid="420479821767342125">"20 ደቂቃዎች"</item> - <item msgid="2107936130151066746">"25 ደቂቃዎች"</item> - <item msgid="7219791437023378544">"30 ደቂቃዎች"</item> + <item msgid="3024545954917711306">"1 ደቂቃ"</item> + <item msgid="5431906692406316549">"5 ደቂቃዎች"</item> + <item msgid="7742728812068919959">"10 ደቂቃዎች"</item> + <item msgid="2855948657259647629">"15 ደቂቃዎች"</item> + <item msgid="6330196381284475079">"20 ደቂቃዎች"</item> + <item msgid="7809240121716151904">"25 ደቂቃዎች"</item> <item msgid="4278641338024561333">"በጭራሽ"</item> </string-array> <string name="done" msgid="6509722361933858451">"ተከናውኗል"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"ሰዓት ማሳያ"</string> <string name="label_description" msgid="8736179296142915727">"መለያ ስም"</string> <string name="ringtone_description" msgid="7580922112921069925">"የደወል ቅላጼ"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"የአየር ጠባይ መረጃ አሁን አይገኝም፡፡"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"በጠረጴዛ ሰዓት ለተዘጋጁ ማንቂያ ደውሎች የዳግም አጫዋት አገልግሎት ድምፅ አሰማ።"</string> <string name="loading_ringtone" msgid="6523322777415268044">"የስልክ ጥሪ ድምፅ በመስቀል ላይ...."</string> diff --git a/res/values-ar/array.xml b/res/values-ar/array.xml index 60c5a2e56..a89dbb117 100644 --- a/res/values-ar/array.xml +++ b/res/values-ar/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"تيغوسيغالبا"</item> <item msgid="7087691675228926801">"باراماریبو"</item> <item msgid="478384295484578701">"كيتو"</item> + <item msgid="4517870253399384206">"ليوبليانا"</item> </string-array> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 3b89002ec..102dca0b6 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> دقيقة"</string> <string name="auto_silence_never" msgid="4821982647348750809">"أبدًا"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 دقائق"</item> - <item msgid="3663730603519549990">"10 دقائق"</item> - <item msgid="1385481095199681200">"15 دقيقة"</item> - <item msgid="420479821767342125">"20 دقيقة"</item> - <item msgid="2107936130151066746">"25 دقيقة"</item> - <item msgid="7219791437023378544">"30 دقيقة"</item> + <item msgid="3024545954917711306">"دقيقة واحدة"</item> + <item msgid="5431906692406316549">"5 دقائق"</item> + <item msgid="7742728812068919959">"10 دقائق"</item> + <item msgid="2855948657259647629">"15 دقيقة"</item> + <item msgid="6330196381284475079">"20 دقيقة"</item> + <item msgid="7809240121716151904">"25 دقيقة"</item> <item msgid="4278641338024561333">"أبدًا"</item> </string-array> <string name="done" msgid="6509722361933858451">"تم"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"عرض الساعة"</string> <string name="label_description" msgid="8736179296142915727">"تصنيف"</string> <string name="ringtone_description" msgid="7580922112921069925">"نغمة الرنين"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"معلومات الطقس غير متاحة في الوقت الحالي."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"خدمة تشغيل الصوت بالنسبة إلى الاشعارات التي تم تعيينها في الساعة."</string> <string name="loading_ringtone" msgid="6523322777415268044">"جارٍ تحميل نغمة الرنين…"</string> diff --git a/res/values-bg/array.xml b/res/values-bg/array.xml index 13546dfa1..638d71133 100644 --- a/res/values-bg/array.xml +++ b/res/values-bg/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегусигалпа"</item> <item msgid="7087691675228926801">"Парамарибо"</item> <item msgid="478384295484578701">"Кито"</item> + <item msgid="4517870253399384206">"Любляна"</item> </string-array> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 407262f11..ebf920fba 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минути"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Никога"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 минути"</item> - <item msgid="3663730603519549990">"10 минути"</item> - <item msgid="1385481095199681200">"15 минути"</item> - <item msgid="420479821767342125">"20 минути"</item> - <item msgid="2107936130151066746">"25 минути"</item> - <item msgid="7219791437023378544">"30 минути"</item> + <item msgid="3024545954917711306">"1 минута"</item> + <item msgid="5431906692406316549">"5 минути"</item> + <item msgid="7742728812068919959">"10 минути"</item> + <item msgid="2855948657259647629">"15 минути"</item> + <item msgid="6330196381284475079">"20 минути"</item> + <item msgid="7809240121716151904">"25 минути"</item> <item msgid="4278641338024561333">"Никога"</item> </string-array> <string name="done" msgid="6509722361933858451">"Готово"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Показване на часовника"</string> <string name="label_description" msgid="8736179296142915727">"Етикет"</string> <string name="ringtone_description" msgid="7580922112921069925">"Мелодия"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"В момента няма информация за времето."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Услуга за възпроизвеждане на звук за будилниците, зададени в часовника."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Мелодията се зарежда..."</string> diff --git a/res/values-bn-rBD/array.xml b/res/values-bn-rBD/array.xml index 86603d701..97cd32671 100644 --- a/res/values-bn-rBD/array.xml +++ b/res/values-bn-rBD/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"তেগুসিগালপা"</item> <item msgid="7087691675228926801">"প্যারামেরিবো"</item> <item msgid="478384295484578701">"কিটো"</item> + <item msgid="4517870253399384206">"লুবলিয়ানা"</item> </string-array> </resources> diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index 3b6e3129e..ba2d925bd 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> মিনিট"</string> <string name="auto_silence_never" msgid="4821982647348750809">"কখনই নয়"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 মিনিট"</item> - <item msgid="3663730603519549990">"10 মিনিট"</item> - <item msgid="1385481095199681200">"15 মিনিট"</item> - <item msgid="420479821767342125">"20 মিনিট"</item> - <item msgid="2107936130151066746">"25 মিনিট"</item> - <item msgid="7219791437023378544">"30 মিনিট"</item> + <item msgid="3024545954917711306">"১ মিনিট"</item> + <item msgid="5431906692406316549">"৫ মিনিট"</item> + <item msgid="7742728812068919959">"১০ মিনিট"</item> + <item msgid="2855948657259647629">"১৫ মিনিট"</item> + <item msgid="6330196381284475079">"২০ মিনিট"</item> + <item msgid="7809240121716151904">"২৫ মিনিট"</item> <item msgid="4278641338024561333">"কখনই নয়"</item> </string-array> <string name="done" msgid="6509722361933858451">"সম্পন্ন"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"ঘড়ি প্রদর্শন"</string> <string name="label_description" msgid="8736179296142915727">"লেবেল"</string> <string name="ringtone_description" msgid="7580922112921069925">"রিংটোন"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"ঠিক এ মুহূর্তে আবহাওয়ার তথ্য উপলব্ধ নয়।"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"ঘড়িতে অ্যালার্মের জন্য সাউন্ড প্লেব্যাক পরিষেবা।"</string> <string name="loading_ringtone" msgid="6523322777415268044">"রিংটোন লোড হচ্ছে…"</string> diff --git a/res/values-ca/array.xml b/res/values-ca/array.xml index 10a576ce4..6fbe22131 100644 --- a/res/values-ca/array.xml +++ b/res/values-ca/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index d23b3bbfb..a59051a42 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuts"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Mai"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minuts"</item> - <item msgid="3663730603519549990">"10 minuts"</item> - <item msgid="1385481095199681200">"15 minuts"</item> - <item msgid="420479821767342125">"20 minuts"</item> - <item msgid="2107936130151066746">"25 minuts"</item> - <item msgid="7219791437023378544">"30 minuts"</item> + <item msgid="3024545954917711306">"1 minut"</item> + <item msgid="5431906692406316549">"5 minuts"</item> + <item msgid="7742728812068919959">"10 minuts"</item> + <item msgid="2855948657259647629">"15 minuts"</item> + <item msgid="6330196381284475079">"20 minuts"</item> + <item msgid="7809240121716151904">"25 minuts"</item> <item msgid="4278641338024561333">"Mai"</item> </string-array> <string name="done" msgid="6509722361933858451">"Fet"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Visualització del rellotge"</string> <string name="label_description" msgid="8736179296142915727">"Nom"</string> <string name="ringtone_description" msgid="7580922112921069925">"To"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"La informació meteorològica no està disponible en aquest moment."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Reproducció d\'alarmes definides al rellotge."</string> <string name="loading_ringtone" msgid="6523322777415268044">"S\'està carregant el to..."</string> diff --git a/res/values-cs/array.xml b/res/values-cs/array.xml index 789a1afad..0f063e50a 100644 --- a/res/values-cs/array.xml +++ b/res/values-cs/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Lublaň"</item> </string-array> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 1d8229411..bff54d672 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nikdy"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutách"</item> - <item msgid="3663730603519549990">"10 minutách"</item> - <item msgid="1385481095199681200">"15 minutách"</item> - <item msgid="420479821767342125">"20 minutách"</item> - <item msgid="2107936130151066746">"25 minutách"</item> - <item msgid="7219791437023378544">"30 minutách"</item> + <item msgid="3024545954917711306">"1 minuta"</item> + <item msgid="5431906692406316549">"5 minutách"</item> + <item msgid="7742728812068919959">"10 minutách"</item> + <item msgid="2855948657259647629">"15 minutách"</item> + <item msgid="6330196381284475079">"20 minutách"</item> + <item msgid="7809240121716151904">"25 minutách"</item> <item msgid="4278641338024561333">"Nikdy"</item> </string-array> <string name="done" msgid="6509722361933858451">"Hotovo"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Zobrazení hodin"</string> <string name="label_description" msgid="8736179296142915727">"Štítek"</string> <string name="ringtone_description" msgid="7580922112921069925">"Vyzváněcí tón"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Informace o počasí nejsou momentálně k dispozici."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Služba přehrávání zvuku budíků nastavených v aplikaci Hodiny."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Načítání vyzváněcího tónu..."</string> diff --git a/res/values-da/array.xml b/res/values-da/array.xml index f4f6d296d..632206744 100644 --- a/res/values-da/array.xml +++ b/res/values-da/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 3b0dc41fa..a15134fe7 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutter"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Aldrig"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutter"</item> - <item msgid="3663730603519549990">"10 minutter"</item> - <item msgid="1385481095199681200">"15 minutter"</item> - <item msgid="420479821767342125">"20 minutter"</item> - <item msgid="2107936130151066746">"25 minutter"</item> - <item msgid="7219791437023378544">"30 minutter"</item> + <item msgid="3024545954917711306">"1 minut"</item> + <item msgid="5431906692406316549">"5 minutter"</item> + <item msgid="7742728812068919959">"10 minutter"</item> + <item msgid="2855948657259647629">"15 minutter"</item> + <item msgid="6330196381284475079">"20 minutter"</item> + <item msgid="7809240121716151904">"25 minutter"</item> <item msgid="4278641338024561333">"Aldrig"</item> </string-array> <string name="done" msgid="6509722361933858451">"OK"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Urvisning"</string> <string name="label_description" msgid="8736179296142915727">"Etiket"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ringetone"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Vejroplysninger er ikke tilgængelige lige nu."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Tjenesten til afspilning af alarmlyd, der er angivet i uret."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Indlæser ringetone..."</string> diff --git a/res/values-de/array.xml b/res/values-de/array.xml index 0640ae8bf..d753dc2a6 100644 --- a/res/values-de/array.xml +++ b/res/values-de/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index e68046418..1a9efabdb 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> Minuten"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nie"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 Minuten"</item> - <item msgid="3663730603519549990">"10 Minuten"</item> - <item msgid="1385481095199681200">"15 Minuten"</item> - <item msgid="420479821767342125">"20 Minuten"</item> - <item msgid="2107936130151066746">"25 Minuten"</item> - <item msgid="7219791437023378544">"30 Minuten"</item> + <item msgid="3024545954917711306">"1 Minute"</item> + <item msgid="5431906692406316549">"5 Minuten"</item> + <item msgid="7742728812068919959">"10 Minuten"</item> + <item msgid="2855948657259647629">"15 Minuten"</item> + <item msgid="6330196381284475079">"20 Minuten"</item> + <item msgid="7809240121716151904">"25 Minuten"</item> <item msgid="4278641338024561333">"Nie"</item> </string-array> <string name="done" msgid="6509722361933858451">"Fertig"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Uhrendisplay"</string> <string name="label_description" msgid="8736179296142915727">"Name"</string> <string name="ringtone_description" msgid="7580922112921069925">"Klingelton"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Wetterinformationen sind derzeit nicht verfügbar."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Tonwiedergabedienst für in der Weckfunktion eingestellte Wecker"</string> <string name="loading_ringtone" msgid="6523322777415268044">"Klingelton wird geladen..."</string> diff --git a/res/values-el/array.xml b/res/values-el/array.xml index 24f28f181..29107db51 100644 --- a/res/values-el/array.xml +++ b/res/values-el/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Τεγκουσιγκάλπα"</item> <item msgid="7087691675228926801">"Παραμαρίμπο"</item> <item msgid="478384295484578701">"Κουίτο"</item> + <item msgid="4517870253399384206">"Λιουμπλιάνα"</item> </string-array> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index eae5edf7c..0ff72cd60 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> λεπτά"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Ποτέ"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 λεπτά"</item> - <item msgid="3663730603519549990">"10 λεπτά"</item> - <item msgid="1385481095199681200">"15 λεπτά"</item> - <item msgid="420479821767342125">"20 λεπτά"</item> - <item msgid="2107936130151066746">"25 λεπτά"</item> - <item msgid="7219791437023378544">"30 λεπτά"</item> + <item msgid="3024545954917711306">"1 λεπτό"</item> + <item msgid="5431906692406316549">"5 λεπτά"</item> + <item msgid="7742728812068919959">"10 λεπτά"</item> + <item msgid="2855948657259647629">"15 λεπτά"</item> + <item msgid="6330196381284475079">"20 λεπτά"</item> + <item msgid="7809240121716151904">"25 λεπτά"</item> <item msgid="4278641338024561333">"Ποτέ"</item> </string-array> <string name="done" msgid="6509722361933858451">"Τέλος"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Οθόνη ρολογιού"</string> <string name="label_description" msgid="8736179296142915727">"Ετικέτα"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ήχος κλήσης"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Οι πληροφορίες καιρού δεν είναι διαθέσιμες αυτήν τη στιγμή."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Η υπηρεσία αναπαραγωγής ήχου για ειδοποιήσεις έχει ρυθμιστεί στο Ρολόι."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Φόρτωση ήχου κλήσης"</string> diff --git a/res/values-en-rGB/array.xml b/res/values-en-rGB/array.xml index d2acbe1dc..aa53872e5 100644 --- a/res/values-en-rGB/array.xml +++ b/res/values-en-rGB/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 15c297bff..7bb0ae053 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Never"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutes"</item> - <item msgid="3663730603519549990">"10 minutes"</item> - <item msgid="1385481095199681200">"15 minutes"</item> - <item msgid="420479821767342125">"20 minutes"</item> - <item msgid="2107936130151066746">"25 minutes"</item> - <item msgid="7219791437023378544">"30 minutes"</item> + <item msgid="3024545954917711306">"1 minute"</item> + <item msgid="5431906692406316549">"5 minutes"</item> + <item msgid="7742728812068919959">"10 minutes"</item> + <item msgid="2855948657259647629">"15 minutes"</item> + <item msgid="6330196381284475079">"20 minutes"</item> + <item msgid="7809240121716151904">"25 minutes"</item> <item msgid="4278641338024561333">"Never"</item> </string-array> <string name="done" msgid="6509722361933858451">"Done"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Clock display"</string> <string name="label_description" msgid="8736179296142915727">"Label"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ring tone"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Weather information isn\'t available at the moment."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Sound playback service for alarms set in Clock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Loading ringtone…"</string> diff --git a/res/values-en-rIN/array.xml b/res/values-en-rIN/array.xml index 369e8501d..d1adea595 100644 --- a/res/values-en-rIN/array.xml +++ b/res/values-en-rIN/array.xml @@ -317,6 +317,7 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> <item>Marshall Islands</item> <item>Midway Island</item> <item>Regina</item> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 15c297bff..7bb0ae053 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Never"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutes"</item> - <item msgid="3663730603519549990">"10 minutes"</item> - <item msgid="1385481095199681200">"15 minutes"</item> - <item msgid="420479821767342125">"20 minutes"</item> - <item msgid="2107936130151066746">"25 minutes"</item> - <item msgid="7219791437023378544">"30 minutes"</item> + <item msgid="3024545954917711306">"1 minute"</item> + <item msgid="5431906692406316549">"5 minutes"</item> + <item msgid="7742728812068919959">"10 minutes"</item> + <item msgid="2855948657259647629">"15 minutes"</item> + <item msgid="6330196381284475079">"20 minutes"</item> + <item msgid="7809240121716151904">"25 minutes"</item> <item msgid="4278641338024561333">"Never"</item> </string-array> <string name="done" msgid="6509722361933858451">"Done"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Clock display"</string> <string name="label_description" msgid="8736179296142915727">"Label"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ring tone"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Weather information isn\'t available at the moment."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Sound playback service for alarms set in Clock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Loading ringtone…"</string> diff --git a/res/values-es-rUS/array.xml b/res/values-es-rUS/array.xml index c4441f97f..6e865dffa 100644 --- a/res/values-es-rUS/array.xml +++ b/res/values-es-rUS/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Liubliana"</item> </string-array> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 9dffc2685..fa58e42b9 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutos"</item> - <item msgid="3663730603519549990">"10 minutos"</item> - <item msgid="1385481095199681200">"15 minutos"</item> - <item msgid="420479821767342125">"20 minutos"</item> - <item msgid="2107936130151066746">"25 minutos"</item> - <item msgid="7219791437023378544">"30 minutos"</item> + <item msgid="3024545954917711306">"1 minuto"</item> + <item msgid="5431906692406316549">"5 minutos"</item> + <item msgid="7742728812068919959">"10 minutos"</item> + <item msgid="2855948657259647629">"15 minutos"</item> + <item msgid="6330196381284475079">"20 minutos"</item> + <item msgid="7809240121716151904">"25 minutos"</item> <item msgid="4278641338024561333">"Nunca"</item> </string-array> <string name="done" msgid="6509722361933858451">"Listo"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Visualización del reloj"</string> <string name="label_description" msgid="8736179296142915727">"Etiqueta"</string> <string name="ringtone_description" msgid="7580922112921069925">"Tono"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"La información meteorológica no está disponible en este momento."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Servicio de reproducción de sonidos para alarmas configuradas en Reloj"</string> <string name="loading_ringtone" msgid="6523322777415268044">"Cargando tono..."</string> diff --git a/res/values-es/array.xml b/res/values-es/array.xml index 14fc90c93..49ca919b9 100644 --- a/res/values-es/array.xml +++ b/res/values-es/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Liubliana"</item> </string-array> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 828564fc8..0e592de90 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutos"</item> - <item msgid="3663730603519549990">"10 minutos"</item> - <item msgid="1385481095199681200">"15 minutos"</item> - <item msgid="420479821767342125">"20 minutos"</item> - <item msgid="2107936130151066746">"25 minutos"</item> - <item msgid="7219791437023378544">"30 minutos"</item> + <item msgid="3024545954917711306">"1 minuto"</item> + <item msgid="5431906692406316549">"5 minutos"</item> + <item msgid="7742728812068919959">"10 minutos"</item> + <item msgid="2855948657259647629">"15 minutos"</item> + <item msgid="6330196381284475079">"20 minutos"</item> + <item msgid="7809240121716151904">"25 minutos"</item> <item msgid="4278641338024561333">"Nunca"</item> </string-array> <string name="done" msgid="6509722361933858451">"Listo"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Reloj"</string> <string name="label_description" msgid="8736179296142915727">"Nombre"</string> <string name="ringtone_description" msgid="7580922112921069925">"Tono de llamada"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"La información meteorológica no está disponible en este momento."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Reproducción de alarmas definidas en Reloj"</string> <string name="loading_ringtone" msgid="6523322777415268044">"Cargando tono…"</string> diff --git a/res/values-et-rEE/array.xml b/res/values-et-rEE/array.xml index 44b7cc5fe..5e7c7048d 100644 --- a/res/values-et-rEE/array.xml +++ b/res/values-et-rEE/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 24c84dcdd..965d3c186 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutit"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Mitte kunagi"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutit"</item> - <item msgid="3663730603519549990">"10 minutit"</item> - <item msgid="1385481095199681200">"15 minutit"</item> - <item msgid="420479821767342125">"20 minutit"</item> - <item msgid="2107936130151066746">"25 minutit"</item> - <item msgid="7219791437023378544">"30 minutit"</item> + <item msgid="3024545954917711306">"1 minut"</item> + <item msgid="5431906692406316549">"5 minutit"</item> + <item msgid="7742728812068919959">"10 minutit"</item> + <item msgid="2855948657259647629">"15 minutit"</item> + <item msgid="6330196381284475079">"20 minutit"</item> + <item msgid="7809240121716151904">"25 minutit"</item> <item msgid="4278641338024561333">"Mitte kunagi"</item> </string-array> <string name="done" msgid="6509722361933858451">"Valmis"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Kella ekraan"</string> <string name="label_description" msgid="8736179296142915727">"Silt"</string> <string name="ringtone_description" msgid="7580922112921069925">"Helin"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Ilmateade ei ole praegu saadaval."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Kellas äratuste jaoks määratud heli taasesitamise teenus."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Helina laadimine ..."</string> diff --git a/res/values-eu-rES/array.xml b/res/values-eu-rES/array.xml index 2ce00143a..c9ec155fb 100644 --- a/res/values-eu-rES/array.xml +++ b/res/values-eu-rES/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index 1290aad4d..b80726441 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutu"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Inoiz ez"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutu"</item> - <item msgid="3663730603519549990">"10 minutu"</item> - <item msgid="1385481095199681200">"15 minutu"</item> - <item msgid="420479821767342125">"20 minutu"</item> - <item msgid="2107936130151066746">"25 minutu"</item> - <item msgid="7219791437023378544">"30 minutu"</item> + <item msgid="3024545954917711306">"1 minutu"</item> + <item msgid="5431906692406316549">"5 minutu"</item> + <item msgid="7742728812068919959">"10 minutu"</item> + <item msgid="2855948657259647629">"15 minutu"</item> + <item msgid="6330196381284475079">"20 minutu"</item> + <item msgid="7809240121716151904">"25 minutu"</item> <item msgid="4278641338024561333">"Inoiz ez"</item> </string-array> <string name="done" msgid="6509722361933858451">"Eginda"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Erlojuaren bistaratzea"</string> <string name="label_description" msgid="8736179296142915727">"Etiketa"</string> <string name="ringtone_description" msgid="7580922112921069925">"Tonua"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="PERCENT">%%</xliff:g> <xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Eguraldi-informazioa ez dago une honetan eskuragarri."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Erlojuan ezarritako alarmetarako soinuen erreprodukzio-zerbitzua."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Tonua kargatzen…"</string> diff --git a/res/values-fa/array.xml b/res/values-fa/array.xml index 950e89c66..435f88aca 100644 --- a/res/values-fa/array.xml +++ b/res/values-fa/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"تگوسیگالپا"</item> <item msgid="7087691675228926801">"پاراماريبو"</item> <item msgid="478384295484578701">"کویتو"</item> + <item msgid="4517870253399384206">"لیوبلیانا"</item> </string-array> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index a70bb044f..1f3874266 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> دقیقه"</string> <string name="auto_silence_never" msgid="4821982647348750809">"هیچوقت"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"۵ دقیقه"</item> - <item msgid="3663730603519549990">"۱۰ دقیقه"</item> - <item msgid="1385481095199681200">"۱۵ دقیقه"</item> - <item msgid="420479821767342125">"۲۰ دقیقه"</item> - <item msgid="2107936130151066746">"۲۵ دقیقه"</item> - <item msgid="7219791437023378544">"۳۰ دقیقه"</item> + <item msgid="3024545954917711306">"۱ دقیقه"</item> + <item msgid="5431906692406316549">"۵ دقیقه"</item> + <item msgid="7742728812068919959">"۱۰ دقیقه"</item> + <item msgid="2855948657259647629">"۱۵ دقیقه"</item> + <item msgid="6330196381284475079">"۲۰ دقیقه"</item> + <item msgid="7809240121716151904">"۲۵ دقیقه"</item> <item msgid="4278641338024561333">"هیچوقت"</item> </string-array> <string name="done" msgid="6509722361933858451">"انجام شد"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"نمایش ساعت"</string> <string name="label_description" msgid="8736179296142915727">"برچسب"</string> <string name="ringtone_description" msgid="7580922112921069925">"آهنگ زنگ"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"اطلاعات آب و هوا در حال حاضر در دسترس نیست."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"نمظیم سرویس بازپخش صدا برای هشدارها در \"ساعت رومیزی\"."</string> <string name="loading_ringtone" msgid="6523322777415268044">"در حال بارگیری آهنگ زنگ..."</string> diff --git a/res/values-fi/array.xml b/res/values-fi/array.xml index f797f019e..f1ea6661e 100644 --- a/res/values-fi/array.xml +++ b/res/values-fi/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 1bbfaace8..bea7d515c 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuuttia"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Ei koskaan"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minuuttia"</item> - <item msgid="3663730603519549990">"10 minuuttia"</item> - <item msgid="1385481095199681200">"15 minuuttia"</item> - <item msgid="420479821767342125">"20 minuuttia"</item> - <item msgid="2107936130151066746">"25 minuuttia"</item> - <item msgid="7219791437023378544">"30 minuuttia"</item> + <item msgid="3024545954917711306">"1 minuutti"</item> + <item msgid="5431906692406316549">"5 minuuttia"</item> + <item msgid="7742728812068919959">"10 minuuttia"</item> + <item msgid="2855948657259647629">"15 minuuttia"</item> + <item msgid="6330196381284475079">"20 minuuttia"</item> + <item msgid="7809240121716151904">"25 minuuttia"</item> <item msgid="4278641338024561333">"Ei koskaan"</item> </string-array> <string name="done" msgid="6509722361933858451">"Valmis"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Kellon näyttö"</string> <string name="label_description" msgid="8736179296142915727">"Tunniste"</string> <string name="ringtone_description" msgid="7580922112921069925">"Soittoääni"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Säätietoja ei ole saatavilla juuri nyt."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Äänentoistopalvelu Kelloon asetetuille hälytyksille."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Ladataan soittoääntä..."</string> diff --git a/res/values-fr-rCA/array.xml b/res/values-fr-rCA/array.xml index f4de8f081..e77b614cd 100644 --- a/res/values-fr-rCA/array.xml +++ b/res/values-fr-rCA/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index c2b6b1db1..ac8be9af0 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Jamais"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutes"</item> - <item msgid="3663730603519549990">"10 minutes"</item> - <item msgid="1385481095199681200">"15 minutes"</item> - <item msgid="420479821767342125">"20 minutes"</item> - <item msgid="2107936130151066746">"25 minutes"</item> - <item msgid="7219791437023378544">"30 minutes"</item> + <item msgid="3024545954917711306">"1 minute"</item> + <item msgid="5431906692406316549">"5 minutes"</item> + <item msgid="7742728812068919959">"10 minutes"</item> + <item msgid="2855948657259647629">"15 minutes"</item> + <item msgid="6330196381284475079">"20 minutes"</item> + <item msgid="7809240121716151904">"25 minutes"</item> <item msgid="4278641338024561333">"Jamais"</item> </string-array> <string name="done" msgid="6509722361933858451">"Terminé"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Affichage de l\'horloge"</string> <string name="label_description" msgid="8736179296142915727">"Étiquette"</string> <string name="ringtone_description" msgid="7580922112921069925">"Sonnerie"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Les informations météo ne sont pas disponibles actuellement."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Service de retour audio pour les alarmes définies via l\'Horloge de bureau."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Chargement de la sonnerie..."</string> diff --git a/res/values-fr/array.xml b/res/values-fr/array.xml index d20dedbea..df396c534 100644 --- a/res/values-fr/array.xml +++ b/res/values-fr/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index d4a0459a6..be358e19a 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutes"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Jamais"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutes"</item> - <item msgid="3663730603519549990">"10 minutes"</item> - <item msgid="1385481095199681200">"15 minutes"</item> - <item msgid="420479821767342125">"20 minutes"</item> - <item msgid="2107936130151066746">"25 minutes"</item> - <item msgid="7219791437023378544">"30 minutes"</item> + <item msgid="3024545954917711306">"Une minute"</item> + <item msgid="5431906692406316549">"5 minutes"</item> + <item msgid="7742728812068919959">"10 minutes"</item> + <item msgid="2855948657259647629">"15 minutes"</item> + <item msgid="6330196381284475079">"20 minutes"</item> + <item msgid="7809240121716151904">"25 minutes"</item> <item msgid="4278641338024561333">"Jamais"</item> </string-array> <string name="done" msgid="6509722361933858451">"OK"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Affichage de l\'horloge"</string> <string name="label_description" msgid="8736179296142915727">"Libellé"</string> <string name="ringtone_description" msgid="7580922112921069925">"Sonnerie"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Les informations météo ne sont pas disponibles actuellement."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Service de retour audio pour les alarmes définies via l\'Horloge de bureau."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Chargement de la sonnerie..."</string> diff --git a/res/values-gl-rES/array.xml b/res/values-gl-rES/array.xml index 2ece2d863..e9f200e97 100644 --- a/res/values-gl-rES/array.xml +++ b/res/values-gl-rES/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index 960791a40..649fd27f0 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutos"</item> - <item msgid="3663730603519549990">"10 minutos"</item> - <item msgid="1385481095199681200">"15 minutos"</item> - <item msgid="420479821767342125">"20 minutos"</item> - <item msgid="2107936130151066746">"25 minutos"</item> - <item msgid="7219791437023378544">"30 minutos"</item> + <item msgid="3024545954917711306">"1 minuto"</item> + <item msgid="5431906692406316549">"5 minutos"</item> + <item msgid="7742728812068919959">"10 minutos"</item> + <item msgid="2855948657259647629">"15 minutos"</item> + <item msgid="6330196381284475079">"20 minutos"</item> + <item msgid="7809240121716151904">"25 minutos"</item> <item msgid="4278641338024561333">"Nunca"</item> </string-array> <string name="done" msgid="6509722361933858451">"Feito"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Pantalla do reloxo"</string> <string name="label_description" msgid="8736179296142915727">"Etiqueta"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ton de chamada"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"A información meteorolóxica non está dispoñible neste momento."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Servizo de reprodución de son para alarmas definido en Reloxo."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Cargando ton de chamada..."</string> diff --git a/res/values-hi/array.xml b/res/values-hi/array.xml index 1664558c2..e19f55ba7 100644 --- a/res/values-hi/array.xml +++ b/res/values-hi/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"टेगुसिगाल्पा"</item> <item msgid="7087691675228926801">"पेरामरिबो"</item> <item msgid="478384295484578701">"क्विटो"</item> + <item msgid="4517870253399384206">"लुबलियाना"</item> </string-array> </resources> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 9b7d1f0a8..3e45f6309 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> मिनट"</string> <string name="auto_silence_never" msgid="4821982647348750809">"कभी नहीं"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 मिनट"</item> - <item msgid="3663730603519549990">"10 मिनट"</item> - <item msgid="1385481095199681200">"15 मिनट"</item> - <item msgid="420479821767342125">"20 मिनट"</item> - <item msgid="2107936130151066746">"25 मिनट"</item> - <item msgid="7219791437023378544">"30 मिनट"</item> + <item msgid="3024545954917711306">"1 मिनट"</item> + <item msgid="5431906692406316549">"5 मिनट"</item> + <item msgid="7742728812068919959">"10 मिनट"</item> + <item msgid="2855948657259647629">"15 मिनट"</item> + <item msgid="6330196381284475079">"20 मिनट"</item> + <item msgid="7809240121716151904">"25 मिनट"</item> <item msgid="4278641338024561333">"कभी नहीं"</item> </string-array> <string name="done" msgid="6509722361933858451">"हो गया"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"घड़ी का प्रदर्शन"</string> <string name="label_description" msgid="8736179296142915727">"लेबल"</string> <string name="ringtone_description" msgid="7580922112921069925">"रिंगटोन"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"मौसम की जानकारी अभी उपलब्ध नहीं है."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"घड़ी में सेट अलार्म के लिए आवाज़ प्लेबैक सेवा."</string> <string name="loading_ringtone" msgid="6523322777415268044">"रिंगटोन लोड कर रहा है…"</string> diff --git a/res/values-hr/array.xml b/res/values-hr/array.xml index 8d9b995dc..0b46217eb 100644 --- a/res/values-hr/array.xml +++ b/res/values-hr/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index e20db85a9..e7075f41c 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nikada"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minuta"</item> - <item msgid="3663730603519549990">"10 minuta"</item> - <item msgid="1385481095199681200">"15 minuta"</item> - <item msgid="420479821767342125">"20 minuta"</item> - <item msgid="2107936130151066746">"25 minuta"</item> - <item msgid="7219791437023378544">"30 minuta"</item> + <item msgid="3024545954917711306">"1 minuta"</item> + <item msgid="5431906692406316549">"5 minuta"</item> + <item msgid="7742728812068919959">"10 minuta"</item> + <item msgid="2855948657259647629">"15 minuta"</item> + <item msgid="6330196381284475079">"20 minuta"</item> + <item msgid="7809240121716151904">"25 minuta"</item> <item msgid="4278641338024561333">"Nikada"</item> </string-array> <string name="done" msgid="6509722361933858451">"Gotovo"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Prikaz sata"</string> <string name="label_description" msgid="8736179296142915727">"Natpis"</string> <string name="ringtone_description" msgid="7580922112921069925">"Zvuk zvona"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Trenutačno nisu dostupne informacije o prognozi vremena."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Usluga reprodukcije zvuka za alarme postavljena je u aplikaciji Sat."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Učitavanje melodije zvona…"</string> diff --git a/res/values-hu/array.xml b/res/values-hu/array.xml index 01dfb1baa..e5333f885 100644 --- a/res/values-hu/array.xml +++ b/res/values-hu/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index a49c85107..ef9cc659c 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> perc"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Soha"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 perc"</item> - <item msgid="3663730603519549990">"10 perc"</item> - <item msgid="1385481095199681200">"15 perc"</item> - <item msgid="420479821767342125">"20 perc"</item> - <item msgid="2107936130151066746">"25 perc"</item> - <item msgid="7219791437023378544">"30 perc"</item> + <item msgid="3024545954917711306">"1 perc"</item> + <item msgid="5431906692406316549">"5 perc"</item> + <item msgid="7742728812068919959">"10 perc"</item> + <item msgid="2855948657259647629">"15 perc"</item> + <item msgid="6330196381284475079">"20 perc"</item> + <item msgid="7809240121716151904">"25 perc"</item> <item msgid="4278641338024561333">"Soha"</item> </string-array> <string name="done" msgid="6509722361933858451">"Kész"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Óra megjelenítése"</string> <string name="label_description" msgid="8736179296142915727">"Címke"</string> <string name="ringtone_description" msgid="7580922112921069925">"Csengőhang"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Most nem érhetők el időjárási adatok."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Hanglejátszó szolgáltatás az Órában beállított riasztásokhoz."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Csengőhang betöltése..."</string> diff --git a/res/values-hy-rAM/array.xml b/res/values-hy-rAM/array.xml index df60ff6d8..c1447c32c 100644 --- a/res/values-hy-rAM/array.xml +++ b/res/values-hy-rAM/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Տեգուսիգալպա"</item> <item msgid="7087691675228926801">"Պարամարիբո"</item> <item msgid="478384295484578701">"Կիտո"</item> + <item msgid="4517870253399384206">"Լյուբլյանա"</item> </string-array> </resources> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 603edbc34..884fc47f4 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> րոպեից"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Երբեք"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 րոպե"</item> - <item msgid="3663730603519549990">"10 րոպե"</item> - <item msgid="1385481095199681200">"15 րոպե"</item> - <item msgid="420479821767342125">"20 րոպե"</item> - <item msgid="2107936130151066746">"25 րոպե"</item> - <item msgid="7219791437023378544">"30 րոպե"</item> + <item msgid="3024545954917711306">"1 րոպե"</item> + <item msgid="5431906692406316549">"5 րոպե"</item> + <item msgid="7742728812068919959">"10 րոպե"</item> + <item msgid="2855948657259647629">"15 րոպե"</item> + <item msgid="6330196381284475079">"20 րոպե"</item> + <item msgid="7809240121716151904">"25 րոպե"</item> <item msgid="4278641338024561333">"Երբեք"</item> </string-array> <string name="done" msgid="6509722361933858451">"Կատարված է"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Ժամացույցի տեսքը"</string> <string name="label_description" msgid="8736179296142915727">"Պիտակ"</string> <string name="ringtone_description" msgid="7580922112921069925">"Զանգերանգ"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Եղանակի տեսությունն անհասանելի է այս պահին:"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Զարթուցիչների ձայնի նվագարկման ծառայությունը դրված է ժամացույցում:"</string> <string name="loading_ringtone" msgid="6523322777415268044">"Բեռնվում է զանգերանգը…"</string> diff --git a/res/values-in/array.xml b/res/values-in/array.xml index 8a27f4b50..769820601 100644 --- a/res/values-in/array.xml +++ b/res/values-in/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index de831a605..1c36dd978 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> menit"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Tidak Pernah"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 menit"</item> - <item msgid="3663730603519549990">"10 menit"</item> - <item msgid="1385481095199681200">"15 menit"</item> - <item msgid="420479821767342125">"20 menit"</item> - <item msgid="2107936130151066746">"25 menit"</item> - <item msgid="7219791437023378544">"30 menit"</item> + <item msgid="3024545954917711306">"1 menit"</item> + <item msgid="5431906692406316549">"5 menit"</item> + <item msgid="7742728812068919959">"10 menit"</item> + <item msgid="2855948657259647629">"15 menit"</item> + <item msgid="6330196381284475079">"20 menit"</item> + <item msgid="7809240121716151904">"25 menit"</item> <item msgid="4278641338024561333">"Tidak Pernah"</item> </string-array> <string name="done" msgid="6509722361933858451">"Selesai"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Tampilan jam"</string> <string name="label_description" msgid="8736179296142915727">"Label"</string> <string name="ringtone_description" msgid="7580922112921069925">"Nada Dering"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Saat ini informasi cuaca tidak tersedia."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Layanan pemutaran suara untuk alarm yang disetel di Clock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Memuat nada dering…"</string> diff --git a/res/values-is-rIS/array.xml b/res/values-is-rIS/array.xml index 2fd15e1f9..640467582 100644 --- a/res/values-is-rIS/array.xml +++ b/res/values-is-rIS/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml index 88feb4a97..9db05c9a6 100644 --- a/res/values-is-rIS/strings.xml +++ b/res/values-is-rIS/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> mínútur"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Aldrei"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 mínútur"</item> - <item msgid="3663730603519549990">"10 mínútur"</item> - <item msgid="1385481095199681200">"15 mínútur"</item> - <item msgid="420479821767342125">"20 mínútur"</item> - <item msgid="2107936130151066746">"25 mínútur"</item> - <item msgid="7219791437023378544">"30 mínútur"</item> + <item msgid="3024545954917711306">"1 mínúta"</item> + <item msgid="5431906692406316549">"5 mínútur"</item> + <item msgid="7742728812068919959">"10 mínútur"</item> + <item msgid="2855948657259647629">"15 mínútur"</item> + <item msgid="6330196381284475079">"20 mínútur"</item> + <item msgid="7809240121716151904">"25 mínútur"</item> <item msgid="4278641338024561333">"Aldrei"</item> </string-array> <string name="done" msgid="6509722361933858451">"Lokið"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Klukkuskjár"</string> <string name="label_description" msgid="8736179296142915727">"Skýring"</string> <string name="ringtone_description" msgid="7580922112921069925">"Hringitónn"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Veðurupplýsingar eru ekki í boði sem stendur."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Hljóðspilunarþjónusta vekjara sem stilltir eru í klukkunni."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Hleður hringitón…"</string> diff --git a/res/values-it/array.xml b/res/values-it/array.xml index e31f63f1c..ce357df36 100644 --- a/res/values-it/array.xml +++ b/res/values-it/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Lubiana"</item> </string-array> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 22fd63ba7..8ad0fc0ae 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuti"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Mai"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minuti"</item> - <item msgid="3663730603519549990">"10 minuti"</item> - <item msgid="1385481095199681200">"15 minuti"</item> - <item msgid="420479821767342125">"20 minuti"</item> - <item msgid="2107936130151066746">"25 minuti"</item> - <item msgid="7219791437023378544">"30 minuti"</item> + <item msgid="3024545954917711306">"1 minuto"</item> + <item msgid="5431906692406316549">"5 minuti"</item> + <item msgid="7742728812068919959">"10 minuti"</item> + <item msgid="2855948657259647629">"15 minuti"</item> + <item msgid="6330196381284475079">"20 minuti"</item> + <item msgid="7809240121716151904">"25 minuti"</item> <item msgid="4278641338024561333">"Mai"</item> </string-array> <string name="done" msgid="6509722361933858451">"Fine"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Visualizzazione orologio"</string> <string name="label_description" msgid="8736179296142915727">"Etichetta"</string> <string name="ringtone_description" msgid="7580922112921069925">"Suoneria"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Le informazioni meteo non sono al momento disponibili."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Servizio di riproduzione dei suoni per le sveglie impostate in Orologio."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Caricamento suoneria..."</string> diff --git a/res/values-iw/array.xml b/res/values-iw/array.xml index c08089649..cce9235a5 100644 --- a/res/values-iw/array.xml +++ b/res/values-iw/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"טגוסיגלפה"</item> <item msgid="7087691675228926801">"פרמאריבו"</item> <item msgid="478384295484578701">"קיטו"</item> + <item msgid="4517870253399384206">"לובליאנה"</item> </string-array> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index af8fcfcd2..dd737943a 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> דקות"</string> <string name="auto_silence_never" msgid="4821982647348750809">"לעולם לא"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 דקות"</item> - <item msgid="3663730603519549990">"10 דקות"</item> - <item msgid="1385481095199681200">"15 דקות"</item> - <item msgid="420479821767342125">"20 דקות"</item> - <item msgid="2107936130151066746">"25 דקות"</item> - <item msgid="7219791437023378544">"30 דקות"</item> + <item msgid="3024545954917711306">"דקה"</item> + <item msgid="5431906692406316549">"5 דקות"</item> + <item msgid="7742728812068919959">"10 דקות"</item> + <item msgid="2855948657259647629">"15 דקות"</item> + <item msgid="6330196381284475079">"20 דקות"</item> + <item msgid="7809240121716151904">"25 דקות"</item> <item msgid="4278641338024561333">"לעולם לא"</item> </string-array> <string name="done" msgid="6509722361933858451">"סיום"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"תצוגת שעון"</string> <string name="label_description" msgid="8736179296142915727">"תווית"</string> <string name="ringtone_description" msgid="7580922112921069925">"רינגטון"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"לא זמינים כרגע נתונים על מזג האוויר."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"שירות השמעת צלילים עבור התראות נקבע ב-Clock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"טוען צלצול..."</string> diff --git a/res/values-ja/array.xml b/res/values-ja/array.xml index a65b59cc2..508763ebf 100644 --- a/res/values-ja/array.xml +++ b/res/values-ja/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"テグシガルパ"</item> <item msgid="7087691675228926801">"パラマリボ"</item> <item msgid="478384295484578701">"キト"</item> + <item msgid="4517870253399384206">"リュブリャナ"</item> </string-array> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 8e68f2653..005951e8c 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g>分"</string> <string name="auto_silence_never" msgid="4821982647348750809">"なし"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5分"</item> - <item msgid="3663730603519549990">"10分"</item> - <item msgid="1385481095199681200">"15分"</item> - <item msgid="420479821767342125">"20分"</item> - <item msgid="2107936130151066746">"25分"</item> - <item msgid="7219791437023378544">"30分"</item> + <item msgid="3024545954917711306">"1分"</item> + <item msgid="5431906692406316549">"5分"</item> + <item msgid="7742728812068919959">"10分"</item> + <item msgid="2855948657259647629">"15分"</item> + <item msgid="6330196381284475079">"20分"</item> + <item msgid="7809240121716151904">"25分"</item> <item msgid="4278641338024561333">"なし"</item> </string-array> <string name="done" msgid="6509722361933858451">"完了"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"時計のディスプレイ"</string> <string name="label_description" msgid="8736179296142915727">"ラベル"</string> <string name="ringtone_description" msgid="7580922112921069925">"着信音"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"現在、天気情報をご利用いただけません。"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"時計で設定したアラーム用のサウンド再生サービスです。"</string> <string name="loading_ringtone" msgid="6523322777415268044">"着信音を読み込み中..."</string> diff --git a/res/values-ka-rGE/array.xml b/res/values-ka-rGE/array.xml index 86e82a1db..8706fa254 100644 --- a/res/values-ka-rGE/array.xml +++ b/res/values-ka-rGE/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"ტეგუსიგალპა"</item> <item msgid="7087691675228926801">"პარამარიბო"</item> <item msgid="478384295484578701">"ქუიტო"</item> + <item msgid="4517870253399384206">"ლიუბლიანა"</item> </string-array> </resources> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 10e5478df..2dd19599e 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> წუთი"</string> <string name="auto_silence_never" msgid="4821982647348750809">"არასოდეს"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 წუთი"</item> - <item msgid="3663730603519549990">"10 წუთი"</item> - <item msgid="1385481095199681200">"15 წუთი"</item> - <item msgid="420479821767342125">"20 წუთი"</item> - <item msgid="2107936130151066746">"25 წუთი"</item> - <item msgid="7219791437023378544">"30 წუთი"</item> + <item msgid="3024545954917711306">"1 წუთი"</item> + <item msgid="5431906692406316549">"5 წუთი"</item> + <item msgid="7742728812068919959">"10 წუთი"</item> + <item msgid="2855948657259647629">"15 წუთი"</item> + <item msgid="6330196381284475079">"20 წუთი"</item> + <item msgid="7809240121716151904">"25 წუთი"</item> <item msgid="4278641338024561333">"არასოდეს"</item> </string-array> <string name="done" msgid="6509722361933858451">"დასრულდა"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"საათის ეკრანი"</string> <string name="label_description" msgid="8736179296142915727">"ლეიბლი"</string> <string name="ringtone_description" msgid="7580922112921069925">"ზარი"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"ამინდის შესახებ ინფორმაცია ამ მომენტისთვის მიუწვდომელია."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Clock-ში ხმის დაკვრის სერვისი მაღვიძარების კომპლექტებისთვის."</string> <string name="loading_ringtone" msgid="6523322777415268044">"ზარის ჩატვირთვა…"</string> diff --git a/res/values-kk-rKZ/array.xml b/res/values-kk-rKZ/array.xml index e9147d844..c83874d8d 100644 --- a/res/values-kk-rKZ/array.xml +++ b/res/values-kk-rKZ/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегусигальпа"</item> <item msgid="7087691675228926801">"Парамарибо"</item> <item msgid="478384295484578701">"Кито"</item> + <item msgid="4517870253399384206">"Любляна"</item> </string-array> </resources> diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index 2b7ecc1f8..0a14b2b07 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минут"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Ешқашан"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 минут"</item> - <item msgid="3663730603519549990">"10 минут"</item> - <item msgid="1385481095199681200">"15 минут"</item> - <item msgid="420479821767342125">"20 минут"</item> - <item msgid="2107936130151066746">"25 минут"</item> - <item msgid="7219791437023378544">"30 минут"</item> + <item msgid="3024545954917711306">"1 минут"</item> + <item msgid="5431906692406316549">"5 минут"</item> + <item msgid="7742728812068919959">"10 минут"</item> + <item msgid="2855948657259647629">"15 минут"</item> + <item msgid="6330196381284475079">"20 минут"</item> + <item msgid="7809240121716151904">"25 минут"</item> <item msgid="4278641338024561333">"Ешқашан"</item> </string-array> <string name="done" msgid="6509722361933858451">"Орындалды"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Сағат дисплейі"</string> <string name="label_description" msgid="8736179296142915727">"Белгі"</string> <string name="ringtone_description" msgid="7580922112921069925">"Қоңырау әуені"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Дәл қазір ауа райы туралы ақпарат қол жетімді емес."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"«Сағат» қолданбасында орнатылған дабылдар үшін дыбысты ойнату қызметі."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Қоңырау әуені жүктелуде…"</string> diff --git a/res/values-km-rKH/array.xml b/res/values-km-rKH/array.xml index cdaf15a47..6eb84ee33 100644 --- a/res/values-km-rKH/array.xml +++ b/res/values-km-rKH/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"តេហ្គូស៊ីហ្កាល់ប៉ា"</item> <item msgid="7087691675228926801">"ប៉ារ៉ាម៉ារីបូ"</item> <item msgid="478384295484578701">"គីតូ"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 4629dc563..6818fb13b 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> នាទី"</string> <string name="auto_silence_never" msgid="4821982647348750809">"កុំ"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"៥ នាទី"</item> - <item msgid="3663730603519549990">"១០ នាទី"</item> - <item msgid="1385481095199681200">"១៥ នាទី"</item> - <item msgid="420479821767342125">"២០ នាទី"</item> - <item msgid="2107936130151066746">"២៥ នាទី"</item> - <item msgid="7219791437023378544">"៣០ នាទី"</item> + <item msgid="3024545954917711306">"១នាទី"</item> + <item msgid="5431906692406316549">"៥ នាទី"</item> + <item msgid="7742728812068919959">"១០ នាទី"</item> + <item msgid="2855948657259647629">"១៥ នាទី"</item> + <item msgid="6330196381284475079">"២០ នាទី"</item> + <item msgid="7809240121716151904">"២៥ នាទី"</item> <item msgid="4278641338024561333">"កុំ"</item> </string-array> <string name="done" msgid="6509722361933858451">"ធ្វើរួច"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"ការបង្ហា្ញញនាឡិកា"</string> <string name="label_description" msgid="8736179296142915727">"ស្លាក"</string> <string name="ringtone_description" msgid="7580922112921069925">"សំឡេងរោទ៍"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"ថាតើបច្ចុប្បន្នមិនមានព័ត៌មាន។"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"បានកំណត់សេវាកម្មបន្លឺសំឡេងរោទ៍នៅក្នុងនាឡិកា។"</string> <string name="loading_ringtone" msgid="6523322777415268044">"កំពុងផ្ទុកសំឡេងរោទ៍…"</string> diff --git a/res/values-kn-rIN/array.xml b/res/values-kn-rIN/array.xml index 2ad52a8fa..343f4683b 100644 --- a/res/values-kn-rIN/array.xml +++ b/res/values-kn-rIN/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"ತೆಗುಸಿಗಲ್ಪಾ"</item> <item msgid="7087691675228926801">"ಪರಮಾರಿಬೋ"</item> <item msgid="478384295484578701">"ಕ್ವಿಟೊ"</item> + <item msgid="4517870253399384206">"ಲ್ಯೂಬಿಯಾನಾ"</item> </string-array> </resources> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index 6c94baaf1..6f43975bc 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷಗಳು"</string> <string name="auto_silence_never" msgid="4821982647348750809">"ಎಂದಿಗೂ ಬೇಡ"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 ನಿಮಿಷಗಳು"</item> - <item msgid="3663730603519549990">"10 ನಿಮಿಷಗಳು"</item> - <item msgid="1385481095199681200">"15 ನಿಮಿಷಗಳು"</item> - <item msgid="420479821767342125">"20 ನಿಮಿಷಗಳು"</item> - <item msgid="2107936130151066746">"25 ನಿಮಿಷಗಳು"</item> - <item msgid="7219791437023378544">"30 ನಿಮಿಷಗಳು"</item> + <item msgid="3024545954917711306">"1 ನಿಮಿಷ"</item> + <item msgid="5431906692406316549">"5 ನಿಮಿಷಗಳು"</item> + <item msgid="7742728812068919959">"10 ನಿಮಿಷಗಳು"</item> + <item msgid="2855948657259647629">"15 ನಿಮಿಷಗಳು"</item> + <item msgid="6330196381284475079">"20 ನಿಮಿಷಗಳು"</item> + <item msgid="7809240121716151904">"25 ನಿಮಿಷಗಳು"</item> <item msgid="4278641338024561333">"ಎಂದಿಗೂ ಬೇಡ"</item> </string-array> <string name="done" msgid="6509722361933858451">"ಮುಗಿದಿದೆ"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"ಗಡಿಯಾರ ಪ್ರದರ್ಶಕ"</string> <string name="label_description" msgid="8736179296142915727">"ಲೇಬಲ್"</string> <string name="ringtone_description" msgid="7580922112921069925">"ರಿಂಗ್ಟೋನ್"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"ಹವಾಮಾನ ಮಾಹಿತಿ ಇದೀಗ ಲಭ್ಯವಿಲ್ಲ."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"ಗಡಿಯಾರದ ಒಳಗೆ ಅಲಾರಾಂಗಳ ಹೊಂದಿಕೆಗಾಗಿ ಧ್ವನಿ ಪ್ಲೇಬ್ಯಾಕ್ ಸೇವೆ."</string> <string name="loading_ringtone" msgid="6523322777415268044">"ರಿಂಗ್ಟೋನ್ ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string> diff --git a/res/values-ko/array.xml b/res/values-ko/array.xml index 4b659e83c..b3ac7377c 100644 --- a/res/values-ko/array.xml +++ b/res/values-ko/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"테구시갈파"</item> <item msgid="7087691675228926801">"파라마리보"</item> <item msgid="478384295484578701">"키토"</item> + <item msgid="4517870253399384206">"류블랴나"</item> </string-array> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index a1c70ffc3..c2d017a18 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g>분"</string> <string name="auto_silence_never" msgid="4821982647348750809">"사용 안함"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5분"</item> - <item msgid="3663730603519549990">"10분"</item> - <item msgid="1385481095199681200">"15분"</item> - <item msgid="420479821767342125">"20분"</item> - <item msgid="2107936130151066746">"25분"</item> - <item msgid="7219791437023378544">"30분"</item> + <item msgid="3024545954917711306">"1분"</item> + <item msgid="5431906692406316549">"5분"</item> + <item msgid="7742728812068919959">"10분"</item> + <item msgid="2855948657259647629">"15분"</item> + <item msgid="6330196381284475079">"20분"</item> + <item msgid="7809240121716151904">"25분"</item> <item msgid="4278641338024561333">"사용 안함"</item> </string-array> <string name="done" msgid="6509722361933858451">"완료"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"시계 디스플레이"</string> <string name="label_description" msgid="8736179296142915727">"라벨"</string> <string name="ringtone_description" msgid="7580922112921069925">"벨소리"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"현재 날씨 정보를 이용할 수 없습니다."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"시계에서 설정한 알람 사운드 재생 서비스"</string> <string name="loading_ringtone" msgid="6523322777415268044">"벨소리 로드 중…"</string> diff --git a/res/values-ky-rKG/array.xml b/res/values-ky-rKG/array.xml index 1c8bfe79b..6df90de8f 100644 --- a/res/values-ky-rKG/array.xml +++ b/res/values-ky-rKG/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегусигальпа"</item> <item msgid="7087691675228926801">"Парамарибо"</item> <item msgid="478384295484578701">"Кито"</item> + <item msgid="4517870253399384206">"Любляна"</item> </string-array> </resources> diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index d76d552de..60fd66484 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -98,15 +98,11 @@ <string name="auto_silence_title" msgid="2012754009554434544">"Төмөнкүдөн кийин үнүн басып коюу"</string> <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> мүнөт"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Эч качан"</string> - <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 мүнөт"</item> - <item msgid="3663730603519549990">"10 мүнөт"</item> - <item msgid="1385481095199681200">"15 мүнөт"</item> - <item msgid="420479821767342125">"20 мүнөт"</item> - <item msgid="2107936130151066746">"25 мүнөт"</item> - <item msgid="7219791437023378544">"30 мүнөт"</item> - <item msgid="4278641338024561333">"Эч качан"</item> - </string-array> + <!-- no translation found for auto_silence_entries:1 (5431906692406316549) --> + <!-- no translation found for auto_silence_entries:2 (7742728812068919959) --> + <!-- no translation found for auto_silence_entries:3 (2855948657259647629) --> + <!-- no translation found for auto_silence_entries:4 (6330196381284475079) --> + <!-- no translation found for auto_silence_entries:5 (7809240121716151904) --> <string name="done" msgid="6509722361933858451">"Аткарылды"</string> <string name="revert" msgid="9100911171235162926">"Мурунку абалга кайтаруу"</string> <string name="delete" msgid="5732434972457000541">"Жок кылуу"</string> @@ -131,7 +127,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Саатты көрсөтүү"</string> <string name="label_description" msgid="8736179296142915727">"Белги"</string> <string name="ringtone_description" msgid="7580922112921069925">"Шыңгыр"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Учурда аба-ырайы жөнүндө маалымат жок."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Сааттагы ойготкучтарга үн коюу кызматы."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Шыңгыр жүктөлүүдө…"</string> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 6e2cc9872..e1142770b 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -25,7 +25,7 @@ <dimen name="date_text_size">15sp</dimen> <dimen name="next_alarm_text_size">15sp</dimen> <dimen name="time_margin_top">24dip</dimen> - <dimen name="timer_list_padding_bottom">64dip</dimen> + <dimen name="timer_list_padding_bottom">80dip</dimen> <dimen name="dialpad_font_size">24sp</dimen> <dimen name="dialpad_digit_padding">14dip</dimen> @@ -46,11 +46,14 @@ <dimen name="alarm_side_padding">48dip</dimen> <dimen name="clock_side_padding">32dip</dimen> - <dimen name="world_clock_end_padding">0dip</dimen> + <dimen name="clock_fragment_end_padding">0dip</dimen> + <dimen name="main_clock_bottom_margin">80dip</dimen> <dimen name="medium_font_size">48sp</dimen> - <dimen name="circle_size">232dip</dimen> + <dimen name="circle_size">190dip</dimen> + <dimen name="stopwatch_list_bottom_spacing">0dip</dimen> + <dimen name="stopwatch_circle_margin_bottom">80dip</dimen> <dimen name="world_clock_margin">8dp</dimen> <dimen name="sw_padding_end">8dp</dimen> diff --git a/res/values-lo-rLA/array.xml b/res/values-lo-rLA/array.xml index d3c02cdf1..01443c491 100644 --- a/res/values-lo-rLA/array.xml +++ b/res/values-lo-rLA/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"ເຕກູຊິກັລປາ"</item> <item msgid="7087691675228926801">"ພາຣາມາຣິໂບ"</item> <item msgid="478384295484578701">"ຄວິດໂຕ"</item> + <item msgid="4517870253399384206">"ລູບລິຢານາ"</item> </string-array> </resources> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index e42c0b079..a002f4c6a 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> ນາທີ"</string> <string name="auto_silence_never" msgid="4821982647348750809">"ບໍ່ໃຊ້"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 ນາທີ"</item> - <item msgid="3663730603519549990">"10 ນາທີ"</item> - <item msgid="1385481095199681200">"15 ນາທີ"</item> - <item msgid="420479821767342125">"20 ນາທີ"</item> - <item msgid="2107936130151066746">"25 ນາທີ"</item> - <item msgid="7219791437023378544">"30 ນາທີ"</item> + <item msgid="3024545954917711306">"1 ນາທີ"</item> + <item msgid="5431906692406316549">"5 ນາທີ"</item> + <item msgid="7742728812068919959">"10 ນາທີ"</item> + <item msgid="2855948657259647629">"15 ນາທີ"</item> + <item msgid="6330196381284475079">"20 ນາທີ"</item> + <item msgid="7809240121716151904">"25 ນາທີ"</item> <item msgid="4278641338024561333">"ບໍ່ໃຊ້"</item> </string-array> <string name="done" msgid="6509722361933858451">"ແລ້ວໆ"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"ໂມງທີ່ສະແດງ"</string> <string name="label_description" msgid="8736179296142915727">"ປ້າຍກຳກັບ"</string> <string name="ringtone_description" msgid="7580922112921069925">"ສຽງໂມງປຸກ"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"ຂໍ້ມູນສະພາບອາກາດບໍ່ສາມາດໃຊ້ໄດ້ໃນເວລານີ້."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"ບໍລິການຫຼິ້ນສຽງສຳລັບການປຸກ ທີ່ຕັ້ງໄວ້ໃນໂປຣແກຣມໂມງ."</string> <string name="loading_ringtone" msgid="6523322777415268044">"ກຳລັງໂຫລດສຽງປຸກ..."</string> diff --git a/res/values-lt/array.xml b/res/values-lt/array.xml index fcee316c8..2038813a7 100644 --- a/res/values-lt/array.xml +++ b/res/values-lt/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegusigalpa"</item> <item msgid="7087691675228926801">"Paramaribas"</item> <item msgid="478384295484578701">"Kitas"</item> + <item msgid="4517870253399384206">"Liubliana"</item> </string-array> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 0334e82e0..88c9d2355 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min."</string> <string name="auto_silence_never" msgid="4821982647348750809">"Niekada"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 min."</item> - <item msgid="3663730603519549990">"10 min."</item> - <item msgid="1385481095199681200">"15 min."</item> - <item msgid="420479821767342125">"20 min."</item> - <item msgid="2107936130151066746">"25 min."</item> - <item msgid="7219791437023378544">"30 min."</item> + <item msgid="3024545954917711306">"1 min."</item> + <item msgid="5431906692406316549">"5 min."</item> + <item msgid="7742728812068919959">"10 min."</item> + <item msgid="2855948657259647629">"15 min."</item> + <item msgid="6330196381284475079">"20 min."</item> + <item msgid="7809240121716151904">"25 min."</item> <item msgid="4278641338024561333">"Niekada"</item> </string-array> <string name="done" msgid="6509722361933858451">"Atlikta"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Laikrodžio pateiktis"</string> <string name="label_description" msgid="8736179296142915727">"Etiketė"</string> <string name="ringtone_description" msgid="7580922112921069925">"Skambėjimo tonas"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Šiuo metu informacija apie orus negalima."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Garso atkūrimo paslauga, skirta laikrodžio nustatytiems signalams."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Įkeliamas skambėjimo tonas..."</string> diff --git a/res/values-lv/array.xml b/res/values-lv/array.xml index 16c737d07..71440d2d3 100644 --- a/res/values-lv/array.xml +++ b/res/values-lv/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegusigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Kito"</item> + <item msgid="4517870253399384206">"Ļubļana"</item> </string-array> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 16b72bc6d..a298cfd8d 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minūte(-es)"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nekad"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minūtes"</item> - <item msgid="3663730603519549990">"10 minūtes"</item> - <item msgid="1385481095199681200">"15 minūtes"</item> - <item msgid="420479821767342125">"20 minūtes"</item> - <item msgid="2107936130151066746">"25 minūtes"</item> - <item msgid="7219791437023378544">"30 minūtes"</item> + <item msgid="3024545954917711306">"1 minūte"</item> + <item msgid="5431906692406316549">"5 minūtes"</item> + <item msgid="7742728812068919959">"10 minūtes"</item> + <item msgid="2855948657259647629">"15 minūtes"</item> + <item msgid="6330196381284475079">"20 minūtes"</item> + <item msgid="7809240121716151904">"25 minūtes"</item> <item msgid="4278641338024561333">"Nekad"</item> </string-array> <string name="done" msgid="6509722361933858451">"Gatavs"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Pulksteņa attēlojums"</string> <string name="label_description" msgid="8736179296142915727">"Iezīme"</string> <string name="ringtone_description" msgid="7580922112921069925">"Zvana signāls"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Informācija par laikapstākļiem pašlaik nav pieejama."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Skaņas atskaņošanas pakalpojums lietotnē Pulkstenis iestatītajiem signāliem"</string> <string name="loading_ringtone" msgid="6523322777415268044">"Notiek zvana signāla ielāde…"</string> diff --git a/res/values-mk-rMK/array.xml b/res/values-mk-rMK/array.xml index 9aecc3711..69a7107d0 100644 --- a/res/values-mk-rMK/array.xml +++ b/res/values-mk-rMK/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегусигалпа"</item> <item msgid="7087691675228926801">"Парамарибо"</item> <item msgid="478384295484578701">"Кито"</item> + <item msgid="4517870253399384206">"Љубљана"</item> </string-array> </resources> diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index 1fe7fbb59..d0228329c 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минути"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Никогаш"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 минути"</item> - <item msgid="3663730603519549990">"10 минути"</item> - <item msgid="1385481095199681200">"15 минути"</item> - <item msgid="420479821767342125">"20 минути"</item> - <item msgid="2107936130151066746">"25 минути"</item> - <item msgid="7219791437023378544">"30 минути"</item> + <item msgid="3024545954917711306">"1 минута"</item> + <item msgid="5431906692406316549">"5 минути"</item> + <item msgid="7742728812068919959">"10 минути"</item> + <item msgid="2855948657259647629">"15 минути"</item> + <item msgid="6330196381284475079">"20 минути"</item> + <item msgid="7809240121716151904">"25 минути"</item> <item msgid="4278641338024561333">"Никогаш"</item> </string-array> <string name="done" msgid="6509722361933858451">"Готово"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Приказ на часовникот"</string> <string name="label_description" msgid="8736179296142915727">"Ознака"</string> <string name="ringtone_description" msgid="7580922112921069925">"Мелодија"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Информациите за временската прогноза во моментов не се достапни."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Услуга за репродукција на звук за аларми поставени во Часовник."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Вчитување мелодија…"</string> diff --git a/res/values-ml-rIN/array.xml b/res/values-ml-rIN/array.xml index 418ac1bcf..2648a1107 100644 --- a/res/values-ml-rIN/array.xml +++ b/res/values-ml-rIN/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"ടെഗൂസിഗാൽപ"</item> <item msgid="7087691675228926801">"പരമാറിബോ"</item> <item msgid="478384295484578701">"ക്വിറ്റോ"</item> + <item msgid="4517870253399384206">"ലുബ്ലിയാന"</item> </string-array> </resources> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 6716e8ad0..6cea2c41d 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> മിനിറ്റ്"</string> <string name="auto_silence_never" msgid="4821982647348750809">"ഒരിക്കലുമില്ല"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 മിനിറ്റ്"</item> - <item msgid="3663730603519549990">"10 മിനിറ്റ്"</item> - <item msgid="1385481095199681200">"15 മിനിറ്റ്"</item> - <item msgid="420479821767342125">"20 മിനിറ്റ്"</item> - <item msgid="2107936130151066746">"25 മിനിറ്റ്"</item> - <item msgid="7219791437023378544">"30 മിനിറ്റ്"</item> + <item msgid="3024545954917711306">"ഒരു മിനിറ്റ്"</item> + <item msgid="5431906692406316549">"5 മിനിറ്റ്"</item> + <item msgid="7742728812068919959">"10 മിനിറ്റ്"</item> + <item msgid="2855948657259647629">"15 മിനിറ്റ്"</item> + <item msgid="6330196381284475079">"20 മിനിറ്റ്"</item> + <item msgid="7809240121716151904">"25 മിനിറ്റ്"</item> <item msgid="4278641338024561333">"ഒരിക്കലുമില്ല"</item> </string-array> <string name="done" msgid="6509722361933858451">"പൂർത്തിയായി"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"ക്ലോക്ക് ഡിസ്പ്ലേ"</string> <string name="label_description" msgid="8736179296142915727">"ലേബൽ"</string> <string name="ringtone_description" msgid="7580922112921069925">"റിംഗ്ടോൺ"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"കാലാവസ്ഥ വിവരം ഇപ്പോൾ ലഭ്യമല്ല."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"അലാറങ്ങൾക്കായുള്ള ശബ്ദ പ്ലേബാക്ക് സേവനം ക്ലോക്കിൽ സജ്ജീകരിച്ചിരിക്കുന്നു."</string> <string name="loading_ringtone" msgid="6523322777415268044">"റിംഗ്ടോൺ ലോഡുചെയ്യുന്നു…"</string> diff --git a/res/values-mn-rMN/array.xml b/res/values-mn-rMN/array.xml index 51e283e75..81e590291 100644 --- a/res/values-mn-rMN/array.xml +++ b/res/values-mn-rMN/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегуцигалпа"</item> <item msgid="7087691675228926801">"Парамарибо"</item> <item msgid="478384295484578701">"Күйто"</item> + <item msgid="4517870253399384206">"Любляна"</item> </string-array> </resources> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index e1f59dce5..15df89fdd 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минут"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Хэзээ ч үгүй"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 минут"</item> - <item msgid="3663730603519549990">"10 минут"</item> - <item msgid="1385481095199681200">"15 минут"</item> - <item msgid="420479821767342125">"20 минут"</item> - <item msgid="2107936130151066746">"25 минут"</item> - <item msgid="7219791437023378544">"30 минут"</item> + <item msgid="3024545954917711306">"1 минут"</item> + <item msgid="5431906692406316549">"5 минут"</item> + <item msgid="7742728812068919959">"10 минут"</item> + <item msgid="2855948657259647629">"15 минут"</item> + <item msgid="6330196381284475079">"20 минут"</item> + <item msgid="7809240121716151904">"25 минут"</item> <item msgid="4278641338024561333">"Хэзээ ч үгүй"</item> </string-array> <string name="done" msgid="6509722361933858451">"Дууссан"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Цагны дэлгэц"</string> <string name="label_description" msgid="8736179296142915727">"Шошго"</string> <string name="ringtone_description" msgid="7580922112921069925">"Хонхны ая"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Цаг агаарыг одоо үзэх боломжгүй байна."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Цаганд тохируулсан сэрүүлгийн дуу тоглуулах үйлчилгээ."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Хонхны аяыг ачааллаж байна…"</string> diff --git a/res/values-mr-rIN/array.xml b/res/values-mr-rIN/array.xml index 841405011..4275d1ccc 100644 --- a/res/values-mr-rIN/array.xml +++ b/res/values-mr-rIN/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"टेगुसिगाल्पा"</item> <item msgid="7087691675228926801">"पारमारिबो"</item> <item msgid="478384295484578701">"क्वीटो"</item> + <item msgid="4517870253399384206">"लियुब्लियाना"</item> </string-array> </resources> diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index 1e459de80..673481d35 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> मिनिटे"</string> <string name="auto_silence_never" msgid="4821982647348750809">"कधीही नाही"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 मिनिटे"</item> - <item msgid="3663730603519549990">"10 मिनिटे"</item> - <item msgid="1385481095199681200">"15 मिनिटे"</item> - <item msgid="420479821767342125">"20 मिनिटे"</item> - <item msgid="2107936130151066746">"25 मिनिटे"</item> - <item msgid="7219791437023378544">"30 मिनिटे"</item> + <item msgid="3024545954917711306">"1 मिनिट"</item> + <item msgid="5431906692406316549">"5 मिनिटे"</item> + <item msgid="7742728812068919959">"10 मिनिटे"</item> + <item msgid="2855948657259647629">"15 मिनिटे"</item> + <item msgid="6330196381284475079">"20 मिनिटे"</item> + <item msgid="7809240121716151904">"25 मिनिटे"</item> <item msgid="4278641338024561333">"कधीही नाही"</item> </string-array> <string name="done" msgid="6509722361933858451">"पूर्ण केले"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"घड्याळ प्रदर्शन"</string> <string name="label_description" msgid="8736179296142915727">"लेबल"</string> <string name="ringtone_description" msgid="7580922112921069925">"रिंगटोन"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"आत्ता हवामान माहिती उपलब्ध नाही."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"घड्याळात सेट केलेल्या अलार्मसाठी ध्वनी प्लेबॅक सेवा."</string> <string name="loading_ringtone" msgid="6523322777415268044">"रिंगटोन लोड करत आहे…"</string> diff --git a/res/values-ms-rMY/array.xml b/res/values-ms-rMY/array.xml index a05b668bd..707cd0ab6 100644 --- a/res/values-ms-rMY/array.xml +++ b/res/values-ms-rMY/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 30861fb46..7a48618ae 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minit"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Jangan sekali-kali"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minit"</item> - <item msgid="3663730603519549990">"10 minit"</item> - <item msgid="1385481095199681200">"15 minit"</item> - <item msgid="420479821767342125">"20 minit"</item> - <item msgid="2107936130151066746">"25 minit"</item> - <item msgid="7219791437023378544">"30 minit"</item> + <item msgid="3024545954917711306">"1 minit"</item> + <item msgid="5431906692406316549">"5 minit"</item> + <item msgid="7742728812068919959">"10 minit"</item> + <item msgid="2855948657259647629">"15 minit"</item> + <item msgid="6330196381284475079">"20 minit"</item> + <item msgid="7809240121716151904">"25 minit"</item> <item msgid="4278641338024561333">"Jangan sekali-kali"</item> </string-array> <string name="done" msgid="6509722361933858451">"Selesai"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Paparan jam"</string> <string name="label_description" msgid="8736179296142915727">"Label"</string> <string name="ringtone_description" msgid="7580922112921069925">"Nada dering"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Maklumat cuaca tidak tersedia sekarang."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Perkhidmatan main balik bunyi untuk penggera ditetapkan dalam Jam."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Memuatkan nada dering..."</string> diff --git a/res/values-my-rMM/array.xml b/res/values-my-rMM/array.xml index 0b40d3196..b7d8f3e0c 100644 --- a/res/values-my-rMM/array.xml +++ b/res/values-my-rMM/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"တေဂူစီဂါလ်ပါ"</item> <item msgid="7087691675228926801">"ပါရာမာရီဘို"</item> <item msgid="478384295484578701">"ကွီးတို"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index 378c74de0..c0e9e1840 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> မိနစ်"</string> <string name="auto_silence_never" msgid="4821982647348750809">"မည်သည့်အခါမှ"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"၅ မိနစ်"</item> - <item msgid="3663730603519549990">"၁၀ မိနစ်"</item> - <item msgid="1385481095199681200">"၁၅ မိနစ်"</item> - <item msgid="420479821767342125">"၂၀ မိနစ်"</item> - <item msgid="2107936130151066746">"၂၅ မိနစ်"</item> - <item msgid="7219791437023378544">"၃၀ မိနစ်"</item> + <item msgid="3024545954917711306">"၁ မိနစ်"</item> + <item msgid="5431906692406316549">"၅ မိနစ်"</item> + <item msgid="7742728812068919959">"၁၀ မိနစ်"</item> + <item msgid="2855948657259647629">"၁၅ မိနစ်"</item> + <item msgid="6330196381284475079">"၂၀ မိနစ်"</item> + <item msgid="7809240121716151904">"၂၅ မိနစ်"</item> <item msgid="4278641338024561333">"မည်သည့်အခါမှ"</item> </string-array> <string name="done" msgid="6509722361933858451">"လုပ်ပြီး"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"နာရီကို ပြသမှု"</string> <string name="label_description" msgid="8736179296142915727">"အညွှန်း"</string> <string name="ringtone_description" msgid="7580922112921069925">"သံစဉ်"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"မိုးလေဝသ သတင်း လောလောဆယ်မှာ မရနိုင်ပါ။"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"နာရီထဲမှာ သတ်မှတ်ထားသည့် နှိုးစက်များ အတွက် အသံ ဖွင့်ပေးရေး ဝန်ဆောင်မှု။"</string> <string name="loading_ringtone" msgid="6523322777415268044">"သံစဉ်ကို တင်နေ…"</string> diff --git a/res/values-nb/array.xml b/res/values-nb/array.xml index 3f7d68522..6fc23cc47 100644 --- a/res/values-nb/array.xml +++ b/res/values-nb/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 11ac35cc5..5cfe3ec22 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutter"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Aldri"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutter"</item> - <item msgid="3663730603519549990">"10 minutter"</item> - <item msgid="1385481095199681200">"15 minutter"</item> - <item msgid="420479821767342125">"20 minutter"</item> - <item msgid="2107936130151066746">"25 minutter"</item> - <item msgid="7219791437023378544">"30 minutter"</item> + <item msgid="3024545954917711306">"1 minutt"</item> + <item msgid="5431906692406316549">"5 minutter"</item> + <item msgid="7742728812068919959">"10 minutter"</item> + <item msgid="2855948657259647629">"15 minutter"</item> + <item msgid="6330196381284475079">"20 minutter"</item> + <item msgid="7809240121716151904">"25 minutter"</item> <item msgid="4278641338024561333">"Aldri"</item> </string-array> <string name="done" msgid="6509722361933858451">"OK"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Klokkeskjerm"</string> <string name="label_description" msgid="8736179296142915727">"Etikett"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ringetone"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Værinformasjonen er ikke tilgjengelig for øyeblikket."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Lydavspillingstjeneste for alarmer som er angitt i Klokke."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Laster inn ringetone ..."</string> diff --git a/res/values-ne-rNP/array.xml b/res/values-ne-rNP/array.xml index ebdad70c4..ac003ecee 100644 --- a/res/values-ne-rNP/array.xml +++ b/res/values-ne-rNP/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"टेगुसिगाल्पा"</item> <item msgid="7087691675228926801">"पारामारिबो"</item> <item msgid="478384295484578701">"क्यिटो"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 4e6b9890e..b82a7e1cf 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> मिनेट"</string> <string name="auto_silence_never" msgid="4821982647348750809">"कहिले पनि होइन"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"५ मिनेट"</item> - <item msgid="3663730603519549990">"१० मिनेट"</item> - <item msgid="1385481095199681200">"१५ मिनेट"</item> - <item msgid="420479821767342125">"२० मिनेट"</item> - <item msgid="2107936130151066746">"२५ मिनेट"</item> - <item msgid="7219791437023378544">"३० मिनेट"</item> + <item msgid="3024545954917711306">"१ मिनेट"</item> + <item msgid="5431906692406316549">"५ मिनेट"</item> + <item msgid="7742728812068919959">"१० मिनेट"</item> + <item msgid="2855948657259647629">"१५ मिनेट"</item> + <item msgid="6330196381284475079">"२० मिनेट"</item> + <item msgid="7809240121716151904">"२५ मिनेट"</item> <item msgid="4278641338024561333">"कहिल्यै पनि होइन"</item> </string-array> <string name="done" msgid="6509722361933858451">"भयो"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"घडी प्रदर्शन"</string> <string name="label_description" msgid="8736179296142915727">"लेबल"</string> <string name="ringtone_description" msgid="7580922112921069925">"रिङटोन"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"मौसमी जानकारी हाल उपलव्ध छैन।"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"अलार्मका लागि आवाज प्लेब्याक सेवाहरू घडीमा सेट गर्नुहोस्।"</string> <string name="loading_ringtone" msgid="6523322777415268044">"रिङटोन लोड गर्दै…"</string> diff --git a/res/values-nl/array.xml b/res/values-nl/array.xml index adb2928b4..55e0d18c5 100644 --- a/res/values-nl/array.xml +++ b/res/values-nl/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index e7c56306a..882545bc7 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuten"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nooit"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minuten"</item> - <item msgid="3663730603519549990">"10 minuten"</item> - <item msgid="1385481095199681200">"15 minuten"</item> - <item msgid="420479821767342125">"20 minuten"</item> - <item msgid="2107936130151066746">"25 minuten"</item> - <item msgid="7219791437023378544">"30 minuten"</item> + <item msgid="3024545954917711306">"1 minuut"</item> + <item msgid="5431906692406316549">"5 minuten"</item> + <item msgid="7742728812068919959">"10 minuten"</item> + <item msgid="2855948657259647629">"15 minuten"</item> + <item msgid="6330196381284475079">"20 minuten"</item> + <item msgid="7809240121716151904">"25 minuten"</item> <item msgid="4278641338024561333">"Nooit"</item> </string-array> <string name="done" msgid="6509722361933858451">"Gereed"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Klokweergave"</string> <string name="label_description" msgid="8736179296142915727">"Label"</string> <string name="ringtone_description" msgid="7580922112921069925">"Beltoon"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Weersinformatie is momenteel niet beschikbaar."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Service geluidsweergave voor alarmen ingesteld in Klok."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Beltoon laden…"</string> diff --git a/res/values-pl/array.xml b/res/values-pl/array.xml index 33e980003..96c50d6e9 100644 --- a/res/values-pl/array.xml +++ b/res/values-pl/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Lublana"</item> </string-array> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 2fe9075bf..02015c3ea 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nigdy"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minut"</item> - <item msgid="3663730603519549990">"10 minut"</item> - <item msgid="1385481095199681200">"15 minut"</item> - <item msgid="420479821767342125">"20 minut"</item> - <item msgid="2107936130151066746">"25 minut"</item> - <item msgid="7219791437023378544">"30 minut"</item> + <item msgid="3024545954917711306">"1 minuta"</item> + <item msgid="5431906692406316549">"5 minut"</item> + <item msgid="7742728812068919959">"10 minut"</item> + <item msgid="2855948657259647629">"15 minut"</item> + <item msgid="6330196381284475079">"20 minut"</item> + <item msgid="7809240121716151904">"25 minut"</item> <item msgid="4278641338024561333">"Nigdy"</item> </string-array> <string name="done" msgid="6509722361933858451">"Gotowe"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Wyświetlanie zegara"</string> <string name="label_description" msgid="8736179296142915727">"Etykieta"</string> <string name="ringtone_description" msgid="7580922112921069925">"Dzwonek"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Informacje o pogodzie są w tej chwili niedostępne."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Usługa odtwarzania dźwięku alarmów ustawionych w zegarze"</string> <string name="loading_ringtone" msgid="6523322777415268044">"Wczytywanie dzwonka…"</string> diff --git a/res/values-pt-rPT/array.xml b/res/values-pt-rPT/array.xml index 5f8661744..ac6dea5b9 100644 --- a/res/values-pt-rPT/array.xml +++ b/res/values-pt-rPT/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Liubliana"</item> </string-array> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index a3eec4535..011b55663 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutos"</item> - <item msgid="3663730603519549990">"10 minutos"</item> - <item msgid="1385481095199681200">"15 minutos"</item> - <item msgid="420479821767342125">"20 minutos"</item> - <item msgid="2107936130151066746">"25 minutos"</item> - <item msgid="7219791437023378544">"30 minutos"</item> + <item msgid="3024545954917711306">"1 minuto"</item> + <item msgid="5431906692406316549">"5 minutos"</item> + <item msgid="7742728812068919959">"10 minutos"</item> + <item msgid="2855948657259647629">"15 minutos"</item> + <item msgid="6330196381284475079">"20 minutos"</item> + <item msgid="7809240121716151904">"25 minutos"</item> <item msgid="4278641338024561333">"Nunca"</item> </string-array> <string name="done" msgid="6509722361933858451">"Concluído"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Apresentação do relógio"</string> <string name="label_description" msgid="8736179296142915727">"Etiqueta"</string> <string name="ringtone_description" msgid="7580922112921069925">"Toque"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Informações meteorológicas atualmente indisponíveis."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Serviço de reprodução de som para alarmes definidos no Despertador."</string> <string name="loading_ringtone" msgid="6523322777415268044">"A carregar toque..."</string> diff --git a/res/values-pt/array.xml b/res/values-pt/array.xml index 253343d64..0885c19f8 100644 --- a/res/values-pt/array.xml +++ b/res/values-pt/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Liubliana"</item> </string-array> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index c82480316..6426e4479 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minutos"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nunca"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minutos"</item> - <item msgid="3663730603519549990">"10 minutos"</item> - <item msgid="1385481095199681200">"15 minutos"</item> - <item msgid="420479821767342125">"20 minutos"</item> - <item msgid="2107936130151066746">"25 minutos"</item> - <item msgid="7219791437023378544">"30 minutos"</item> + <item msgid="3024545954917711306">"1 minuto"</item> + <item msgid="5431906692406316549">"5 minutos"</item> + <item msgid="7742728812068919959">"10 minutos"</item> + <item msgid="2855948657259647629">"15 minutos"</item> + <item msgid="6330196381284475079">"20 minutos"</item> + <item msgid="7809240121716151904">"25 minutos"</item> <item msgid="4278641338024561333">"Nunca"</item> </string-array> <string name="done" msgid="6509722361933858451">"Concluído"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Exibição do relógio"</string> <string name="label_description" msgid="8736179296142915727">"Marcador"</string> <string name="ringtone_description" msgid="7580922112921069925">"Toque"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"As informações meteorológicas não estão disponíveis no momento."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Serviço de reprodução de som para alarmes definidos no Relógio."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Carregando toque…"</string> diff --git a/res/values-ro/array.xml b/res/values-ro/array.xml index 0e8b2e358..a691f3b41 100644 --- a/res/values-ro/array.xml +++ b/res/values-ro/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 408606740..37a8e69c2 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> (de) minute"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Niciodată"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minute"</item> - <item msgid="3663730603519549990">"10 minute"</item> - <item msgid="1385481095199681200">"15 minute"</item> - <item msgid="420479821767342125">"20 de minute"</item> - <item msgid="2107936130151066746">"25 de minute"</item> - <item msgid="7219791437023378544">"30 de minute"</item> + <item msgid="3024545954917711306">"Un minut"</item> + <item msgid="5431906692406316549">"5 minute"</item> + <item msgid="7742728812068919959">"10 minute"</item> + <item msgid="2855948657259647629">"15 minute"</item> + <item msgid="6330196381284475079">"20 de minute"</item> + <item msgid="7809240121716151904">"25 de minute"</item> <item msgid="4278641338024561333">"Niciodată"</item> </string-array> <string name="done" msgid="6509722361933858451">"Terminat"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Afişarea ceasului"</string> <string name="label_description" msgid="8736179296142915727">"Etichetă"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ton de sonerie"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Informaţiile meteo nu sunt disponibile în acest moment."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Serviciul de redare a sunetului pentru setarea alarmelor în aplicaţia Ceas."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Se încarcă tonul soneriei..."</string> diff --git a/res/values-ru/array.xml b/res/values-ru/array.xml index d0d34ad3a..affcae0c6 100644 --- a/res/values-ru/array.xml +++ b/res/values-ru/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегусигальпа"</item> <item msgid="7087691675228926801">"Парамарибо"</item> <item msgid="478384295484578701">"Кито"</item> + <item msgid="4517870253399384206">"Любляна"</item> </string-array> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 023d9f049..25c9ca790 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> мин."</string> <string name="auto_silence_never" msgid="4821982647348750809">"Отключено"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 мин."</item> - <item msgid="3663730603519549990">"10 мин."</item> - <item msgid="1385481095199681200">"15 мин."</item> - <item msgid="420479821767342125">"20 мин."</item> - <item msgid="2107936130151066746">"25 мин."</item> - <item msgid="7219791437023378544">"30 мин."</item> + <item msgid="3024545954917711306">"1 минута"</item> + <item msgid="5431906692406316549">"5 минут"</item> + <item msgid="7742728812068919959">"10 минут"</item> + <item msgid="2855948657259647629">"15 минут"</item> + <item msgid="6330196381284475079">"20 минут"</item> + <item msgid="7809240121716151904">"25 минут"</item> <item msgid="4278641338024561333">"Никогда"</item> </string-array> <string name="done" msgid="6509722361933858451">"Готово"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Внешний вид"</string> <string name="label_description" msgid="8736179296142915727">"Ярлык"</string> <string name="ringtone_description" msgid="7580922112921069925">"Рингтон"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Информация о погоде сейчас недоступна."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Служба воспроизведения сигналов в Часах."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Загрузка мелодии звонка..."</string> diff --git a/res/values-si-rLK/array.xml b/res/values-si-rLK/array.xml index 498d6d51e..84b19d32a 100644 --- a/res/values-si-rLK/array.xml +++ b/res/values-si-rLK/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"ටෙගුසිගල්පා"</item> <item msgid="7087691675228926801">"පැරමාරිබෝ"</item> <item msgid="478384295484578701">"කිටෝ"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-si-rLK/dimens.xml b/res/values-si-rLK/dimens.xml new file mode 100644 index 000000000..725236dc8 --- /dev/null +++ b/res/values-si-rLK/dimens.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2014 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="day_button_font_size">16sp</dimen> +</resources>
\ No newline at end of file diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index 49c32b0b9..277de548b 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"මිනිත්තු <xliff:g id="MINUTES">%d</xliff:g>"</string> <string name="auto_silence_never" msgid="4821982647348750809">"කවදාවත් නොවේ"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"මිනිත්තු 5"</item> - <item msgid="3663730603519549990">"මිනිත්තු 10"</item> - <item msgid="1385481095199681200">"මිනිත්තු 15"</item> - <item msgid="420479821767342125">"මිනිත්තු 20"</item> - <item msgid="2107936130151066746">"මිනිත්තු 25"</item> - <item msgid="7219791437023378544">"මිනිත්තු 30"</item> + <item msgid="3024545954917711306">"මිනිත්තු 1"</item> + <item msgid="5431906692406316549">"මිනිත්තු 5"</item> + <item msgid="7742728812068919959">"මිනිත්තු 10"</item> + <item msgid="2855948657259647629">"මිනිත්තු 15"</item> + <item msgid="6330196381284475079">"මිනිත්තු 20"</item> + <item msgid="7809240121716151904">"මිනිත්තු 25"</item> <item msgid="4278641338024561333">"කවදාවත් නොවේ"</item> </string-array> <string name="done" msgid="6509722361933858451">"හරි"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"ඔරලෝසු දර්ශනය"</string> <string name="label_description" msgid="8736179296142915727">"ලේබලය"</string> <string name="ringtone_description" msgid="7580922112921069925">"රිංග්ටෝනය"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"මේ දැන් කාලගුණ තොරතුරු ලබාගත නොහැක."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"ඔරලෝසුවේ සකසා ඇති ඇඟවීම් සඳහා ශබ්ද පසු ධාවනය කිරීමේ සේවාව."</string> <string name="loading_ringtone" msgid="6523322777415268044">"රිංග්ටෝන් පුර්ණය වෙමින්…"</string> diff --git a/res/values-sk/array.xml b/res/values-sk/array.xml index fb8726d08..2e9b2efc3 100644 --- a/res/values-sk/array.xml +++ b/res/values-sk/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ľubľana"</item> </string-array> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 86d5a8261..f44436dba 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min."</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nikdy"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minút"</item> - <item msgid="3663730603519549990">"10 minút"</item> - <item msgid="1385481095199681200">"15 minút"</item> - <item msgid="420479821767342125">"20 minút"</item> - <item msgid="2107936130151066746">"25 minút"</item> - <item msgid="7219791437023378544">"30 minút"</item> + <item msgid="3024545954917711306">"1 minúta"</item> + <item msgid="5431906692406316549">"5 minút"</item> + <item msgid="7742728812068919959">"10 minút"</item> + <item msgid="2855948657259647629">"15 minút"</item> + <item msgid="6330196381284475079">"20 minút"</item> + <item msgid="7809240121716151904">"25 minút"</item> <item msgid="4278641338024561333">"Nikdy"</item> </string-array> <string name="done" msgid="6509722361933858451">"Hotovo"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Zobrazenie hodín"</string> <string name="label_description" msgid="8736179296142915727">"Menovka"</string> <string name="ringtone_description" msgid="7580922112921069925">"Tón zvonenia"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Informácie o počasí nie sú momentálne k dispozícii."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Služba prehrávania zvuku budíkov nastavených v aplikácii Hodiny."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Prebieha načítavanie vyzváňacieho tónu..."</string> diff --git a/res/values-sl/array.xml b/res/values-sl/array.xml index b60827dc5..b1bb3e1e7 100644 --- a/res/values-sl/array.xml +++ b/res/values-sl/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 6679d3d56..402f85072 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> min"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Nikoli"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minut"</item> - <item msgid="3663730603519549990">"10 minut"</item> - <item msgid="1385481095199681200">"15 minut"</item> - <item msgid="420479821767342125">"20 minut"</item> - <item msgid="2107936130151066746">"25 minut"</item> - <item msgid="7219791437023378544">"30 minut"</item> + <item msgid="3024545954917711306">"1 minuta"</item> + <item msgid="5431906692406316549">"5 minut"</item> + <item msgid="7742728812068919959">"10 minut"</item> + <item msgid="2855948657259647629">"15 minut"</item> + <item msgid="6330196381284475079">"20 minut"</item> + <item msgid="7809240121716151904">"25 minut"</item> <item msgid="4278641338024561333">"Nikoli"</item> </string-array> <string name="done" msgid="6509722361933858451">"Dokončano"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Prikaz ure"</string> <string name="label_description" msgid="8736179296142915727">"Oznaka"</string> <string name="ringtone_description" msgid="7580922112921069925">"Melodija zvonjenja"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Vremenski podatki trenutno niso na voljo."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Storitev predvajanja zvoka za alarme, nastavljene z namizno uro."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Nalaganje zvonjenja ..."</string> diff --git a/res/values-sr/array.xml b/res/values-sr/array.xml index ec874fdba..19b5fc0f5 100644 --- a/res/values-sr/array.xml +++ b/res/values-sr/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегусигалпа"</item> <item msgid="7087691675228926801">"Парамарибо"</item> <item msgid="478384295484578701">"Кито"</item> + <item msgid="4517870253399384206">"Љубљана"</item> </string-array> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index d50dcdfa5..5bc42d8d4 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> минута"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Никада"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 минута"</item> - <item msgid="3663730603519549990">"10 минута"</item> - <item msgid="1385481095199681200">"15 минута"</item> - <item msgid="420479821767342125">"20 минута"</item> - <item msgid="2107936130151066746">"25 минута"</item> - <item msgid="7219791437023378544">"30 минута"</item> + <item msgid="3024545954917711306">"1 минут"</item> + <item msgid="5431906692406316549">"5 минута"</item> + <item msgid="7742728812068919959">"10 минута"</item> + <item msgid="2855948657259647629">"15 минута"</item> + <item msgid="6330196381284475079">"20 минута"</item> + <item msgid="7809240121716151904">"25 минута"</item> <item msgid="4278641338024561333">"Никада"</item> </string-array> <string name="done" msgid="6509722361933858451">"Готово"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Приказ сата"</string> <string name="label_description" msgid="8736179296142915727">"Ознака"</string> <string name="ringtone_description" msgid="7580922112921069925">"Мелодија звона"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Информације о времену тренутно нису доступне."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Услуга репродукције звука за аларме подешене у Сату."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Учитавање звука звона..."</string> diff --git a/res/values-sv/array.xml b/res/values-sv/array.xml index 76786a3b0..5853253cf 100644 --- a/res/values-sv/array.xml +++ b/res/values-sv/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Teguciqalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubliana"</item> </string-array> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 191ea3782..ed55a3653 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> minuter"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Aldrig"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minuter"</item> - <item msgid="3663730603519549990">"10 minuter"</item> - <item msgid="1385481095199681200">"15 minuter"</item> - <item msgid="420479821767342125">"20 minuter"</item> - <item msgid="2107936130151066746">"25 minuter"</item> - <item msgid="7219791437023378544">"30 minuter"</item> + <item msgid="3024545954917711306">"1 minut"</item> + <item msgid="5431906692406316549">"5 minuter"</item> + <item msgid="7742728812068919959">"10 minuter"</item> + <item msgid="2855948657259647629">"15 minuter"</item> + <item msgid="6330196381284475079">"20 minuter"</item> + <item msgid="7809240121716151904">"25 minuter"</item> <item msgid="4278641338024561333">"Aldrig"</item> </string-array> <string name="done" msgid="6509722361933858451">"Färdig"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Klockvisning"</string> <string name="label_description" msgid="8736179296142915727">"Etikett"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ringsignal"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Väderinformationen är inte tillgänglig just nu."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Ljuduppspelningstjänst för alarm som ställts in i DeskClock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Läser in ringsignal..."</string> diff --git a/res/values-sw/array.xml b/res/values-sw/array.xml index f749ec8a1..f31f29adb 100644 --- a/res/values-sw/array.xml +++ b/res/values-sw/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index e2130706e..a2ea88203 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> dakika"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Katu"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"Dakika 5"</item> - <item msgid="3663730603519549990">"Dakika 10"</item> - <item msgid="1385481095199681200">"Dakika 15"</item> - <item msgid="420479821767342125">"Dakika 20"</item> - <item msgid="2107936130151066746">"Dakika 25"</item> - <item msgid="7219791437023378544">"Dakika 30"</item> + <item msgid="3024545954917711306">"Dakika 1"</item> + <item msgid="5431906692406316549">"Dakika 5"</item> + <item msgid="7742728812068919959">"Dakika 10"</item> + <item msgid="2855948657259647629">"Dakika 15"</item> + <item msgid="6330196381284475079">"Dakika 20"</item> + <item msgid="7809240121716151904">"Dakika 25"</item> <item msgid="4278641338024561333">"Katu"</item> </string-array> <string name="done" msgid="6509722361933858451">"Kwisha"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Onyesho la Saa"</string> <string name="label_description" msgid="8736179296142915727">"Lebo"</string> <string name="ringtone_description" msgid="7580922112921069925">"Mlio wa simu"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Taarifa ya hali ya hewa haipatikani hivi sasa."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Huduma ya kuchezesha tena za kengele iliyowekwa kwenye Saa."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Inapakia mlio..."</string> diff --git a/res/values-sw360dp-land/dimens.xml b/res/values-sw360dp-land/dimens.xml new file mode 100644 index 000000000..47e269b52 --- /dev/null +++ b/res/values-sw360dp-land/dimens.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 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="circle_size">232dip</dimen> + +</resources> diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index d48526787..295003038 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -28,6 +28,7 @@ <dimen name="alarm_side_padding">128dip</dimen> <dimen name="clock_side_padding">48dip</dimen> + <dimen name="main_clock_bottom_margin">112dip</dimen> <dimen name="dialpad_font_size">42sp</dimen> <dimen name="dialpad_digit_padding">26dip</dimen> @@ -37,13 +38,14 @@ <dimen name="timer_setup_label_size">24sp</dimen> <!-- Size of margin for circles. --> - <dimen name="circle_margin_top">16dp</dimen> + <dimen name="circle_margin_top">0dp</dimen> <dimen name="circle_margin">48dp</dimen> <dimen name="analog_clock_margin">48dp</dimen> <dimen name="timer_circle_margin">48dp</dimen> <dimen name="circle_size">360dip</dimen> - <dimen name="stopwatch_list_margin_start">128dip</dimen> + <dimen name="stopwatch_list_bottom_spacing">0dip</dimen> + <dimen name="stopwatch_circle_margin_bottom">112dip</dimen> <dimen name="world_clock_margin">48dp</dimen> <dimen name="sw_padding_end">48dp</dimen> diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index aa334aa49..66d1f9054 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -32,7 +32,7 @@ <dimen name="screensaver_margin">20dip</dimen> <dimen name="alarm_label_padding">64dip</dimen> <dimen name="bottom_text_size">18sp</dimen> - <dimen name="bottom_text_spacing_digital">-14dp</dimen> + <dimen name="bottom_text_spacing_digital">-18dp</dimen> <dimen name="bottom_text_spacing_analog">18dp</dimen> <dimen name="bottom_text_spacing_analog_small">10dp</dimen> <dimen name="digital_screensaver_clock_text_size">104sp</dimen> @@ -46,8 +46,10 @@ <dimen name="label_font_size">18sp</dimen> <dimen name="alarm_label_size">18sp</dimen> <dimen name="body_font_size">20sp</dimen> + <dimen name="day_button_font_size">20sp</dimen> <dimen name="alarm_time_font_size">64sp</dimen> <dimen name="alarm_info_font_size">48sp</dimen> + <dimen name="no_alarm_font_size">20sp</dimen> <dimen name="widget_label_font_size">16sp</dimen> <dimen name="body_font_padding">8dp</dimen> @@ -75,6 +77,8 @@ <dimen name="timer_circle_margin">96dp</dimen> <dimen name="circle_size">400dp</dimen> + <!-- stopwatch_list_bottom_spacing = footer_button_size + footer_button_layout_margin --> + <dimen name="stopwatch_list_bottom_spacing">96dip</dimen> <!-- Width of the clock, for use with alarm buttons. --> <dimen name="alarm_alert_display_width">550dip</dimen> @@ -85,15 +89,13 @@ <!-- Digital Widget settings (keyguard|home_screen) --> <!-- Use larger fonts --> - <dimen name="widget_big_font_size">130sp</dimen> + <dimen name="widget_big_font_size">120sp</dimen> <dimen name="widget_medium_font_size">52sp</dimen> <dimen name="widget_24_medium_font_size">65sp</dimen> <dimen name="widget_big_time_margin_right">12dip</dimen> <dimen name="widget_medium_time_margin_right">8dip</dimen> - <dimen name="min_digital_widget_width">335dp</dimen> - <dimen name="min_digital_widget_height">207dp</dimen> - <dimen name="min_digital_widget_resize_width">335dp</dimen> - <dimen name="min_digital_widget_resize_height">207dp</dimen> + <dimen name="min_digital_widget_width">300dip</dimen> + <dimen name="min_digital_widget_height">170dip</dimen> <dimen name="digital_widget_list_min_scaled_height">263dp</dimen> <dimen name="digital_widget_list_min_fixed_height">15dp</dimen> <dimen name="digital_widget_list_margin_top">15dp</dimen> diff --git a/res/values-ta-rIN/array.xml b/res/values-ta-rIN/array.xml index d1cd5ebf9..7b2991028 100644 --- a/res/values-ta-rIN/array.xml +++ b/res/values-ta-rIN/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"தெகுசிகல்பா"</item> <item msgid="7087691675228926801">"பரமரிபோ"</item> <item msgid="478384295484578701">"குய்டொ"</item> + <item msgid="4517870253399384206">"லுஜுபுல்ஜானா"</item> </string-array> </resources> diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 56a0c800b..2acced1f5 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடங்கள்"</string> <string name="auto_silence_never" msgid="4821982647348750809">"எப்போதும் வேண்டாம்"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 நிமிடங்கள்"</item> - <item msgid="3663730603519549990">"10 நிமிடங்கள்"</item> - <item msgid="1385481095199681200">"15 நிமிடங்கள்"</item> - <item msgid="420479821767342125">"20 நிமிடங்கள்"</item> - <item msgid="2107936130151066746">"25 நிமிடங்கள்"</item> - <item msgid="7219791437023378544">"30 நிமிடங்கள்"</item> + <item msgid="3024545954917711306">"1 நிமிடம்"</item> + <item msgid="5431906692406316549">"5 நிமிடங்கள்"</item> + <item msgid="7742728812068919959">"10 நிமிடங்கள்"</item> + <item msgid="2855948657259647629">"15 நிமிடங்கள்"</item> + <item msgid="6330196381284475079">"20 நிமிடங்கள்"</item> + <item msgid="7809240121716151904">"25 நிமிடங்கள்"</item> <item msgid="4278641338024561333">"எப்போதும் வேண்டாம்"</item> </string-array> <string name="done" msgid="6509722361933858451">"முடிந்தது"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"கடிகாரத் தோற்றம்"</string> <string name="label_description" msgid="8736179296142915727">"லேபிள்"</string> <string name="ringtone_description" msgid="7580922112921069925">"ரிங்டோன்"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"வானிலை தகவல் தற்போது கிடைக்கவில்லை."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"கடிகாரத்தில் அமைக்கப்பட்ட அலாரகளுக்கான ஒலி ப்ளேபேக் சேவை."</string> <string name="loading_ringtone" msgid="6523322777415268044">"ரிங்டோனை ஏற்றுகிறது…"</string> diff --git a/res/values-te-rIN/array.xml b/res/values-te-rIN/array.xml index fbb3e041d..b205b2d34 100644 --- a/res/values-te-rIN/array.xml +++ b/res/values-te-rIN/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"తెగుసిగల్పా"</item> <item msgid="7087691675228926801">"పరామారిబో"</item> <item msgid="478384295484578701">"క్విటో"</item> + <item msgid="4517870253399384206">"ల్యూబ్ల్యానా"</item> </string-array> </resources> diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index fc4d51a4c..773a94c9d 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> నిమిషాలు"</string> <string name="auto_silence_never" msgid="4821982647348750809">"ఎప్పటికీ వద్దు"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 నిమిషాలు"</item> - <item msgid="3663730603519549990">"10 నిమిషాలు"</item> - <item msgid="1385481095199681200">"15 నిమిషాలు"</item> - <item msgid="420479821767342125">"20 నిమిషాలు"</item> - <item msgid="2107936130151066746">"25 నిమిషాలు"</item> - <item msgid="7219791437023378544">"30 నిమిషాలు"</item> + <item msgid="3024545954917711306">"1 నిమిషం"</item> + <item msgid="5431906692406316549">"5 నిమిషాలు"</item> + <item msgid="7742728812068919959">"10 నిమిషాలు"</item> + <item msgid="2855948657259647629">"15 నిమిషాలు"</item> + <item msgid="6330196381284475079">"20 నిమిషాలు"</item> + <item msgid="7809240121716151904">"25 నిమిషాలు"</item> <item msgid="4278641338024561333">"ఎప్పటికీ వద్దు"</item> </string-array> <string name="done" msgid="6509722361933858451">"పూర్తయింది"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"గడియారం ప్రదర్శన"</string> <string name="label_description" msgid="8736179296142915727">"లేబుల్"</string> <string name="ringtone_description" msgid="7580922112921069925">"రింగ్టోన్"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"ప్రస్తుతం వాతావరణ సమాచారం అందుబాటులో లేదు."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"గడియారంలో సెట్ చేయబడిన అలారాల కోసం సౌండ్ ప్లేబ్యాక్ సేవ."</string> <string name="loading_ringtone" msgid="6523322777415268044">"రింగ్టోన్ను లోడ్ చేస్తోంది…"</string> diff --git a/res/values-th/array.xml b/res/values-th/array.xml index 98961d6aa..c3889e60b 100644 --- a/res/values-th/array.xml +++ b/res/values-th/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"เตกูซิกัลปา"</item> <item msgid="7087691675228926801">"ปารามาริโบ"</item> <item msgid="478384295484578701">"กีโต"</item> + <item msgid="4517870253399384206">"ลูบลิยานา"</item> </string-array> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 4d0975cbb..c157aaeb7 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> นาที"</string> <string name="auto_silence_never" msgid="4821982647348750809">"ไม่ใช้"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 นาที"</item> - <item msgid="3663730603519549990">"10 นาที"</item> - <item msgid="1385481095199681200">"15 นาที"</item> - <item msgid="420479821767342125">"20 นาที"</item> - <item msgid="2107936130151066746">"25 นาที"</item> - <item msgid="7219791437023378544">"30 นาที"</item> + <item msgid="3024545954917711306">"1 นาที"</item> + <item msgid="5431906692406316549">"5 นาที"</item> + <item msgid="7742728812068919959">"10 นาที"</item> + <item msgid="2855948657259647629">"15 นาที"</item> + <item msgid="6330196381284475079">"20 นาที"</item> + <item msgid="7809240121716151904">"25 นาที"</item> <item msgid="4278641338024561333">"ไม่ใช้"</item> </string-array> <string name="done" msgid="6509722361933858451">"เสร็จสิ้น"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"การแสดงนาฬิกา"</string> <string name="label_description" msgid="8736179296142915727">"ป้ายกำกับ"</string> <string name="ringtone_description" msgid="7580922112921069925">"เสียงเรียกเข้า"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"ข้อมูลสภาพอากาศไม่พร้อมใช้งานในขณะนี้"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"บริการเล่นเสียงสำหรับการปลุกที่ตั้งไว้ใน Clock"</string> <string name="loading_ringtone" msgid="6523322777415268044">"กำลังโหลดเสียงเรียกเข้า..."</string> diff --git a/res/values-tl/array.xml b/res/values-tl/array.xml index 86f562bf1..f2d97dc1e 100644 --- a/res/values-tl/array.xml +++ b/res/values-tl/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 07c9d24c1..e166ebb03 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> (na) minuto"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Hindi Kailanman"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 minuto"</item> - <item msgid="3663730603519549990">"10 minuto"</item> - <item msgid="1385481095199681200">"15 minuto"</item> - <item msgid="420479821767342125">"20 minuto"</item> - <item msgid="2107936130151066746">"25 minuto"</item> - <item msgid="7219791437023378544">"30 minuto"</item> + <item msgid="3024545954917711306">"1 minuto"</item> + <item msgid="5431906692406316549">"5 minuto"</item> + <item msgid="7742728812068919959">"10 minuto"</item> + <item msgid="2855948657259647629">"15 minuto"</item> + <item msgid="6330196381284475079">"20 minuto"</item> + <item msgid="7809240121716151904">"25 minuto"</item> <item msgid="4278641338024561333">"Hindi Kailanman"</item> </string-array> <string name="done" msgid="6509722361933858451">"Tapos na"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Display ng orasan"</string> <string name="label_description" msgid="8736179296142915727">"Label"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ringtone"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Hindi available sa ngayon ang impormasyon ng panahon."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Serbisyo sa pag-playback ng tunog para sa mga alarm na nakatakda sa Clock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Nilo-load ang ringtone…"</string> diff --git a/res/values-tr/array.xml b/res/values-tr/array.xml index 909970833..04f27267b 100644 --- a/res/values-tr/array.xml +++ b/res/values-tr/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 518422c19..6a6ba5055 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> dakika"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Hiçbir zaman"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 dakika"</item> - <item msgid="3663730603519549990">"10 dakika"</item> - <item msgid="1385481095199681200">"15 dakika"</item> - <item msgid="420479821767342125">"20 dakika"</item> - <item msgid="2107936130151066746">"25 dakika"</item> - <item msgid="7219791437023378544">"30 dakika"</item> + <item msgid="3024545954917711306">"1 dakika"</item> + <item msgid="5431906692406316549">"5 dakika"</item> + <item msgid="7742728812068919959">"10 dakika"</item> + <item msgid="2855948657259647629">"15 dakika"</item> + <item msgid="6330196381284475079">"20 dakika"</item> + <item msgid="7809240121716151904">"25 dakika"</item> <item msgid="4278641338024561333">"Hiçbir zaman"</item> </string-array> <string name="done" msgid="6509722361933858451">"Bitti"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Saat görüntüleme"</string> <string name="label_description" msgid="8736179296142915727">"Etiket"</string> <string name="ringtone_description" msgid="7580922112921069925">"Zil sesi"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="PERCENT">%%</xliff:g><xliff:g id="NUMBER">%d</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Hava durumu bilgileri şu anda kullanılamıyor."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Clock\'ta ayarlanmış alarmlar için ses çalma hizmeti"</string> <string name="loading_ringtone" msgid="6523322777415268044">"Zil sesi yükleniyor..."</string> diff --git a/res/values-uk/array.xml b/res/values-uk/array.xml index 4f4d85011..dd34136c9 100644 --- a/res/values-uk/array.xml +++ b/res/values-uk/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Тегусігальпа"</item> <item msgid="7087691675228926801">"Парамарібо"</item> <item msgid="478384295484578701">"Кіто"</item> + <item msgid="4517870253399384206">"Любляна"</item> </string-array> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index ec4f04bd9..ad9488a6d 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> хв."</string> <string name="auto_silence_never" msgid="4821982647348750809">"Ніколи"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 хвилин"</item> - <item msgid="3663730603519549990">"10 хвилин"</item> - <item msgid="1385481095199681200">"15 хвилин"</item> - <item msgid="420479821767342125">"20 хвилин"</item> - <item msgid="2107936130151066746">"25 хвилин"</item> - <item msgid="7219791437023378544">"30 хвилин"</item> + <item msgid="3024545954917711306">"1 хвилина"</item> + <item msgid="5431906692406316549">"5 хв."</item> + <item msgid="7742728812068919959">"10 хв."</item> + <item msgid="2855948657259647629">"15 хв."</item> + <item msgid="6330196381284475079">"20 хв."</item> + <item msgid="7809240121716151904">"25 хв."</item> <item msgid="4278641338024561333">"Ніколи"</item> </string-array> <string name="done" msgid="6509722361933858451">"Готово"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Показ годинника"</string> <string name="label_description" msgid="8736179296142915727">"Мітка"</string> <string name="ringtone_description" msgid="7580922112921069925">"Сигнал дзвінка"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Інформація про погоду зараз не доступна."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Служба відтворення звуків для набору сигналів у Годиннику."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Завантаж. мелодії…"</string> diff --git a/res/values-ur-rPK/array.xml b/res/values-ur-rPK/array.xml index 610cb2db1..40da67d05 100644 --- a/res/values-ur-rPK/array.xml +++ b/res/values-ur-rPK/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"ٹیگوسیگالپے"</item> <item msgid="7087691675228926801">"پیرامیروبی"</item> <item msgid="478384295484578701">"کویٹو"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index 6be9245f4..3016489ed 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> منٹ"</string> <string name="auto_silence_never" msgid="4821982647348750809">"کبھی نہیں"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 منٹ"</item> - <item msgid="3663730603519549990">"10 منٹ"</item> - <item msgid="1385481095199681200">"15 منٹ"</item> - <item msgid="420479821767342125">"20 منٹ"</item> - <item msgid="2107936130151066746">"25 منٹ"</item> - <item msgid="7219791437023378544">"30 منٹ"</item> + <item msgid="3024545954917711306">"1 منٹ"</item> + <item msgid="5431906692406316549">"5 منٹ"</item> + <item msgid="7742728812068919959">"10 منٹ"</item> + <item msgid="2855948657259647629">"15 منٹ"</item> + <item msgid="6330196381284475079">"20 منٹ"</item> + <item msgid="7809240121716151904">"25 منٹ"</item> <item msgid="4278641338024561333">"کبھی نہیں"</item> </string-array> <string name="done" msgid="6509722361933858451">"ہو گیا"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"کلاک ڈسپلے"</string> <string name="label_description" msgid="8736179296142915727">"لیبل"</string> <string name="ringtone_description" msgid="7580922112921069925">"رنگ ٹون"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"موسم کی معلومات اس وقت دستیاب نہیں ہے۔"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"کلاک میں سیٹ کردہ الارمز کیلئے ساؤنڈ پلے بیک سروس۔"</string> <string name="loading_ringtone" msgid="6523322777415268044">"رنگ ٹون ڈاؤن لوڈ ہو رہا ہے…"</string> diff --git a/res/values-uz-rUZ/array.xml b/res/values-uz-rUZ/array.xml index 4e12558ff..73cebc2d9 100644 --- a/res/values-uz-rUZ/array.xml +++ b/res/values-uz-rUZ/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegusigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Kito"</item> + <item msgid="4517870253399384206">"Lyublyana"</item> </string-array> </resources> diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 16847eb24..f2beec388 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> daqiqa"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Hech qachon"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 daqiqa"</item> - <item msgid="3663730603519549990">"10 daqiqa"</item> - <item msgid="1385481095199681200">"15 daqiqa"</item> - <item msgid="420479821767342125">"20 daqiqa"</item> - <item msgid="2107936130151066746">"25 daqiqa"</item> - <item msgid="7219791437023378544">"30 daqiqa"</item> + <item msgid="3024545954917711306">"1 daqiqa"</item> + <item msgid="5431906692406316549">"5 daqiqa"</item> + <item msgid="7742728812068919959">"10 daqiqa"</item> + <item msgid="2855948657259647629">"15 daqiqa"</item> + <item msgid="6330196381284475079">"20 daqiqa"</item> + <item msgid="7809240121716151904">"25 daqiqa"</item> <item msgid="4278641338024561333">"Hech qachon"</item> </string-array> <string name="done" msgid="6509722361933858451">"Tayyor"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Soatning tashqi ko‘rinishi"</string> <string name="label_description" msgid="8736179296142915727">"Yorliq"</string> <string name="ringtone_description" msgid="7580922112921069925">"Rington"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Hozirda ob-havo ma’lumoti mavjud emas."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Soat ilovasidagi uyg‘otkichlar to‘plami uchun signallarni ijro etish xizmati."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Rington yuklanmoqda…"</string> diff --git a/res/values-vi/array.xml b/res/values-vi/array.xml index af8740f3a..73fdf5f06 100644 --- a/res/values-vi/array.xml +++ b/res/values-vi/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"Tegucigalpa"</item> <item msgid="7087691675228926801">"Paramaribo"</item> <item msgid="478384295484578701">"Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 57e47c775..2078d3fc3 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> phút"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Không bao giờ"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 phút"</item> - <item msgid="3663730603519549990">"10 phút"</item> - <item msgid="1385481095199681200">"15 phút"</item> - <item msgid="420479821767342125">"20 phút"</item> - <item msgid="2107936130151066746">"25 phút"</item> - <item msgid="7219791437023378544">"30 phút"</item> + <item msgid="3024545954917711306">"1 phút"</item> + <item msgid="5431906692406316549">"5 phút"</item> + <item msgid="7742728812068919959">"10 phút"</item> + <item msgid="2855948657259647629">"15 phút"</item> + <item msgid="6330196381284475079">"20 phút"</item> + <item msgid="7809240121716151904">"25 phút"</item> <item msgid="4278641338024561333">"Không bao giờ"</item> </string-array> <string name="done" msgid="6509722361933858451">"Xong"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Hiển thị đồng hồ"</string> <string name="label_description" msgid="8736179296142915727">"Nhãn"</string> <string name="ringtone_description" msgid="7580922112921069925">"Nhạc chuông"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Hiện không có thông tin thời tiết."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Dịch vụ phát âm thanh cho báo thức đã đặt trong Clock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Đang tải nhạc chuông…"</string> diff --git a/res/values-zh-rCN/array.xml b/res/values-zh-rCN/array.xml index ac8089a26..6a561dd3d 100644 --- a/res/values-zh-rCN/array.xml +++ b/res/values-zh-rCN/array.xml @@ -316,6 +316,7 @@ <item msgid="8613864994547669100">"特古西加尔巴"</item> <item msgid="7087691675228926801">"帕拉马里博"</item> <item msgid="478384295484578701">"基多"</item> + <item msgid="4517870253399384206">"卢布尔雅那"</item> <item>"马朱罗"</item> <item>"中途岛"</item> <item>"里贾纳"</item> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index e7ab59bbb..0b86bd2c1 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g>分钟"</string> <string name="auto_silence_never" msgid="4821982647348750809">"永不"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5分钟"</item> - <item msgid="3663730603519549990">"10分钟"</item> - <item msgid="1385481095199681200">"15分钟"</item> - <item msgid="420479821767342125">"20分钟"</item> - <item msgid="2107936130151066746">"25分钟"</item> - <item msgid="7219791437023378544">"30分钟"</item> + <item msgid="3024545954917711306">"1 分钟"</item> + <item msgid="5431906692406316549">"5 分钟"</item> + <item msgid="7742728812068919959">"10 分钟"</item> + <item msgid="2855948657259647629">"15 分钟"</item> + <item msgid="6330196381284475079">"20 分钟"</item> + <item msgid="7809240121716151904">"25 分钟"</item> <item msgid="4278641338024561333">"永不"</item> </string-array> <string name="done" msgid="6509722361933858451">"完成"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"时钟显示"</string> <string name="label_description" msgid="8736179296142915727">"标签"</string> <string name="ringtone_description" msgid="7580922112921069925">"铃声"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"目前无法提供天气信息。"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"在“时钟”内设置的闹钟铃声播放服务。"</string> <string name="loading_ringtone" msgid="6523322777415268044">"正在加载铃声..."</string> diff --git a/res/values-zh-rHK/array.xml b/res/values-zh-rHK/array.xml index cef5ebf58..b307e8a13 100644 --- a/res/values-zh-rHK/array.xml +++ b/res/values-zh-rHK/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"德古斯加巴"</item> <item msgid="7087691675228926801">"巴拉馬利波"</item> <item msgid="478384295484578701">"基多"</item> + <item msgid="4517870253399384206">"盧布爾雅那"</item> </string-array> </resources> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 3ab26a544..eafeebebb 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> 分鐘"</string> <string name="auto_silence_never" msgid="4821982647348750809">"永不"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 分鐘"</item> - <item msgid="3663730603519549990">"10 分鐘"</item> - <item msgid="1385481095199681200">"15 分鐘"</item> - <item msgid="420479821767342125">"20 分鐘"</item> - <item msgid="2107936130151066746">"25 分鐘"</item> - <item msgid="7219791437023378544">"30 分鐘"</item> + <item msgid="3024545954917711306">"1 分鐘"</item> + <item msgid="5431906692406316549">"5 分鐘"</item> + <item msgid="7742728812068919959">"10 分鐘"</item> + <item msgid="2855948657259647629">"15 分鐘"</item> + <item msgid="6330196381284475079">"20 分鐘"</item> + <item msgid="7809240121716151904">"25 分鐘"</item> <item msgid="4278641338024561333">"永不"</item> </string-array> <string name="done" msgid="6509722361933858451">"完成"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"時鐘顯示"</string> <string name="label_description" msgid="8736179296142915727">"標籤"</string> <string name="ringtone_description" msgid="7580922112921069925">"鈴聲"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"目前無法提供天氣資訊。"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"「時鐘」的鬧鐘鈴聲播放服務。"</string> <string name="loading_ringtone" msgid="6523322777415268044">"正在載入鈴聲..."</string> diff --git a/res/values-zh-rTW/array.xml b/res/values-zh-rTW/array.xml index 7a37a456c..99bfe61e3 100644 --- a/res/values-zh-rTW/array.xml +++ b/res/values-zh-rTW/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"德古西加巴"</item> <item msgid="7087691675228926801">"巴拉馬利波"</item> <item msgid="478384295484578701">"基多"</item> + <item msgid="4517870253399384206">"盧比安納"</item> </string-array> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 1b2afbcb2..b7a84eed5 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> 分鐘"</string> <string name="auto_silence_never" msgid="4821982647348750809">"永遠不要"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 分鐘"</item> - <item msgid="3663730603519549990">"10 分鐘"</item> - <item msgid="1385481095199681200">"15 分鐘"</item> - <item msgid="420479821767342125">"20 分鐘"</item> - <item msgid="2107936130151066746">"25 分鐘"</item> - <item msgid="7219791437023378544">"30 分鐘"</item> + <item msgid="3024545954917711306">"1 分鐘"</item> + <item msgid="5431906692406316549">"5 分鐘"</item> + <item msgid="7742728812068919959">"10 分鐘"</item> + <item msgid="2855948657259647629">"15 分鐘"</item> + <item msgid="6330196381284475079">"20 分鐘"</item> + <item msgid="7809240121716151904">"25 分鐘"</item> <item msgid="4278641338024561333">"永遠不要"</item> </string-array> <string name="done" msgid="6509722361933858451">"完成"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"時鐘顯示"</string> <string name="label_description" msgid="8736179296142915727">"標籤"</string> <string name="ringtone_description" msgid="7580922112921069925">"鈴聲"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"目前無法取得天氣資訊。"</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"在「時鐘」設定的鬧鐘鈴聲播放服務。"</string> <string name="loading_ringtone" msgid="6523322777415268044">"正在載入鈴聲…"</string> diff --git a/res/values-zu/array.xml b/res/values-zu/array.xml index fc25bf5c8..10025a392 100644 --- a/res/values-zu/array.xml +++ b/res/values-zu/array.xml @@ -317,5 +317,6 @@ <item msgid="8613864994547669100">"I-Tegucigalpa"</item> <item msgid="7087691675228926801">"I-Paramaribo"</item> <item msgid="478384295484578701">"I-Quito"</item> + <item msgid="4517870253399384206">"Ljubljana"</item> </string-array> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 5b7ae4a89..338756ed1 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -99,12 +99,12 @@ <string name="auto_silence_summary" msgid="7028508740659733028">"<xliff:g id="MINUTES">%d</xliff:g> amaminithi"</string> <string name="auto_silence_never" msgid="4821982647348750809">"Ungalokothi"</string> <string-array name="auto_silence_entries"> - <item msgid="3693401222993867634">"5 amaminithi"</item> - <item msgid="3663730603519549990">"10 amaminithi"</item> - <item msgid="1385481095199681200">"15 amaminithi"</item> - <item msgid="420479821767342125">"20 amaminithi"</item> - <item msgid="2107936130151066746">"25 amaminithi"</item> - <item msgid="7219791437023378544">"30 amaminithi"</item> + <item msgid="3024545954917711306">"1 iminithi"</item> + <item msgid="5431906692406316549">"5 amaminithi"</item> + <item msgid="7742728812068919959">"10 amaminithi"</item> + <item msgid="2855948657259647629">"15 amaminithi"</item> + <item msgid="6330196381284475079">"20 amaminithi"</item> + <item msgid="7809240121716151904">"25 amaminithi"</item> <item msgid="4278641338024561333">"Ungalokothi"</item> </string-array> <string name="done" msgid="6509722361933858451">"Kwenziwe"</string> @@ -131,7 +131,6 @@ <string name="desk_clock_button_description" msgid="4207371097361657274">"Ukubukeka kwewashi"</string> <string name="label_description" msgid="8736179296142915727">"Ilebula"</string> <string name="ringtone_description" msgid="7580922112921069925">"Ithoni yokukhala"</string> - <string name="battery_charging_level" msgid="5251483622085889693">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="weather_fetch_failure" msgid="3425804832021006835">"Ulwazi lwesimo sezulu alukho okwamanje."</string> <string name="alarm_klaxon_service_desc" msgid="2147506334302260256">"Insiza yokudlala komsindo we-alamu usethwe ku-Desk Clock."</string> <string name="loading_ringtone" msgid="6523322777415268044">"Ilayisha iringithoni..."</string> diff --git a/res/values/array.xml b/res/values/array.xml index f342e138a..d28ccdf0d 100644 --- a/res/values/array.xml +++ b/res/values/array.xml @@ -315,6 +315,7 @@ <item>Tegucigalpa</item> <item>Paramaribo</item> <item>Quito</item> + <item>Ljubljana</item> <item>Marshall Islands</item> <item>Midway Island</item> <item>Regina</item> @@ -650,6 +651,7 @@ <item>America/Tegucigalpa</item> <item>America/Paramaribo</item> <item>America/Panama</item> + <item>Europe/Ljubljana</item> <item>Pacific/Majuro</item> <item>Pacific/Midway</item> <item>America/Regina</item> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index a05be25f8..38c8d43c6 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -41,9 +41,9 @@ <dimen name="alarm_side_padding">12dip</dimen> <dimen name="clock_side_padding">12dip</dimen> - <!-- clock_side_padding_reduced = clock_side_padding - world_clock_end_padding --> + <!-- clock_side_padding_reduced = clock_side_padding - clock_fragment_end_padding --> <dimen name="clock_side_padding_reduced">0dip</dimen> - <dimen name="world_clock_end_padding">12dip</dimen> + <dimen name="clock_fragment_end_padding">12dip</dimen> <dimen name="alarm_clock_vertical_margin">12dip</dimen> <!-- Analog clock size in the the screen saver --> @@ -76,8 +76,10 @@ <dimen name="main_ampm_font_size">32sp</dimen> <dimen name="header_font_size">24sp</dimen> <dimen name="body_font_size">18sp</dimen> + <dimen name="day_button_font_size">18sp</dimen> <dimen name="alarm_time_font_size">64sp</dimen> <dimen name="alarm_info_font_size">36sp</dimen> + <dimen name="no_alarm_font_size">16sp</dimen> <dimen name="body_font_padding">4dp</dimen> <dimen name="button_font_size">24sp</dimen> @@ -116,7 +118,8 @@ <dimen name="timer_circle_margin">32dp</dimen> <dimen name="circle_size">280dp</dimen> - <dimen name="stopwatch_list_margin_start">64dip</dimen> + <!-- stopwatch_list_bottom_spacing = footer_button_size + footer_button_layout_margin --> + <dimen name="stopwatch_list_bottom_spacing">72dip</dimen> <dimen name="sw_padding_end">32dp</dimen> @@ -147,7 +150,7 @@ <!-- Digital Widget settings (keyguard|home_screen) --> <!-- Clock and world clock sizes --> - <dimen name="widget_big_font_size">80sp</dimen> + <dimen name="widget_big_font_size">75sp</dimen> <dimen name="widget_medium_font_size">32sp</dimen> <dimen name="widget_24_medium_font_size">40sp</dimen> @@ -156,12 +159,9 @@ <dimen name="widget_medium_time_margin_right">5dip</dimen> <!-- width/height of layout/digital_widget_time --> - <!-- height is sum of widget_big_font_size + label_font_size + margins --> - <dimen name="min_digital_widget_width">206dp</dimen> - <dimen name="min_digital_widget_height">129dp</dimen> - <!-- same as min_digital_widget_{width,height} --> - <dimen name="min_digital_widget_resize_width">206dp</dimen> - <dimen name="min_digital_widget_resize_height">129dp</dimen> + <dimen name="min_digital_widget_width">206dip</dimen> + <dimen name="min_digital_widget_height">129dip</dimen> + <!-- sum of scaled heights --> <dimen name="digital_widget_list_min_scaled_height">162dp</dimen> <!-- sum of fixed heights --> @@ -176,4 +176,7 @@ <!-- Divider height --> <dimen name="hairline_height">1dip</dimen> + <!-- The minimum height/width of any touch target --> + <dimen name="touch_target_min_size">48dip</dimen> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 80a3938ed..acadb2235 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -252,24 +252,24 @@ <!-- Entries listed in the ListPreference when invoking the auto silence preference. --> <string-array name="auto_silence_entries"> + <item>1 minute</item> <item>5 minutes</item> <item>10 minutes</item> <item>15 minutes</item> <item>20 minutes</item> <item>25 minutes</item> - <item>30 minutes</item> <item>Never</item> </string-array> <!-- Values that are retrieved from the ListPreference. These must match the auto_silence_entries above. --> <string-array name="auto_silence_values" translatable="false"> + <item>1</item> <item>5</item> <item>10</item> <item>15</item> <item>20</item> <item>25</item> - <item>30</item> <item>-1</item> <!-- Off --> </string-array> @@ -333,9 +333,6 @@ <string name="label_description">Label</string> <string name="ringtone_description">Ringtone</string> - <!-- A short representation of charging information, e.g "34%" --> - <string name="battery_charging_level"><xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string> - <!-- What to show the user if the weather widget exists but fails to respond. This is a sign of an error; if the weather widget is not present on the device, we show nothing at all. --> diff --git a/res/values/styles.xml b/res/values/styles.xml index eea3e16fa..f97e42b78 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -109,9 +109,17 @@ <item name="android:actionBarStyle">@style/CitiesTheme.ActionBar</item> </style> + <!-- This is to control the FastScroll background color --> + <style name="CitiesListViewTheme" parent="@style/CitiesTheme"> + <item name="android:colorControlActivated">@color/hot_pink</item> + </style> + <style name="FastScrollStyle" parent="@android:style/Widget.Material.FastScroll"> - <item name="android:textColor">@color/black</item> - <item name="android:padding">24dip</item> + <item name="android:minWidth">48dip</item> + <item name="android:minHeight">48dip</item> + <item name="android:padding">16dip</item> + <item name="android:textColor">@color/white</item> + <item name="android:textSize">32sp</item> </style> <style name="CitiesTheme.ActionBar" parent="@android:style/Widget.Material.ActionBar"> @@ -170,8 +178,8 @@ </style> <style name="no_alarms"> - <item name="android:textSize">@dimen/alarm_info_font_size</item> - <item name="android:textStyle">bold</item> + <item name="android:textSize">@dimen/no_alarm_font_size</item> + <item name="android:textColor">@color/white_69p</item> </style> <style name="small_light"> diff --git a/res/xml/digital_appwidget.xml b/res/xml/digital_appwidget.xml index c13df265d..49d87fd5c 100644 --- a/res/xml/digital_appwidget.xml +++ b/res/xml/digital_appwidget.xml @@ -17,12 +17,12 @@ <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" android:minWidth="@dimen/min_digital_widget_width" android:minHeight="@dimen/min_digital_widget_height" + android:minResizeWidth="@dimen/min_digital_widget_width" + android:minResizeHeight="@dimen/min_digital_widget_height" android:updatePeriodMillis="0" android:previewImage="@drawable/appwidget_digital_clock_preview" android:initialLayout="@layout/digital_appwidget" android:resizeMode="vertical|horizontal" - android:minResizeWidth="@dimen/min_digital_widget_resize_width" - android:minResizeHeight="@dimen/min_digital_widget_resize_height" android:widgetCategory="keyguard|home_screen" > </appwidget-provider> diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java index e4c549188..356e51496 100644 --- a/src/com/android/deskclock/AlarmClockFragment.java +++ b/src/com/android/deskclock/AlarmClockFragment.java @@ -65,7 +65,6 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; -import android.view.View.OnClickListener; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.ViewTreeObserver; @@ -1054,16 +1053,18 @@ public class AlarmClockFragment extends DeskClockFragment implements final CompoundButton.OnCheckedChangeListener onOffListener = new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton compoundButton, - boolean checked) { - if (checked != alarm.enabled) { - setDigitalTimeAlpha(itemHolder, checked); - alarm.enabled = checked; - asyncUpdateAlarm(alarm, alarm.enabled); - } + @Override + public void onCheckedChanged(CompoundButton compoundButton, boolean checked) { + if (checked != alarm.enabled) { + if (!isAlarmExpanded(alarm)) { + // Only toggle this when alarm is collapsed + setDigitalTimeAlpha(itemHolder, checked); } - }; + alarm.enabled = checked; + asyncUpdateAlarm(alarm, alarm.enabled); + } + } + }; if (mRepeatChecked.contains(alarm.id) || itemHolder.alarm.daysOfWeek.isRepeating()) { itemHolder.tomorrowLabel.setVisibility(View.GONE); @@ -1087,6 +1088,21 @@ public class AlarmClockFragment extends DeskClockFragment implements itemHolder.hairLine.setVisibility(expanded ? View.GONE : View.VISIBLE); itemHolder.arrow.setRotation(expanded ? ROTATE_180_DEGREE : 0); + // Add listener on the arrow to enable proper talkback functionality. + // Avoid setting content description on the entire card. + itemHolder.arrow.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if (isAlarmExpanded(alarm)) { + // Is expanded, make collapse call. + collapseAlarm(itemHolder, true); + } else { + // Is collapsed, make expand call. + expandAlarm(itemHolder, true); + } + } + }); + // Set the repeat text or leave it blank if it does not repeat. final String daysOfWeekStr = alarm.daysOfWeek.toString(AlarmClockFragment.this.getActivity(), false); @@ -1174,7 +1190,7 @@ public class AlarmClockFragment extends DeskClockFragment implements final int alarmHour = alarm.hour; final int currHour = now.get(Calendar.HOUR_OF_DAY); return alarmHour < currHour || - (alarmHour == currHour && alarm.minutes < now.get(Calendar.MINUTE)); + (alarmHour == currHour && alarm.minutes <= now.get(Calendar.MINUTE)); } private void bindExpandArea(final ItemHolder itemHolder, final Alarm alarm) { @@ -1343,7 +1359,8 @@ public class AlarmClockFragment extends DeskClockFragment implements } // Sets the alpha of the digital time display. This gives a visual effect - // for enabled/disabled alarm while leaving the on/off switch more visible + // for enabled/disabled and expanded/collapsed alarm while leaving the + // on/off switch more visible private void setDigitalTimeAlpha(ItemHolder holder, boolean enabled) { float alpha = enabled ? 1f : 0.69f; holder.clock.setAlpha(alpha); @@ -1360,30 +1377,6 @@ public class AlarmClockFragment extends DeskClockFragment implements } } - public void toggleSelectState(View v) { - // long press could be on the parent view or one of its childs, so find the parent view - v = getTopParent(v); - if (v != null) { - long id = ((ItemHolder)v.getTag()).alarm.id; - if (mSelectedAlarms.contains(id)) { - mSelectedAlarms.remove(id); - } else { - mSelectedAlarms.add(id); - } - } - } - - private View getTopParent(View v) { - while (v != null && v.getId() != R.id.alarm_item) { - v = (View) v.getParent(); - } - return v; - } - - public int getSelectedItemsNum() { - return mSelectedAlarms.size(); - } - private void turnOffDayOfWeek(ItemHolder holder, int dayIndex) { final Button dayButton = holder.dayButtons[dayIndex]; dayButton.setActivated(false); @@ -1511,6 +1504,10 @@ public class AlarmClockFragment extends DeskClockFragment implements setAlarmItemBackgroundAndElevation(itemHolder.alarmItem, true /* expanded */); itemHolder.expandArea.setVisibility(View.VISIBLE); itemHolder.delete.setVisibility(View.VISIBLE); + // Show digital time in full-opaque when expanded, even when alarm is disabled + setDigitalTimeAlpha(itemHolder, true /* enabled */); + + itemHolder.arrow.setContentDescription(getString(R.string.collapse_alarm)); if (!animate) { // Set the "end" layout and don't do the animation. @@ -1623,6 +1620,9 @@ public class AlarmClockFragment extends DeskClockFragment implements // Set the expand area to gone so we can measure the height to animate to. setAlarmItemBackgroundAndElevation(itemHolder.alarmItem, false /* expanded */); itemHolder.expandArea.setVisibility(View.GONE); + setDigitalTimeAlpha(itemHolder, itemHolder.onoff.isChecked()); + + itemHolder.arrow.setContentDescription(getString(R.string.expand_alarm)); if (!animate) { // Set the "end" layout and don't do the animation. diff --git a/src/com/android/deskclock/AlarmInitReceiver.java b/src/com/android/deskclock/AlarmInitReceiver.java index 93d319bcb..26808ea9b 100644 --- a/src/com/android/deskclock/AlarmInitReceiver.java +++ b/src/com/android/deskclock/AlarmInitReceiver.java @@ -49,7 +49,7 @@ public class AlarmInitReceiver extends BroadcastReceiver { // We need to increment the global id out of the async task to prevent // race conditions - AlarmStateManager.updateGloablIntentId(context); + AlarmStateManager.updateGlobalIntentId(context); AsyncHandler.post(new Runnable() { @Override public void run() { // Remove the snooze alarm after a boot. diff --git a/src/com/android/deskclock/AnimatorUtils.java b/src/com/android/deskclock/AnimatorUtils.java index ffedcab71..fe90a7d01 100644 --- a/src/com/android/deskclock/AnimatorUtils.java +++ b/src/com/android/deskclock/AnimatorUtils.java @@ -81,39 +81,11 @@ public class AnimatorUtils { public static final TypeEvaluator ARGB_EVALUATOR = new ArgbEvaluator(); - private static Method sAnimateValue; - private static boolean sTryAnimateValue = true; - - public static void setAnimatedFraction(ValueAnimator animator, float fraction) { - if (sTryAnimateValue) { - // try to set the animated fraction directly so that it isn't affected by the - // internal animator scale or time (b/17938711) - try { - if (sAnimateValue == null) { - sAnimateValue = ValueAnimator.class - .getDeclaredMethod("animateValue", float.class); - sAnimateValue.setAccessible(true); - } - - sAnimateValue.invoke(animator, fraction); - return; - } catch (NoSuchMethodException|InvocationTargetException|IllegalAccessException e) { - // something went wrong, don't try that again - LogUtils.e("Unable to use animateValue directly", e); - sTryAnimateValue = false; - } - } - - // if that doesn't work then just fall back to setting the current play time - animator.setCurrentPlayTime(Math.round(fraction * animator.getDuration())); - } - public static void start(ValueAnimator... animators) { for (ValueAnimator animator : animators) { final float fraction = animator.getAnimatedFraction(); if (fraction < 1.0f) { animator.start(); - setAnimatedFraction(animator, fraction); } } } @@ -123,7 +95,6 @@ public class AnimatorUtils { final float fraction = animator.getAnimatedFraction(); if (fraction > 0.0f) { animator.reverse(); - setAnimatedFraction(animator, 1.0f - fraction); } } } diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java index dc3cb45a7..0dd9c5ca7 100644 --- a/src/com/android/deskclock/DeskClock.java +++ b/src/com/android/deskclock/DeskClock.java @@ -30,6 +30,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; import android.graphics.Outline; +import android.media.AudioManager; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; @@ -75,8 +76,6 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe // Check whether to change background every minute private static final long BACKGROUND_COLOR_CHECK_DELAY_MILLIS = DateUtils.MINUTE_IN_MILLIS; private static final int BACKGROUND_COLOR_INITIAL_ANIMATION_DURATION_MILLIS = 3000; - // The depth of fab, use it to create shadow - private static final float FAB_DEPTH = 20f; private static final int UNKNOWN_COLOR_ID = 0; private boolean mIsFirstLaunch = true; @@ -161,7 +160,6 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe setContentView(R.layout.desk_clock); mFab = (ImageButton) findViewById(R.id.fab); mFab.setOutlineProvider(OVAL_OUTLINE_PROVIDER); - mFab.setTranslationZ(FAB_DEPTH); mLeftButton = (ImageButton) findViewById(R.id.left_button); mRightButton = (ImageButton) findViewById(R.id.right_button); if (mTabsAdapter == null) { @@ -206,22 +204,22 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); mAlarmTab = mActionBar.newTab(); - mAlarmTab.setIcon(R.drawable.alarm_tab); + mAlarmTab.setIcon(R.drawable.ic_alarm_animation); mAlarmTab.setContentDescription(R.string.menu_alarm); mTabsAdapter.addTab(mAlarmTab, AlarmClockFragment.class, ALARM_TAB_INDEX); mClockTab = mActionBar.newTab(); - mClockTab.setIcon(R.drawable.clock_tab); + mClockTab.setIcon(R.drawable.ic_clock_animation); mClockTab.setContentDescription(R.string.menu_clock); mTabsAdapter.addTab(mClockTab, ClockFragment.class, CLOCK_TAB_INDEX); mTimerTab = mActionBar.newTab(); - mTimerTab.setIcon(R.drawable.timer_tab); + mTimerTab.setIcon(R.drawable.ic_timer_animation); mTimerTab.setContentDescription(R.string.menu_timer); mTabsAdapter.addTab(mTimerTab, TimerFragment.class, TIMER_TAB_INDEX); mStopwatchTab = mActionBar.newTab(); - mStopwatchTab.setIcon(R.drawable.stopwatch_tab); + mStopwatchTab.setIcon(R.drawable.ic_stopwatch_animation); mStopwatchTab.setContentDescription(R.string.menu_stopwatch); mTabsAdapter.addTab(mStopwatchTab, StopwatchFragment.class, STOPWATCH_TAB_INDEX); @@ -233,6 +231,7 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); + setVolumeControlStream(AudioManager.STREAM_ALARM); mIsFirstLaunch = (icicle == null); getWindow().setBackgroundDrawable(null); @@ -536,7 +535,7 @@ public class DeskClock extends Activity implements LabelDialogFragment.TimerLabe } @Override - public void onTabReselected(Tab arg0, FragmentTransaction arg1) { + public void onTabReselected(Tab tab, FragmentTransaction arg1) { // Do nothing } diff --git a/src/com/android/deskclock/HandleApiCalls.java b/src/com/android/deskclock/HandleApiCalls.java index 77bab3f62..3bd5a7bbc 100644 --- a/src/com/android/deskclock/HandleApiCalls.java +++ b/src/com/android/deskclock/HandleApiCalls.java @@ -98,6 +98,7 @@ public class HandleApiCalls extends Activity { createAlarm.putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.ALARM_TAB_INDEX); startActivity(createAlarm); finish(); + LogUtils.i("HandleApiCalls no/invalid time; opening UI"); return; } @@ -120,6 +121,7 @@ public class HandleApiCalls extends Activity { // Delete all old instances and create a new one with updated values AlarmStateManager.deleteAllInstances(this, alarm.id); setupInstance(alarm.createInstanceAfter(Calendar.getInstance()), skipUi); + LogUtils.i("HandleApiCalls deleted old, created new alarm: %s", alarm); finish(); return; } @@ -147,12 +149,14 @@ public class HandleApiCalls extends Activity { alarm = Alarm.addAlarm(cr, alarm); setupInstance(alarm.createInstanceAfter(Calendar.getInstance()), skipUi); + LogUtils.i("HandleApiCalls set up alarm: %s", alarm); finish(); } private void handleShowAlarms() { startActivity(new Intent(this, DeskClock.class) .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.ALARM_TAB_INDEX)); + LogUtils.i("HandleApiCalls show alarms"); } private void handleSetTimer(Intent intent) { @@ -162,6 +166,7 @@ public class HandleApiCalls extends Activity { startActivity(new Intent(this, DeskClock.class) .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX) .putExtra(TimerFullScreenFragment.GOTO_SETUP_VIEW, true)); + LogUtils.i("HandleApiCalls showing timer setup"); return; } @@ -187,7 +192,7 @@ public class HandleApiCalls extends Activity { boolean skipUi = intent.getBooleanExtra(EXTRA_SKIP_UI, false); if (timer == null) { // Use a new timer - timer = new TimerObj(length, label); + timer = new TimerObj(length, label, this /* context */); // Timers set without presenting UI to the user will be deleted after use timer.mDeleteAfterUse = skipUi; } @@ -204,8 +209,10 @@ public class HandleApiCalls extends Activity { Utils.showInUseNotifications(this); } else { startActivity(new Intent(this, DeskClock.class) - .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX)); + .putExtra(DeskClock.SELECT_TAB_INTENT_EXTRA, DeskClock.TIMER_TAB_INDEX) + .putExtra(Timers.FIRST_LAUNCH_FROM_API_CALL, true)); } + LogUtils.i("HandleApiCalls timer created: %s", timer); } private void setupInstance(AlarmInstance instance, boolean skipUi) { diff --git a/src/com/android/deskclock/Screensaver.java b/src/com/android/deskclock/Screensaver.java index 5c74e3d1a..042d83905 100644 --- a/src/com/android/deskclock/Screensaver.java +++ b/src/com/android/deskclock/Screensaver.java @@ -32,8 +32,11 @@ import android.widget.TextClock; import com.android.deskclock.Utils.ScreensaverMoveSaverRunnable; public class Screensaver extends DreamService { - static final boolean DEBUG = false; - static final String TAG = "DeskClock/Screensaver"; + + public static final int ORIENTATION_CHANGE_DELAY_MS = 250; + + private static final boolean DEBUG = false; + private static final String TAG = "DeskClock/Screensaver"; private View mContentView, mSaverView; private View mAnalogClock, mDigitalClock; @@ -99,7 +102,7 @@ public class Screensaver extends DreamService { super.onConfigurationChanged(newConfig); mHandler.removeCallbacks(mMoveSaverRunnable); layoutClockSaver(); - mHandler.post(mMoveSaverRunnable); + mHandler.postDelayed(mMoveSaverRunnable, ORIENTATION_CHANGE_DELAY_MS); } @Override @@ -149,7 +152,7 @@ public class Screensaver extends DreamService { private void layoutClockSaver() { setContentView(R.layout.desk_clock_saver); mDigitalClock = findViewById(R.id.digital_clock); - mAnalogClock =findViewById(R.id.analog_clock); + mAnalogClock = findViewById(R.id.analog_clock); setClockStyle(); Utils.setTimeFormat((TextClock)mDigitalClock, (int)getResources().getDimension(R.dimen.main_ampm_font_size)); diff --git a/src/com/android/deskclock/ScreensaverActivity.java b/src/com/android/deskclock/ScreensaverActivity.java index 5a5b0d2f2..d5c8ff15e 100644 --- a/src/com/android/deskclock/ScreensaverActivity.java +++ b/src/com/android/deskclock/ScreensaverActivity.java @@ -152,7 +152,7 @@ public class ScreensaverActivity extends Activity { super.onConfigurationChanged(newConfig); mHandler.removeCallbacks(mMoveSaverRunnable); layoutClockSaver(); - mHandler.postDelayed(mMoveSaverRunnable, 250); + mHandler.postDelayed(mMoveSaverRunnable, Screensaver.ORIENTATION_CHANGE_DELAY_MS); } @Override diff --git a/src/com/android/deskclock/SettingsActivity.java b/src/com/android/deskclock/SettingsActivity.java index c9c01ed32..1f5710c6a 100644 --- a/src/com/android/deskclock/SettingsActivity.java +++ b/src/com/android/deskclock/SettingsActivity.java @@ -27,9 +27,7 @@ import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceActivity; -import android.preference.PreferenceScreen; import android.preference.SwitchPreference; -import android.provider.Settings; import android.text.format.DateUtils; import android.view.Menu; import android.view.MenuItem; @@ -49,11 +47,6 @@ import java.util.TimeZone; public class SettingsActivity extends PreferenceActivity implements Preference.OnPreferenceChangeListener { - private static final int ALARM_STREAM_TYPE_BIT = - 1 << AudioManager.STREAM_ALARM; - - public static final String KEY_ALARM_IN_SILENT_MODE = - "alarm_in_silent_mode"; public static final String KEY_SHOW_STATUS_BAR_ICON = "show_status_bar_icon"; public static final String KEY_ALARM_SNOOZE = @@ -88,6 +81,8 @@ public class SettingsActivity extends PreferenceActivity @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setVolumeControlStream(AudioManager.STREAM_ALARM); + addPreferencesFromResource(R.xml.settings); ActionBar actionBar = getActionBar(); @@ -133,7 +128,6 @@ public class SettingsActivity extends PreferenceActivity return super.onOptionsItemSelected(item); } - @Override public boolean onCreateOptionsMenu (Menu menu) { getMenuInflater().inflate(R.menu.settings_menu, menu); @@ -145,31 +139,6 @@ public class SettingsActivity extends PreferenceActivity } @Override - public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, - Preference preference) { - if (KEY_ALARM_IN_SILENT_MODE.equals(preference.getKey())) { - SwitchPreference pref = (SwitchPreference) preference; - int ringerModeStreamTypes = Settings.System.getInt( - getContentResolver(), - Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); - - if (pref.isChecked()) { - ringerModeStreamTypes &= ~ALARM_STREAM_TYPE_BIT; - } else { - ringerModeStreamTypes |= ALARM_STREAM_TYPE_BIT; - } - - Settings.System.putInt(getContentResolver(), - Settings.System.MODE_RINGER_STREAMS_AFFECTED, - ringerModeStreamTypes); - - return true; - } - - return super.onPreferenceTreeClick(preferenceScreen, preference); - } - - @Override public boolean onPreferenceChange(Preference pref, Object newValue) { if (KEY_AUTO_SILENCE.equals(pref.getKey())) { final ListPreference listPref = (ListPreference) pref; diff --git a/src/com/android/deskclock/TimerSetupView.java b/src/com/android/deskclock/TimerSetupView.java index 3185ec0c9..e088b5c2f 100644 --- a/src/com/android/deskclock/TimerSetupView.java +++ b/src/com/android/deskclock/TimerSetupView.java @@ -19,7 +19,6 @@ package com.android.deskclock; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.Context; -import android.content.res.Configuration; import android.graphics.Color; import android.os.Bundle; import android.util.AttributeSet; @@ -109,7 +108,9 @@ public class TimerSetupView extends LinearLayout implements Button.OnClickListen mLeft = (Button)v4.findViewById(R.id.key_left); mNumbers[0] = (Button)v4.findViewById(R.id.key_middle); mRight = (Button)v4.findViewById(R.id.key_right); - setLeftRightEnabled(false); + + mLeft.setVisibility(INVISIBLE); + mRight.setVisibility(INVISIBLE); for (int i = 0; i < 10; i++) { mNumbers[i].setOnClickListener(this); @@ -246,13 +247,4 @@ public class TimerSetupView extends LinearLayout implements Button.OnClickListen } initializeStartButtonVisibility(); } - - protected void setLeftRightEnabled(boolean enabled) { - mLeft.setEnabled(enabled); - mRight.setEnabled(enabled); - if (!enabled) { - mLeft.setContentDescription(null); - mRight.setContentDescription(null); - } - } } diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java index 8bffe21ac..4b1909980 100644 --- a/src/com/android/deskclock/alarms/AlarmActivity.java +++ b/src/com/android/deskclock/alarms/AlarmActivity.java @@ -41,7 +41,7 @@ import android.view.ViewGroupOverlay; import android.view.WindowManager; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; -import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.TextClock; import android.widget.TextView; @@ -114,6 +114,7 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie private boolean mAlarmHandled; private String mVolumeBehavior; private int mCurrentHourColor; + private boolean mReceiverRegistered; private ViewGroup mContainerView; @@ -122,9 +123,9 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie private TextView mAlertInfoView; private ViewGroup mContentView; - private ImageButton mAlarmButton; - private ImageButton mSnoozeButton; - private ImageButton mDismissButton; + private ImageView mAlarmButton; + private ImageView mSnoozeButton; + private ImageView mDismissButton; private TextView mHintView; private ValueAnimator mAlarmAnimator; @@ -138,15 +139,19 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie final long instanceId = AlarmInstance.getId(getIntent().getData()); mAlarmInstance = AlarmInstance.getInstance(getContentResolver(), instanceId); - if (mAlarmInstance != null) { - LogUtils.i(LOGTAG, "Displaying alarm for instance: %s", mAlarmInstance); - } else { + if (mAlarmInstance == null) { // The alarm got deleted before the activity got created, so just finish() LogUtils.e(LOGTAG, "Error displaying alarm for intent: %s", getIntent()); finish(); return; + } else if (mAlarmInstance.mAlarmState != AlarmInstance.FIRED_STATE) { + LogUtils.i(LOGTAG, "Skip displaying alarm for instance: %s", mAlarmInstance); + finish(); + return; } + LogUtils.i(LOGTAG, "Displaying alarm for instance: %s", mAlarmInstance); + // Get the volume/camera button behavior setting mVolumeBehavior = PreferenceManager.getDefaultSharedPreferences(this) .getString(SettingsActivity.KEY_VOLUME_BEHAVIOR, @@ -177,9 +182,9 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie mAlertInfoView = (TextView) mAlertView.findViewById(R.id.alert_info); mContentView = (ViewGroup) mContainerView.findViewById(R.id.content); - mAlarmButton = (ImageButton) mContentView.findViewById(R.id.alarm); - mSnoozeButton = (ImageButton) mContentView.findViewById(R.id.snooze); - mDismissButton = (ImageButton) mContentView.findViewById(R.id.dismiss); + mAlarmButton = (ImageView) mContentView.findViewById(R.id.alarm); + mSnoozeButton = (ImageView) mContentView.findViewById(R.id.snooze); + mDismissButton = (ImageView) mContentView.findViewById(R.id.dismiss); mHintView = (TextView) mContentView.findViewById(R.id.hint); final TextView titleView = (TextView) mContentView.findViewById(R.id.title); @@ -217,15 +222,15 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie filter.addAction(ALARM_SNOOZE_ACTION); filter.addAction(ALARM_DISMISS_ACTION); registerReceiver(mReceiver, filter); + mReceiverRegistered = true; } @Override public void onDestroy() { super.onDestroy(); - // If the alarm instance is null the receiver was never registered and calling - // unregisterReceiver will throw an exception. - if (mAlarmInstance != null) { + // Skip if register didn't happen to avoid IllegalArgumentException + if (mReceiverRegistered) { unregisterReceiver(mReceiver); } } @@ -351,8 +356,15 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie final int alertColor = getResources().getColor(R.color.hot_pink); setAnimatedFractions(1.0f /* snoozeFraction */, 0.0f /* dismissFraction */); - getAlertAnimator(mSnoozeButton, R.string.alarm_alert_snoozed_text, - AlarmStateManager.getSnoozedMinutes(this), alertColor, alertColor).start(); + + final int snoozeMinutes = AlarmStateManager.getSnoozedMinutes(this); + final String infoText = getResources().getQuantityString( + R.plurals.alarm_alert_snooze_duration, snoozeMinutes, snoozeMinutes); + final String accessibilityText = getResources().getQuantityString( + R.plurals.alarm_alert_snooze_set, snoozeMinutes, snoozeMinutes); + + getAlertAnimator(mSnoozeButton, R.string.alarm_alert_snoozed_text, infoText, + accessibilityText, alertColor, alertColor).start(); AlarmStateManager.setSnoozeState(this, mAlarmInstance, false /* showToast */); } @@ -362,22 +374,23 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie setAnimatedFractions(0.0f /* snoozeFraction */, 1.0f /* dismissFraction */); getAlertAnimator(mDismissButton, R.string.alarm_alert_off_text, null /* infoText */, + getString(R.string.alarm_alert_off_text) /* accessibilityText */, Color.WHITE, mCurrentHourColor).start(); AlarmStateManager.setDismissState(this, mAlarmInstance); } private void setAnimatedFractions(float snoozeFraction, float dismissFraction) { final float alarmFraction = Math.max(snoozeFraction, dismissFraction); - AnimatorUtils.setAnimatedFraction(mAlarmAnimator, alarmFraction); - AnimatorUtils.setAnimatedFraction(mSnoozeAnimator, snoozeFraction); - AnimatorUtils.setAnimatedFraction(mDismissAnimator, dismissFraction); + mAlarmAnimator.setCurrentFraction(alarmFraction); + mSnoozeAnimator.setCurrentFraction(snoozeFraction); + mDismissAnimator.setCurrentFraction(dismissFraction); } private float getFraction(float x0, float x1, float x) { return Math.max(Math.min((x - x0) / (x1 - x0), 1.0f), 0.0f); } - private ValueAnimator getButtonAnimator(ImageButton button, int tintColor) { + private ValueAnimator getButtonAnimator(ImageView button, int tintColor) { return ObjectAnimator.ofPropertyValuesHolder(button, PropertyValuesHolder.ofFloat(View.SCALE_X, BUTTON_SCALE_DEFAULT, 1.0f), PropertyValuesHolder.ofFloat(View.SCALE_Y, BUTTON_SCALE_DEFAULT, 1.0f), @@ -407,7 +420,8 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie } private Animator getAlertAnimator(final View source, final int titleResId, - final String infoText, final int revealColor, final int backgroundColor) { + final String infoText, final String accessibilityText, final int revealColor, + final int backgroundColor) { final ViewGroupOverlay overlay = mContainerView.getOverlay(); // Create a transient view for performing the reveal animation. @@ -448,10 +462,12 @@ public class AlarmActivity extends Activity implements View.OnClickListener, Vie public void onAnimationEnd(Animator animator) { mAlertView.setVisibility(View.VISIBLE); mAlertTitleView.setText(titleResId); + if (infoText != null) { mAlertInfoView.setText(infoText); mAlertInfoView.setVisibility(View.VISIBLE); } + mAlertView.announceForAccessibility(accessibilityText); mContentView.setVisibility(View.GONE); mContainerView.setBackgroundColor(backgroundColor); } diff --git a/src/com/android/deskclock/alarms/AlarmNotifications.java b/src/com/android/deskclock/alarms/AlarmNotifications.java index 48c857b9d..2212f7ec9 100755 --- a/src/com/android/deskclock/alarms/AlarmNotifications.java +++ b/src/com/android/deskclock/alarms/AlarmNotifications.java @@ -97,17 +97,20 @@ public final class AlarmNotifications { .setOngoing(false) .setAutoCancel(false) .setPriority(Notification.PRIORITY_DEFAULT) - .setCategory(Notification.CATEGORY_ALARM); + .setCategory(Notification.CATEGORY_ALARM) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true); // Setup up hide notification - Intent hideIntent = AlarmStateManager.createStateChangeIntent(context, "DELETE_TAG", - instance, AlarmInstance.HIDE_NOTIFICATION_STATE); + Intent hideIntent = AlarmStateManager.createStateChangeIntent(context, + AlarmStateManager.ALARM_DELETE_TAG, instance, + AlarmInstance.HIDE_NOTIFICATION_STATE); notification.setDeleteIntent(PendingIntent.getBroadcast(context, instance.hashCode(), hideIntent, PendingIntent.FLAG_UPDATE_CURRENT)); // Setup up dismiss action - Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG", - instance, AlarmInstance.DISMISSED_STATE); + Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, + AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE); notification.addAction(R.drawable.ic_alarm_off_black, resources.getString(R.string.alarm_alert_dismiss_now_text), PendingIntent.getBroadcast(context, instance.hashCode(), @@ -135,11 +138,13 @@ public final class AlarmNotifications { .setOngoing(true) .setAutoCancel(false) .setPriority(Notification.PRIORITY_HIGH) - .setCategory(Notification.CATEGORY_ALARM); + .setCategory(Notification.CATEGORY_ALARM) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true); // Setup up dismiss action - Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG", - instance, AlarmInstance.DISMISSED_STATE); + Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, + AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE); notification.addAction(R.drawable.ic_alarm_off_black, resources.getString(R.string.alarm_alert_dismiss_now_text), PendingIntent.getBroadcast(context, instance.hashCode(), @@ -168,11 +173,13 @@ public final class AlarmNotifications { .setOngoing(true) .setAutoCancel(false) .setPriority(Notification.PRIORITY_MAX) - .setCategory(Notification.CATEGORY_ALARM); + .setCategory(Notification.CATEGORY_ALARM) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true); // Setup up dismiss action - Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG", - instance, AlarmInstance.DISMISSED_STATE); + Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, + AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE); notification.addAction(R.drawable.ic_alarm_off_black, resources.getString(R.string.alarm_alert_dismiss_text), PendingIntent.getBroadcast(context, instance.hashCode(), @@ -200,11 +207,13 @@ public final class AlarmNotifications { .setContentText(contextText) .setSmallIcon(R.drawable.stat_notify_alarm) .setPriority(Notification.PRIORITY_HIGH) - .setCategory(Notification.CATEGORY_ALARM); + .setCategory(Notification.CATEGORY_ALARM) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true); // Setup dismiss intent - Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG", - instance, AlarmInstance.DISMISSED_STATE); + Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, + AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE); notification.setDeleteIntent(PendingIntent.getBroadcast(context, instance.hashCode(), dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT)); @@ -236,11 +245,13 @@ public final class AlarmNotifications { .setAutoCancel(false) .setDefaults(Notification.DEFAULT_LIGHTS) .setWhen(0) - .setCategory(Notification.CATEGORY_ALARM); + .setCategory(Notification.CATEGORY_ALARM) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true); // Setup Snooze Action - Intent snoozeIntent = AlarmStateManager.createStateChangeIntent(context, "SNOOZE_TAG", - instance, AlarmInstance.SNOOZE_STATE); + Intent snoozeIntent = AlarmStateManager.createStateChangeIntent(context, + AlarmStateManager.ALARM_SNOOZE_TAG, instance, AlarmInstance.SNOOZE_STATE); PendingIntent snoozePendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(), snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT); @@ -248,8 +259,8 @@ public final class AlarmNotifications { resources.getString(R.string.alarm_alert_snooze_text), snoozePendingIntent); // Setup Dismiss Action - Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, "DISMISS_TAG", - instance, AlarmInstance.DISMISSED_STATE); + Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context, + AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.DISMISSED_STATE); PendingIntent dismissPendingIntent = PendingIntent.getBroadcast(context, instance.hashCode(), dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT); notification.addAction(R.drawable.ic_alarm_off_black, diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java index 412469e9c..5067b658f 100755 --- a/src/com/android/deskclock/alarms/AlarmStateManager.java +++ b/src/com/android/deskclock/alarms/AlarmStateManager.java @@ -115,8 +115,13 @@ public final class AlarmStateManager extends BroadcastReceiver { // Extra key to set the global broadcast id. private static final String ALARM_GLOBAL_ID_EXTRA = "intent.extra.alarm.global.id"; + // Intent category tags used to dismiss, snooze or delete an alarm + public static final String ALARM_DISMISS_TAG = "DISMISS_TAG"; + public static final String ALARM_SNOOZE_TAG = "SNOOZE_TAG"; + public static final String ALARM_DELETE_TAG = "DELETE_TAG"; + // Intent category tag used when schedule state change intents in alarm manager. - public static final String ALARM_MANAGER_TAG = "ALARM_MANAGER"; + private static final String ALARM_MANAGER_TAG = "ALARM_MANAGER"; // Buffer time in seconds to fire alarm instead of marking it missed. public static final int ALARM_FIRE_BUFFER = 15; @@ -133,7 +138,7 @@ public final class AlarmStateManager extends BroadcastReceiver { return prefs.getInt(ALARM_GLOBAL_ID_EXTRA, -1); } - public static void updateGloablIntentId(Context context) { + public static void updateGlobalIntentId(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); int globalId = prefs.getInt(ALARM_GLOBAL_ID_EXTRA, -1) + 1; prefs.edit().putInt(ALARM_GLOBAL_ID_EXTRA, globalId).commit(); @@ -439,12 +444,10 @@ public final class AlarmStateManager extends BroadcastReceiver { } - public static String getSnoozedMinutes(Context context) { + public static int getSnoozedMinutes(Context context) { final String snoozeMinutesStr = PreferenceManager.getDefaultSharedPreferences(context) .getString(SettingsActivity.KEY_ALARM_SNOOZE, DEFAULT_SNOOZE_MINUTES); - final int snoozeMinutes = Integer.parseInt(snoozeMinutesStr); - return context.getResources().getQuantityString(R.plurals.alarm_alert_snooze_duration, - snoozeMinutes, snoozeMinutes); + return Integer.parseInt(snoozeMinutesStr); } /** @@ -746,9 +749,14 @@ public final class AlarmStateManager extends BroadcastReceiver { int intentId = intent.getIntExtra(ALARM_GLOBAL_ID_EXTRA, -1); int alarmState = intent.getIntExtra(ALARM_STATE_EXTRA, -1); if (intentId != globalId) { - LogUtils.i("Ignoring old Intent. IntentId: " + intentId + " GlobalId: " + globalId + - " AlarmState: " + alarmState); - return; + LogUtils.i("IntentId: " + intentId + " GlobalId: " + globalId + " AlarmState: " + + alarmState); + // Allows dismiss/snooze requests to go through + if (!intent.hasCategory(ALARM_DISMISS_TAG) && + !intent.hasCategory(ALARM_SNOOZE_TAG)) { + LogUtils.i("Ignoring old Intent"); + return; + } } // If the phone is busy, keep the alarm snoozing.When the call is ended, diff --git a/src/com/android/deskclock/stopwatch/StopwatchFragment.java b/src/com/android/deskclock/stopwatch/StopwatchFragment.java index b7402966d..e4f5e86fb 100644 --- a/src/com/android/deskclock/stopwatch/StopwatchFragment.java +++ b/src/com/android/deskclock/stopwatch/StopwatchFragment.java @@ -18,7 +18,6 @@ import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.TranslateAnimation; import android.widget.BaseAdapter; -import android.widget.ListPopupWindow; import android.widget.ListView; import android.widget.TextView; @@ -46,7 +45,6 @@ public class StopwatchFragment extends DeskClockFragment private CircleTimerView mTime; private CountingTimerView mTimeText; private ListView mLapsList; - private ListPopupWindow mSharePopup; private WakeLock mWakeLock; private CircleButtonsLayout mCircleLayout; @@ -55,6 +53,7 @@ public class StopwatchFragment extends DeskClockFragment private LayoutTransition mCircleLayoutTransition; private View mStartSpace; private View mEndSpace; + private View mBottomSpace; private boolean mSpacersUsed; // Used for calculating the time from the start taking into account the pause times @@ -82,6 +81,10 @@ public class StopwatchFragment extends DeskClockFragment // Adapter for the ListView that shows the lap times. class LapsListAdapter extends BaseAdapter { + private static final int VIEW_TYPE_LAP = 0; + private static final int VIEW_TYPE_SPACE = 1; + private static final int VIEW_TYPE_COUNT = 2; + ArrayList<Lap> mLaps = new ArrayList<Lap>(); private final LayoutInflater mInflater; private final String[] mFormats; @@ -111,19 +114,33 @@ public class StopwatchFragment extends DeskClockFragment } @Override + public int getItemViewType(int position) { + return position < mLaps.size() ? VIEW_TYPE_LAP : VIEW_TYPE_SPACE; + } + + @Override + public int getViewTypeCount() { + return VIEW_TYPE_COUNT; + } + + @Override public View getView(int position, View convertView, ViewGroup parent) { - if (mLaps.size() == 0 || position >= mLaps.size()) { + if (getCount() == 0) { return null; } - Lap lap = getItem(position); - View lapInfo; - if (convertView != null) { - lapInfo = convertView; - } else { - lapInfo = mInflater.inflate(R.layout.lap_view, parent, false); + + // Handle request for the Spacer at the end + if (getItemViewType(position) == VIEW_TYPE_SPACE) { + return convertView != null ? convertView + : mInflater.inflate(R.layout.stopwatch_spacer, parent, false); } + + final View lapInfo = convertView != null ? convertView + : mInflater.inflate(R.layout.lap_view, parent, false); + Lap lap = getItem(position); lapInfo.setTag(lap); - TextView count = (TextView)lapInfo.findViewById(R.id.lap_number); + + TextView count = (TextView) lapInfo.findViewById(R.id.lap_number); count.setText(String.format(mLapFormat, mLaps.size() - position).toUpperCase()); setTimeText(lapInfo, lap); @@ -139,12 +156,13 @@ public class StopwatchFragment extends DeskClockFragment @Override public int getCount() { - return mLaps.size(); + // Add 1 for the spacer if list is not empty + return mLaps.isEmpty() ? 0 : mLaps.size() + 1; } @Override public Lap getItem(int position) { - if (mLaps.size() == 0 || position >= mLaps.size()) { + if (position >= mLaps.size()) { return null; } return mLaps.get(position); @@ -235,7 +253,7 @@ public class StopwatchFragment extends DeskClockFragment public StopwatchFragment() { } - private void rightButtonAction() { + private void toggleStopwatchState() { long time = Utils.getTimeNow(); Context context = getActivity().getApplicationContext(); Intent intent = new Intent(context, StopwatchService.class); @@ -279,6 +297,13 @@ public class StopwatchFragment extends DeskClockFragment mLapsAdapter = new LapsListAdapter(getActivity()); mLapsList.setAdapter(mLapsAdapter); + // Timer text serves as a virtual start/stop button. + mTimeText.registerVirtualButtonAction(new Runnable() { + @Override + public void run() { + toggleStopwatchState(); + } + }); mTimeText.setVirtualButtonEnabled(true); mCircleLayout = (CircleButtonsLayout)v.findViewById(R.id.stopwatch_circle); @@ -301,6 +326,10 @@ public class StopwatchFragment extends DeskClockFragment mStartSpace = v.findViewById(R.id.start_space); mEndSpace = v.findViewById(R.id.end_space); mSpacersUsed = mStartSpace != null || mEndSpace != null; + + // Only applicable on portrait, only visible when there is no lap + mBottomSpace = v.findViewById(R.id.bottom_space); + // Listener to invoke extra animation within the laps-list mLayoutTransition.addTransitionListener(new LayoutTransition.TransitionListener() { @Override @@ -376,14 +405,10 @@ public class StopwatchFragment extends DeskClockFragment mLapsList.setVisibility(lapsVisible ? View.VISIBLE : View.GONE); if (mSpacersUsed) { - int spacersVisibility = lapsVisible ? View.GONE : View.VISIBLE; - if (mStartSpace != null) { - mStartSpace.setVisibility(spacersVisibility); - } - if (mEndSpace != null) { - mEndSpace.setVisibility(spacersVisibility); - } + showSpacerVisibility(lapsVisible); } + showBottomSpacerVisibility(lapsVisible); + ((ViewGroup)getView()).setLayoutTransition(mLayoutTransition); mCircleLayout.setLayoutTransition(mCircleLayoutTransition); } @@ -609,20 +634,18 @@ public class StopwatchFragment extends DeskClockFragment // the layout transition animation for the spacers, make the changes, then re-enable // the animation for the add/hide laps-list if (mSpacersUsed) { - int spacersVisibility = lapsVisible ? View.GONE : View.VISIBLE; ViewGroup rootView = (ViewGroup) getView(); if (rootView != null) { rootView.setLayoutTransition(null); - if (mStartSpace != null) { - mStartSpace.setVisibility(spacersVisibility); - } - if (mEndSpace != null) { - mEndSpace.setVisibility(spacersVisibility); - } + + showSpacerVisibility(lapsVisible); + rootView.setLayoutTransition(mLayoutTransition); } } + showBottomSpacerVisibility(lapsVisible); + if (lapsVisible) { // There are laps - show the laps-list // No delay for the CircleButtonsLayout changes - start immediately so that the @@ -641,6 +664,22 @@ public class StopwatchFragment extends DeskClockFragment } } + private void showSpacerVisibility(boolean lapsVisible) { + final int spacersVisibility = lapsVisible ? View.GONE : View.VISIBLE; + if (mStartSpace != null) { + mStartSpace.setVisibility(spacersVisibility); + } + if (mEndSpace != null) { + mEndSpace.setVisibility(spacersVisibility); + } + } + + private void showBottomSpacerVisibility(boolean lapsVisible) { + if (mBottomSpace != null) { + mBottomSpace.setVisibility(lapsVisible ? View.GONE : View.VISIBLE); + } + } + private void startUpdateThread() { mTime.post(mTimeUpdateThread); } @@ -760,7 +799,7 @@ public class StopwatchFragment extends DeskClockFragment @Override public void onFabClick(View view){ - rightButtonAction(); + toggleStopwatchState(); } @Override diff --git a/src/com/android/deskclock/stopwatch/StopwatchService.java b/src/com/android/deskclock/stopwatch/StopwatchService.java index a76b7ce81..1efecff17 100644 --- a/src/com/android/deskclock/stopwatch/StopwatchService.java +++ b/src/com/android/deskclock/stopwatch/StopwatchService.java @@ -245,7 +245,9 @@ public class StopwatchService extends Service { .setOngoing(clockRunning) .setDeleteIntent(PendingIntent.getService(context, 0, dismissIntent, 0)) .setSmallIcon(R.drawable.ic_tab_stopwatch_activated) - .setPriority(Notification.PRIORITY_MAX).build(); + .setPriority(Notification.PRIORITY_MAX) + .setLocalOnly(true) + .build(); notification.bigContentView = remoteViewsExpanded; mNotificationManager.notify(NOTIFICATION_ID, notification); } diff --git a/src/com/android/deskclock/timer/CountingTimerView.java b/src/com/android/deskclock/timer/CountingTimerView.java index 8c48d9de7..adcbc84bc 100644 --- a/src/com/android/deskclock/timer/CountingTimerView.java +++ b/src/com/android/deskclock/timer/CountingTimerView.java @@ -74,7 +74,6 @@ public class CountingTimerView extends View { private final int mPressedColor; private final int mWhiteColor; private final int mAccentColor; - private TextView mStopStartTextView; private final AccessibilityManager mAccessibilityManager; // Fields for the text serving as a virtual button. @@ -548,7 +547,6 @@ public class CountingTimerView extends View { private void virtualButtonPressed(boolean pressedOn) { mVirtualButtonPressedOn = pressedOn; - mStopStartTextView.setTextColor(pressedOn ? mPressedColor : mWhiteColor); invalidate(); } @@ -627,13 +625,7 @@ public class CountingTimerView extends View { float yTextStart = yCenter + mTextHeight/2 - (mTextHeight * FONT_VERTICAL_OFFSET); // Text color differs based on pressed state. - int textColor; - if (mVirtualButtonPressedOn) { - textColor = mPressedColor; - mStopStartTextView.setTextColor(mPressedColor); - } else { - textColor = mDefaultColor; - } + final int textColor = mVirtualButtonPressedOn ? mPressedColor : mDefaultColor; mPaintBigThin.setColor(textColor); mPaintMed.setColor(textColor); @@ -657,8 +649,4 @@ public class CountingTimerView extends View { mRemeasureText = true; resetTextSize(); } - - public void registerStopTextView(TextView stopStartTextView) { - mStopStartTextView = stopStartTextView; - } } diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java index ff1af2691..33108ea4e 100644 --- a/src/com/android/deskclock/timer/TimerFragment.java +++ b/src/com/android/deskclock/timer/TimerFragment.java @@ -218,9 +218,22 @@ public class TimerFragment extends DeskClockFragment implements OnSharedPreferen boolean goToSetUpView; // Process extras that were sent to the app and were intended for the timer fragment final Intent newIntent = getActivity().getIntent(); - if (newIntent != null && newIntent.getBooleanExtra( - TimerFullScreenFragment.GOTO_SETUP_VIEW, false)) { + if (newIntent != null + && newIntent.getBooleanExtra(TimerFullScreenFragment.GOTO_SETUP_VIEW, false)) { goToSetUpView = true; + } else if (newIntent != null + && newIntent.getBooleanExtra(Timers.FIRST_LAUNCH_FROM_API_CALL, false)) { + // We use this extra to identify if a. this activity is launched from api call, + // and b. this fragment is resumed for the first time. If both are true, + // we should show the timer view instead of setup view. + goToSetUpView = false; + // Show the first timer because that's the newly created one + highlightPageIndicator(0); + mViewPager.setCurrentItem(0); + + // Reset the extra to false to ensure when next time the fragment resume, + // we no longer care if it's from api call or not. + newIntent.putExtra(Timers.FIRST_LAUNCH_FROM_API_CALL, false); } else { if (mViewState != null) { final int currPage = mViewState.getInt(CURR_PAGE); @@ -433,7 +446,8 @@ public class TimerFragment extends DeskClockFragment implements OnSharedPreferen @Override public void onAnimationStart(Animator animation) { final int timerLength = mSetupView.getTime(); - final TimerObj timerObj = new TimerObj(timerLength * DateUtils.SECOND_IN_MILLIS); + final TimerObj timerObj = new TimerObj(timerLength * DateUtils.SECOND_IN_MILLIS, + getActivity()); timerObj.mState = TimerObj.STATE_RUNNING; updateTimerState(timerObj, Timers.START_TIMER); diff --git a/src/com/android/deskclock/timer/TimerFullScreenFragment.java b/src/com/android/deskclock/timer/TimerFullScreenFragment.java index 7e11c4476..298272a84 100644 --- a/src/com/android/deskclock/timer/TimerFullScreenFragment.java +++ b/src/com/android/deskclock/timer/TimerFullScreenFragment.java @@ -648,9 +648,14 @@ public class TimerFullScreenFragment extends DeskClockFragment private void resetTimer(TimerObj t) { t.mState = TimerObj.STATE_RESTART; t.mTimeLeft = t.mOriginalLength = t.mSetupLength; - ((TimerListItem) t.mView).stop(); - ((TimerListItem) t.mView).setTime(t.mTimeLeft, false); - ((TimerListItem) t.mView).set(t.mOriginalLength, t.mTimeLeft, false); + + // when multiple timers are firing, some timers will be off-screen and they will not + // have Fragment instances unless user scrolls down further. t.mView is null in this case. + if (t.mView != null) { + t.mView.stop(); + t.mView.setTime(t.mTimeLeft, false); + t.mView.set(t.mOriginalLength, t.mTimeLeft, false); + } updateTimersState(t, Timers.TIMER_RESET); } @@ -955,7 +960,7 @@ public class TimerFullScreenFragment extends DeskClockFragment if (timerLength == 0) { return; } - TimerObj t = new TimerObj(timerLength * DateUtils.SECOND_IN_MILLIS); + TimerObj t = new TimerObj(timerLength * DateUtils.SECOND_IN_MILLIS, getActivity()); t.mState = TimerObj.STATE_RUNNING; mAdapter.addTimer(t); updateTimersState(t, Timers.START_TIMER); diff --git a/src/com/android/deskclock/timer/TimerObj.java b/src/com/android/deskclock/timer/TimerObj.java index 5a43e3398..64639d918 100644 --- a/src/com/android/deskclock/timer/TimerObj.java +++ b/src/com/android/deskclock/timer/TimerObj.java @@ -20,8 +20,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Parcel; import android.os.Parcelable; +import android.preference.PreferenceManager; import android.util.Log; -import android.view.View; import com.android.deskclock.R; import com.android.deskclock.Utils; @@ -35,6 +35,8 @@ import java.util.Set; public class TimerObj implements Parcelable { + public static final String KEY_NEXT_TIMER_ID = "next_timer_id"; + private static final String TAG = "TimerObj"; // Max timer length is 9 hours + 99 minutes + 9 seconds public static final long MAX_TIMER_LENGTH = (9 * 3600 + 99 * 60 + 99) * 1000; @@ -137,11 +139,13 @@ public class TimerObj implements Parcelable { editor.remove(key); key = PREF_DELETE_AFTER_USE + id; editor.remove(key); + if (timersList.isEmpty()) { + editor.remove(KEY_NEXT_TIMER_ID); + } editor.commit(); //dumpTimersFromSharedPrefs(prefs); } - @Override public int describeContents() { return 0; @@ -168,29 +172,43 @@ public class TimerObj implements Parcelable { mLabel = p.readString(); } - public TimerObj() { - this(0); + private TimerObj() { + this(0 /* timerLength */, 0 /* timerId */); + } + + public TimerObj(long timerLength, int timerId) { + init(timerLength, timerId); } - public TimerObj(long timerLength) { - init(timerLength); + public TimerObj(long timerLength, Context context) { + init(timerLength, getNextTimerId(context)); } - public TimerObj(long length, String label) { - this(length); + public TimerObj(long length, String label, Context context) { + this(length, context); mLabel = label != null ? label : ""; } - private void init (long length) { + private void init (long length, int timerId) { /* TODO: mTimerId must avoid StopwatchService.NOTIFICATION_ID, * TimerReceiver.IN_USE_NOTIFICATION_ID, and alarm ID's (which seem to be 1, 2, ..) */ - mTimerId = (int) Utils.getTimeNow(); + mTimerId = timerId; mStartTime = Utils.getTimeNow(); mTimeLeft = mOriginalLength = mSetupLength = length; mLabel = ""; } + private int getNextTimerId(Context context) { + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + final int nextTimerId; + synchronized (TimerObj.class) { + nextTimerId = prefs.getInt(KEY_NEXT_TIMER_ID, 0); + prefs.edit().putInt(KEY_NEXT_TIMER_ID, nextTimerId + 1).apply(); + } + return nextTimerId; + } + public long updateTimeLeft(boolean forceUpdate) { if (isTicking() || forceUpdate) { long millis = Utils.getTimeNow(); diff --git a/src/com/android/deskclock/timer/TimerReceiver.java b/src/com/android/deskclock/timer/TimerReceiver.java index 5bf2bbb8f..4c291481e 100644 --- a/src/com/android/deskclock/timer/TimerReceiver.java +++ b/src/com/android/deskclock/timer/TimerReceiver.java @@ -217,6 +217,8 @@ public class TimerReceiver extends BroadcastReceiver { Intent intent = new Intent(); intent.setAction(Timers.TIMES_UP); intent.setClass(context, TimerReceiver.class); + // Time-critical, should be foreground + intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); if (!mTimers.isEmpty()) { intent.putExtra(Timers.TIMER_INTENT_EXTRA, timerId); } @@ -336,7 +338,9 @@ public class TimerReceiver extends BroadcastReceiver { .setPriority(priority) .setShowWhen(false) .setSmallIcon(R.drawable.stat_notify_timer) - .setCategory(Notification.CATEGORY_ALARM); + .setCategory(Notification.CATEGORY_ALARM) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true); if (showTicker) { builder.setTicker(text); } @@ -458,6 +462,8 @@ public class TimerReceiver extends BroadcastReceiver { .setDefaults(Notification.DEFAULT_LIGHTS) .setWhen(0) .setCategory(Notification.CATEGORY_ALARM) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setLocalOnly(true) .build(); // Send the notification using the timer's id to identify the diff --git a/src/com/android/deskclock/timer/Timers.java b/src/com/android/deskclock/timer/Timers.java index 756a6a5b8..1c5fbadb9 100644 --- a/src/com/android/deskclock/timer/Timers.java +++ b/src/com/android/deskclock/timer/Timers.java @@ -43,6 +43,7 @@ public class Timers { public static final String NOTIF_TIMES_UP_SHOW = "notif_times_up_show"; public static final String NOTIF_TIMES_UP_CANCEL = "notif_times_up_cancel"; public static final String FROM_ALERT = "from_alert"; + public static final String FIRST_LAUNCH_FROM_API_CALL = "first_launch_from_api_call"; public static final String TIMESUP_MODE = "times_up"; diff --git a/src/com/android/deskclock/worldclock/CitiesActivity.java b/src/com/android/deskclock/worldclock/CitiesActivity.java index ea0ad29f2..45ab3469f 100755 --- a/src/com/android/deskclock/worldclock/CitiesActivity.java +++ b/src/com/android/deskclock/worldclock/CitiesActivity.java @@ -25,6 +25,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Resources; +import android.media.AudioManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.text.TextUtils; @@ -541,6 +542,8 @@ public class CitiesActivity extends Activity implements OnCheckedChangeListener, @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setVolumeControlStream(AudioManager.STREAM_ALARM); + mFactory = LayoutInflater.from(this); mPrefs = PreferenceManager.getDefaultSharedPreferences(this); mSortType = mPrefs.getInt(PREF_SORT, SORT_BY_NAME); |
