Merge "Keeps picker quick pick correct when switching home/lock tabs (2/3)" into udc-dev
diff --git a/res/layout/clock_option.xml b/res/layout/clock_option.xml
deleted file mode 100644
index e65cb65..0000000
--- a/res/layout/clock_option.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2019 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingRight="2dp"
- android:paddingBottom="@dimen/option_bottom_margin"
- android:clipChildren="false"
- android:clipToPadding="false"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/option_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="@dimen/theme_option_label_margin"
- android:textAppearance="@style/OptionTitleTextAppearance"/>
- <FrameLayout
- android:id="@+id/option_tile"
- android:layout_width="@dimen/option_tile_width"
- android:layout_height="@dimen/option_tile_width"
- android:layout_gravity="center_horizontal"
- android:paddingHorizontal="@dimen/option_tile_padding_horizontal"
- android:paddingVertical="@dimen/option_tile_padding_vertical"
- android:background="@drawable/option_border">
- <ImageView
- android:id="@+id/clock_option_thumbnail"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </FrameLayout>
-</LinearLayout>
diff --git a/res/layout/notification_section.xml b/res/layout/notification_section.xml
index c89f2e3..c20ffbf 100644
--- a/res/layout/notification_section.xml
+++ b/res/layout/notification_section.xml
@@ -35,16 +35,10 @@
android:orientation="vertical">
<TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/notifications_section_title"
- style="@style/SectionTitleTextStyle" />
-
- <TextView
android:id="@+id/subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/SectionSubtitleTextStyle"/>
+ style="@style/SectionTitleTextStyle"/>
</LinearLayout>
<Switch
diff --git a/res/values-af/clock_colors.xml b/res/values-af/clock_colors.xml
deleted file mode 100644
index f4e0fef..0000000
--- a/res/values-af/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROOI"</item>
- <item msgid="6882970855289978213">"ORANJE"</item>
- <item msgid="5560732545714984533">"GEEL"</item>
- <item msgid="7246284817845434226">"GROEN"</item>
- <item msgid="6762906417604676001">"BLOU"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOOLTJIEPERS"</item>
- <item msgid="6835537356703747621">"GRYS"</item>
- <item msgid="2470141365136884119">"BLOUGROEN"</item>
- </string-array>
-</resources>
diff --git a/res/values-am/clock_colors.xml b/res/values-am/clock_colors.xml
deleted file mode 100644
index 3da51af..0000000
--- a/res/values-am/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ቀይ"</item>
- <item msgid="6882970855289978213">"ብርቱካናማ"</item>
- <item msgid="5560732545714984533">"ቢጫ"</item>
- <item msgid="7246284817845434226">"አረንጓዴ"</item>
- <item msgid="6762906417604676001">"ሰማያዊ"</item>
- <item msgid="8974135109557664892">"ሐምራዊ"</item>
- <item msgid="786643557830463422">"ወይን ጠጅ"</item>
- <item msgid="6835537356703747621">"ግራጫ"</item>
- <item msgid="2470141365136884119">"ደማቅ አረንጓዴ-ሰማያዊ"</item>
- </string-array>
-</resources>
diff --git a/res/values-ar/clock_colors.xml b/res/values-ar/clock_colors.xml
deleted file mode 100644
index 51bc5fe..0000000
--- a/res/values-ar/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"أحمر"</item>
- <item msgid="6882970855289978213">"برتقالي"</item>
- <item msgid="5560732545714984533">"أصفر"</item>
- <item msgid="7246284817845434226">"أخضر"</item>
- <item msgid="6762906417604676001">"أزرق"</item>
- <item msgid="8974135109557664892">"نيلي"</item>
- <item msgid="786643557830463422">"بنفسجي"</item>
- <item msgid="6835537356703747621">"رمادي"</item>
- <item msgid="2470141365136884119">"أزرق مخضرّ"</item>
- </string-array>
-</resources>
diff --git a/res/values-as/clock_colors.xml b/res/values-as/clock_colors.xml
deleted file mode 100644
index 74e0aaf..0000000
--- a/res/values-as/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ৰঙা"</item>
- <item msgid="6882970855289978213">"কমলা"</item>
- <item msgid="5560732545714984533">"হালধীয়া"</item>
- <item msgid="7246284817845434226">"সেউজীয়া"</item>
- <item msgid="6762906417604676001">"নীলা"</item>
- <item msgid="8974135109557664892">"ইণ্ডিগ’"</item>
- <item msgid="786643557830463422">"বেঙুনীয়া"</item>
- <item msgid="6835537356703747621">"ধোঁৱাবৰণীয়া"</item>
- <item msgid="2470141365136884119">"গাঢ় সেউজ-নীলা"</item>
- </string-array>
-</resources>
diff --git a/res/values-az/clock_colors.xml b/res/values-az/clock_colors.xml
deleted file mode 100644
index 6cea40b..0000000
--- a/res/values-az/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"QIRMIZI"</item>
- <item msgid="6882970855289978213">"NARINCI"</item>
- <item msgid="5560732545714984533">"SARI"</item>
- <item msgid="7246284817845434226">"YAŞIL"</item>
- <item msgid="6762906417604676001">"MAVİ"</item>
- <item msgid="8974135109557664892">"TÜND-GÖY"</item>
- <item msgid="786643557830463422">"BƏNÖVŞƏYİ"</item>
- <item msgid="6835537356703747621">"BOZ"</item>
- <item msgid="2470141365136884119">"YAŞILIMTIL MAVİ"</item>
- </string-array>
-</resources>
diff --git a/res/values-b+sr+Latn/clock_colors.xml b/res/values-b+sr+Latn/clock_colors.xml
deleted file mode 100644
index c30c8c2..0000000
--- a/res/values-b+sr+Latn/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"CRVENA"</item>
- <item msgid="6882970855289978213">"NARANDŽASTA"</item>
- <item msgid="5560732545714984533">"ŽUTA"</item>
- <item msgid="7246284817845434226">"ZELENA"</item>
- <item msgid="6762906417604676001">"PLAVA"</item>
- <item msgid="8974135109557664892">"TAMNOPLAVA"</item>
- <item msgid="786643557830463422">"LJUBIČASTA"</item>
- <item msgid="6835537356703747621">"SIVA"</item>
- <item msgid="2470141365136884119">"TIRKIZNA"</item>
- </string-array>
-</resources>
diff --git a/res/values-be/clock_colors.xml b/res/values-be/clock_colors.xml
deleted file mode 100644
index d9a4bcc..0000000
--- a/res/values-be/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ЧЫРВОНЫ"</item>
- <item msgid="6882970855289978213">"АРАНЖАВЫ"</item>
- <item msgid="5560732545714984533">"ЖОЎТЫ"</item>
- <item msgid="7246284817845434226">"ЗЯЛЁНЫ"</item>
- <item msgid="6762906417604676001">"СІНІ"</item>
- <item msgid="8974135109557664892">"ІНДЫГА"</item>
- <item msgid="786643557830463422">"ФІЯЛЕТАВЫ"</item>
- <item msgid="6835537356703747621">"ШЭРЫ"</item>
- <item msgid="2470141365136884119">"СІНЕ-ЗЯЛЁНЫ"</item>
- </string-array>
-</resources>
diff --git a/res/values-bg/clock_colors.xml b/res/values-bg/clock_colors.xml
deleted file mode 100644
index 058b54d..0000000
--- a/res/values-bg/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ЧЕРВЕНО"</item>
- <item msgid="6882970855289978213">"ОРАНЖЕВО"</item>
- <item msgid="5560732545714984533">"ЖЪЛТО"</item>
- <item msgid="7246284817845434226">"ЗЕЛЕНО"</item>
- <item msgid="6762906417604676001">"СИНЬО"</item>
- <item msgid="8974135109557664892">"ИНДИГО"</item>
- <item msgid="786643557830463422">"ВИОЛЕТОВО"</item>
- <item msgid="6835537356703747621">"СИВО"</item>
- <item msgid="2470141365136884119">"СИНЬО-ЗЕЛЕНО"</item>
- </string-array>
-</resources>
diff --git a/res/values-bn/clock_colors.xml b/res/values-bn/clock_colors.xml
deleted file mode 100644
index cd433fa..0000000
--- a/res/values-bn/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"লাল"</item>
- <item msgid="6882970855289978213">"কমলা"</item>
- <item msgid="5560732545714984533">"হলুদ"</item>
- <item msgid="7246284817845434226">"সবুজ"</item>
- <item msgid="6762906417604676001">"নীল"</item>
- <item msgid="8974135109557664892">"নীলচে বেগুনি"</item>
- <item msgid="786643557830463422">"বেগুনি"</item>
- <item msgid="6835537356703747621">"ধূসর"</item>
- <item msgid="2470141365136884119">"নীলচে সবুজ"</item>
- </string-array>
-</resources>
diff --git a/res/values-bs/clock_colors.xml b/res/values-bs/clock_colors.xml
deleted file mode 100644
index 0e7f923..0000000
--- a/res/values-bs/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"CRVENA"</item>
- <item msgid="6882970855289978213">"NARANDŽASTA"</item>
- <item msgid="5560732545714984533">"ŽUTA"</item>
- <item msgid="7246284817845434226">"ZELENA"</item>
- <item msgid="6762906417604676001">"PLAVA"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"LJUBIČASTA"</item>
- <item msgid="6835537356703747621">"SIVA"</item>
- <item msgid="2470141365136884119">"TIRKIZNA"</item>
- </string-array>
-</resources>
diff --git a/res/values-ca/clock_colors.xml b/res/values-ca/clock_colors.xml
deleted file mode 100644
index c44a460..0000000
--- a/res/values-ca/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"VERMELL"</item>
- <item msgid="6882970855289978213">"TARONJA"</item>
- <item msgid="5560732545714984533">"GROC"</item>
- <item msgid="7246284817845434226">"VERD"</item>
- <item msgid="6762906417604676001">"BLAU"</item>
- <item msgid="8974135109557664892">"ANYIL"</item>
- <item msgid="786643557830463422">"VIOLETA"</item>
- <item msgid="6835537356703747621">"GRIS"</item>
- <item msgid="2470141365136884119">"VERD BLAVÓS"</item>
- </string-array>
-</resources>
diff --git a/res/values-cs/clock_colors.xml b/res/values-cs/clock_colors.xml
deleted file mode 100644
index 9406e46..0000000
--- a/res/values-cs/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ČERVENÁ"</item>
- <item msgid="6882970855289978213">"ORANŽOVÁ"</item>
- <item msgid="5560732545714984533">"ŽLUTÁ"</item>
- <item msgid="7246284817845434226">"ZELENÁ"</item>
- <item msgid="6762906417604676001">"MODRÁ"</item>
- <item msgid="8974135109557664892">"INDIGOVÁ"</item>
- <item msgid="786643557830463422">"FIALOVÁ"</item>
- <item msgid="6835537356703747621">"ŠEDÁ"</item>
- <item msgid="2470141365136884119">"ŠEDOZELENÁ"</item>
- </string-array>
-</resources>
diff --git a/res/values-da/clock_colors.xml b/res/values-da/clock_colors.xml
deleted file mode 100644
index 6dcbb4d..0000000
--- a/res/values-da/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RØD"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"GUL"</item>
- <item msgid="7246284817845434226">"GRØN"</item>
- <item msgid="6762906417604676001">"BLÅ"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GRÅ"</item>
- <item msgid="2470141365136884119">"GRØNBLÅ"</item>
- </string-array>
-</resources>
diff --git a/res/values-de/clock_colors.xml b/res/values-de/clock_colors.xml
deleted file mode 100644
index 170bf96..0000000
--- a/res/values-de/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROT"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"GELB"</item>
- <item msgid="7246284817845434226">"GRÜN"</item>
- <item msgid="6762906417604676001">"BLAU"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLETT"</item>
- <item msgid="6835537356703747621">"GRAU"</item>
- <item msgid="2470141365136884119">"BLAUGRÜN"</item>
- </string-array>
-</resources>
diff --git a/res/values-el/clock_colors.xml b/res/values-el/clock_colors.xml
deleted file mode 100644
index 9c0394f..0000000
--- a/res/values-el/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ΚΟΚΚΙΝΟ"</item>
- <item msgid="6882970855289978213">"ΠΟΡΤΟΚΑΛΙ"</item>
- <item msgid="5560732545714984533">"ΚΙΤΡΙΝΟ"</item>
- <item msgid="7246284817845434226">"ΠΡΑΣΙΝΟ"</item>
- <item msgid="6762906417604676001">"ΜΠΛΕ"</item>
- <item msgid="8974135109557664892">"ΛΟΥΛΑΚΙ"</item>
- <item msgid="786643557830463422">"ΒΙΟΛΕΤΙ"</item>
- <item msgid="6835537356703747621">"ΓΚΡΙ"</item>
- <item msgid="2470141365136884119">"ΓΑΛΑΖΟΠΡΑΣΙΝΟ"</item>
- </string-array>
-</resources>
diff --git a/res/values-en-rAU/clock_colors.xml b/res/values-en-rAU/clock_colors.xml
deleted file mode 100644
index 31e40f5..0000000
--- a/res/values-en-rAU/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RED"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"YELLOW"</item>
- <item msgid="7246284817845434226">"GREEN"</item>
- <item msgid="6762906417604676001">"BLUE"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GREY"</item>
- <item msgid="2470141365136884119">"TEAL"</item>
- </string-array>
-</resources>
diff --git a/res/values-en-rGB/clock_colors.xml b/res/values-en-rGB/clock_colors.xml
deleted file mode 100644
index 31e40f5..0000000
--- a/res/values-en-rGB/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RED"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"YELLOW"</item>
- <item msgid="7246284817845434226">"GREEN"</item>
- <item msgid="6762906417604676001">"BLUE"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GREY"</item>
- <item msgid="2470141365136884119">"TEAL"</item>
- </string-array>
-</resources>
diff --git a/res/values-en-rIN/clock_colors.xml b/res/values-en-rIN/clock_colors.xml
deleted file mode 100644
index 31e40f5..0000000
--- a/res/values-en-rIN/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RED"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"YELLOW"</item>
- <item msgid="7246284817845434226">"GREEN"</item>
- <item msgid="6762906417604676001">"BLUE"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GREY"</item>
- <item msgid="2470141365136884119">"TEAL"</item>
- </string-array>
-</resources>
diff --git a/res/values-en-rXC/clock_colors.xml b/res/values-en-rXC/clock_colors.xml
deleted file mode 100644
index a06793b..0000000
--- a/res/values-en-rXC/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RED"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"YELLOW"</item>
- <item msgid="7246284817845434226">"GREEN"</item>
- <item msgid="6762906417604676001">"BLUE"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GRAY"</item>
- <item msgid="2470141365136884119">"TEAL"</item>
- </string-array>
-</resources>
diff --git a/res/values-es-rUS/clock_colors.xml b/res/values-es-rUS/clock_colors.xml
deleted file mode 100644
index 6caf3b8..0000000
--- a/res/values-es-rUS/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROJO"</item>
- <item msgid="6882970855289978213">"NARANJA"</item>
- <item msgid="5560732545714984533">"AMARILLO"</item>
- <item msgid="7246284817845434226">"VERDE"</item>
- <item msgid="6762906417604676001">"AZUL"</item>
- <item msgid="8974135109557664892">"ÍNDIGO"</item>
- <item msgid="786643557830463422">"VIOLETA"</item>
- <item msgid="6835537356703747621">"GRIS"</item>
- <item msgid="2470141365136884119">"VERDE AZULADO"</item>
- </string-array>
-</resources>
diff --git a/res/values-es/clock_colors.xml b/res/values-es/clock_colors.xml
deleted file mode 100644
index b8607fb..0000000
--- a/res/values-es/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROJO"</item>
- <item msgid="6882970855289978213">"NARANJA"</item>
- <item msgid="5560732545714984533">"AMARILLO"</item>
- <item msgid="7246284817845434226">"VERDE"</item>
- <item msgid="6762906417604676001">"AZUL"</item>
- <item msgid="8974135109557664892">"ÍNDIGO"</item>
- <item msgid="786643557830463422">"VIOLETA"</item>
- <item msgid="6835537356703747621">"GRIS"</item>
- <item msgid="2470141365136884119">"TURQUESA"</item>
- </string-array>
-</resources>
diff --git a/res/values-et/clock_colors.xml b/res/values-et/clock_colors.xml
deleted file mode 100644
index 7d73aa2..0000000
--- a/res/values-et/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"PUNANE"</item>
- <item msgid="6882970855289978213">"ORANŽ"</item>
- <item msgid="5560732545714984533">"KOLLANE"</item>
- <item msgid="7246284817845434226">"ROHELINE"</item>
- <item msgid="6762906417604676001">"SININE"</item>
- <item msgid="8974135109557664892">"INDIGOSININE"</item>
- <item msgid="786643557830463422">"VIOLETNE"</item>
- <item msgid="6835537356703747621">"HALL"</item>
- <item msgid="2470141365136884119">"SINAKASROHELINE"</item>
- </string-array>
-</resources>
diff --git a/res/values-eu/clock_colors.xml b/res/values-eu/clock_colors.xml
deleted file mode 100644
index 453cb8e..0000000
--- a/res/values-eu/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"GORRIA"</item>
- <item msgid="6882970855289978213">"LARANJA"</item>
- <item msgid="5560732545714984533">"HORIA"</item>
- <item msgid="7246284817845434226">"BERDEA"</item>
- <item msgid="6762906417604676001">"URDINA"</item>
- <item msgid="8974135109557664892">"INDIGOA"</item>
- <item msgid="786643557830463422">"BIOLETA"</item>
- <item msgid="6835537356703747621">"GRISA"</item>
- <item msgid="2470141365136884119">"ANILA"</item>
- </string-array>
-</resources>
diff --git a/res/values-fa/clock_colors.xml b/res/values-fa/clock_colors.xml
deleted file mode 100644
index e890d08..0000000
--- a/res/values-fa/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"قرمز"</item>
- <item msgid="6882970855289978213">"نارنجی"</item>
- <item msgid="5560732545714984533">"زرد"</item>
- <item msgid="7246284817845434226">"سبز"</item>
- <item msgid="6762906417604676001">"آبی"</item>
- <item msgid="8974135109557664892">"نیلی"</item>
- <item msgid="786643557830463422">"یاسی"</item>
- <item msgid="6835537356703747621">"خاکستری"</item>
- <item msgid="2470141365136884119">"سبز دودی"</item>
- </string-array>
-</resources>
diff --git a/res/values-fi/clock_colors.xml b/res/values-fi/clock_colors.xml
deleted file mode 100644
index 4da60ae..0000000
--- a/res/values-fi/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"PUNAINEN"</item>
- <item msgid="6882970855289978213">"ORANSSI"</item>
- <item msgid="5560732545714984533">"KELTAINEN"</item>
- <item msgid="7246284817845434226">"VIHREÄ"</item>
- <item msgid="6762906417604676001">"SININEN"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLETTI"</item>
- <item msgid="6835537356703747621">"HARMAA"</item>
- <item msgid="2470141365136884119">"TURKOOSI"</item>
- </string-array>
-</resources>
diff --git a/res/values-fr-rCA/clock_colors.xml b/res/values-fr-rCA/clock_colors.xml
deleted file mode 100644
index a02729a..0000000
--- a/res/values-fr-rCA/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROUGE"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"JAUNE"</item>
- <item msgid="7246284817845434226">"VERT"</item>
- <item msgid="6762906417604676001">"BLEU"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GRIS"</item>
- <item msgid="2470141365136884119">"BLEU SARCELLE"</item>
- </string-array>
-</resources>
diff --git a/res/values-fr/clock_colors.xml b/res/values-fr/clock_colors.xml
deleted file mode 100644
index 6daf394..0000000
--- a/res/values-fr/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROUGE"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"JAUNE"</item>
- <item msgid="7246284817845434226">"VERT"</item>
- <item msgid="6762906417604676001">"BLEU"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"MAUVE"</item>
- <item msgid="6835537356703747621">"GRIS"</item>
- <item msgid="2470141365136884119">"TURQUOISE"</item>
- </string-array>
-</resources>
diff --git a/res/values-gl/clock_colors.xml b/res/values-gl/clock_colors.xml
deleted file mode 100644
index 5d9da17..0000000
--- a/res/values-gl/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"VERMELLO"</item>
- <item msgid="6882970855289978213">"LARANXA"</item>
- <item msgid="5560732545714984533">"AMARELO"</item>
- <item msgid="7246284817845434226">"VERDE"</item>
- <item msgid="6762906417604676001">"AZUL"</item>
- <item msgid="8974135109557664892">"ÍNDIGO"</item>
- <item msgid="786643557830463422">"VIOLETA"</item>
- <item msgid="6835537356703747621">"GRIS"</item>
- <item msgid="2470141365136884119">"VERDE AZULADO"</item>
- </string-array>
-</resources>
diff --git a/res/values-gu/clock_colors.xml b/res/values-gu/clock_colors.xml
deleted file mode 100644
index 0818083..0000000
--- a/res/values-gu/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"લાલ"</item>
- <item msgid="6882970855289978213">"નારંગી"</item>
- <item msgid="5560732545714984533">"પીળો"</item>
- <item msgid="7246284817845434226">"લીલો"</item>
- <item msgid="6762906417604676001">"વાદળી"</item>
- <item msgid="8974135109557664892">"ઘેરો વાદળી રંગ"</item>
- <item msgid="786643557830463422">"જાંબલી"</item>
- <item msgid="6835537356703747621">"રાખોડી"</item>
- <item msgid="2470141365136884119">"ટીલ"</item>
- </string-array>
-</resources>
diff --git a/res/values-hi/clock_colors.xml b/res/values-hi/clock_colors.xml
deleted file mode 100644
index e613f33..0000000
--- a/res/values-hi/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"लाल"</item>
- <item msgid="6882970855289978213">"नारंगी"</item>
- <item msgid="5560732545714984533">"पीला"</item>
- <item msgid="7246284817845434226">"हरा"</item>
- <item msgid="6762906417604676001">"नीला"</item>
- <item msgid="8974135109557664892">"इंडिगो"</item>
- <item msgid="786643557830463422">"बैंगनी"</item>
- <item msgid="6835537356703747621">"स्लेटी"</item>
- <item msgid="2470141365136884119">"टील"</item>
- </string-array>
-</resources>
diff --git a/res/values-hr/clock_colors.xml b/res/values-hr/clock_colors.xml
deleted file mode 100644
index de6b751..0000000
--- a/res/values-hr/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"CRVENA"</item>
- <item msgid="6882970855289978213">"NARANČASTA"</item>
- <item msgid="5560732545714984533">"ŽUTA"</item>
- <item msgid="7246284817845434226">"ZELENA"</item>
- <item msgid="6762906417604676001">"PLAVA"</item>
- <item msgid="8974135109557664892">"MODROLJUBIČASTA"</item>
- <item msgid="786643557830463422">"LJUBIČASTA"</item>
- <item msgid="6835537356703747621">"SIVA"</item>
- <item msgid="2470141365136884119">"TIRKIZNOPLAVA"</item>
- </string-array>
-</resources>
diff --git a/res/values-hu/clock_colors.xml b/res/values-hu/clock_colors.xml
deleted file mode 100644
index cc869be..0000000
--- a/res/values-hu/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"PIROS"</item>
- <item msgid="6882970855289978213">"NARANCSSÁRGA"</item>
- <item msgid="5560732545714984533">"SÁRGA"</item>
- <item msgid="7246284817845434226">"ZÖLD"</item>
- <item msgid="6762906417604676001">"KÉK"</item>
- <item msgid="8974135109557664892">"INDIGÓKÉK"</item>
- <item msgid="786643557830463422">"IBOLYAKÉK"</item>
- <item msgid="6835537356703747621">"SZÜRKE"</item>
- <item msgid="2470141365136884119">"PÁVAKÉK"</item>
- </string-array>
-</resources>
diff --git a/res/values-hy/clock_colors.xml b/res/values-hy/clock_colors.xml
deleted file mode 100644
index 15366a7..0000000
--- a/res/values-hy/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ԿԱՐՄԻՐ"</item>
- <item msgid="6882970855289978213">"ՆԱՐՆՋԱԳՈՒՅՆ"</item>
- <item msgid="5560732545714984533">"ԴԵՂԻՆ"</item>
- <item msgid="7246284817845434226">"ԿԱՆԱՉ"</item>
- <item msgid="6762906417604676001">"ԿԱՊՈՒՅՏ"</item>
- <item msgid="8974135109557664892">"ԻՆԴԻԳՈ"</item>
- <item msgid="786643557830463422">"ՄԱՆՈՒՇԱԿԱԳՈՒՅՆ"</item>
- <item msgid="6835537356703747621">"ՄՈԽՐԱԳՈՒՅՆ"</item>
- <item msgid="2470141365136884119">"ՓԻՐՈՒԶԱԳՈՒՅՆ"</item>
- </string-array>
-</resources>
diff --git a/res/values-in/clock_colors.xml b/res/values-in/clock_colors.xml
deleted file mode 100644
index f3b4693..0000000
--- a/res/values-in/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"MERAH"</item>
- <item msgid="6882970855289978213">"ORANYE"</item>
- <item msgid="5560732545714984533">"KUNING"</item>
- <item msgid="7246284817845434226">"HIJAU"</item>
- <item msgid="6762906417604676001">"BIRU"</item>
- <item msgid="8974135109557664892">"NILA"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"ABU-ABU"</item>
- <item msgid="2470141365136884119">"HIJAU KEBIRUAN"</item>
- </string-array>
-</resources>
diff --git a/res/values-is/clock_colors.xml b/res/values-is/clock_colors.xml
deleted file mode 100644
index c7f0a59..0000000
--- a/res/values-is/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RAUÐUR"</item>
- <item msgid="6882970855289978213">"APPELSÍNUGULUR"</item>
- <item msgid="5560732545714984533">"GULUR"</item>
- <item msgid="7246284817845434226">"GRÆNN"</item>
- <item msgid="6762906417604676001">"BLÁR"</item>
- <item msgid="8974135109557664892">"DIMMFJÓLUBLÁR"</item>
- <item msgid="786643557830463422">"FJÓLUBLÁR"</item>
- <item msgid="6835537356703747621">"GRÁR"</item>
- <item msgid="2470141365136884119">"GRÆNBLÁR"</item>
- </string-array>
-</resources>
diff --git a/res/values-it/clock_colors.xml b/res/values-it/clock_colors.xml
deleted file mode 100644
index 6e9505c..0000000
--- a/res/values-it/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROSSO"</item>
- <item msgid="6882970855289978213">"ARANCIONE"</item>
- <item msgid="5560732545714984533">"GIALLO"</item>
- <item msgid="7246284817845434226">"VERDE"</item>
- <item msgid="6762906417604676001">"BLU"</item>
- <item msgid="8974135109557664892">"INDACO"</item>
- <item msgid="786643557830463422">"VIOLA"</item>
- <item msgid="6835537356703747621">"GRIGIO"</item>
- <item msgid="2470141365136884119">"VERDE ACQUA"</item>
- </string-array>
-</resources>
diff --git a/res/values-iw/clock_colors.xml b/res/values-iw/clock_colors.xml
deleted file mode 100644
index 36c8783..0000000
--- a/res/values-iw/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"אדום"</item>
- <item msgid="6882970855289978213">"כתום"</item>
- <item msgid="5560732545714984533">"צהוב"</item>
- <item msgid="7246284817845434226">"ירוק"</item>
- <item msgid="6762906417604676001">"כחול"</item>
- <item msgid="8974135109557664892">"אינדיגו"</item>
- <item msgid="786643557830463422">"סגול"</item>
- <item msgid="6835537356703747621">"אפור"</item>
- <item msgid="2470141365136884119">"כחול-ירקרק"</item>
- </string-array>
-</resources>
diff --git a/res/values-ja/clock_colors.xml b/res/values-ja/clock_colors.xml
deleted file mode 100644
index 3bdde56..0000000
--- a/res/values-ja/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"赤"</item>
- <item msgid="6882970855289978213">"オレンジ"</item>
- <item msgid="5560732545714984533">"黄"</item>
- <item msgid="7246284817845434226">"緑"</item>
- <item msgid="6762906417604676001">"青"</item>
- <item msgid="8974135109557664892">"インディゴ"</item>
- <item msgid="786643557830463422">"バイオレット"</item>
- <item msgid="6835537356703747621">"グレー"</item>
- <item msgid="2470141365136884119">"ティール"</item>
- </string-array>
-</resources>
diff --git a/res/values-ka/clock_colors.xml b/res/values-ka/clock_colors.xml
deleted file mode 100644
index dd13e10..0000000
--- a/res/values-ka/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"წითელი"</item>
- <item msgid="6882970855289978213">"ნარინჯისფერი"</item>
- <item msgid="5560732545714984533">"ყვითელი"</item>
- <item msgid="7246284817845434226">"მწვანე"</item>
- <item msgid="6762906417604676001">"ლურჯი"</item>
- <item msgid="8974135109557664892">"მუქი ლურჯი"</item>
- <item msgid="786643557830463422">"იისფერი"</item>
- <item msgid="6835537356703747621">"რუხი"</item>
- <item msgid="2470141365136884119">"ზურმუხტისფერი"</item>
- </string-array>
-</resources>
diff --git a/res/values-kk/clock_colors.xml b/res/values-kk/clock_colors.xml
deleted file mode 100644
index b8abce4..0000000
--- a/res/values-kk/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ҚЫЗЫЛ"</item>
- <item msgid="6882970855289978213">"ҚЫЗҒЫЛТ САРЫ"</item>
- <item msgid="5560732545714984533">"САРЫ"</item>
- <item msgid="7246284817845434226">"ЖАСЫЛ"</item>
- <item msgid="6762906417604676001">"КӨК"</item>
- <item msgid="8974135109557664892">"ИНДИГО"</item>
- <item msgid="786643557830463422">"КҮЛГІН"</item>
- <item msgid="6835537356703747621">"СҰР"</item>
- <item msgid="2470141365136884119">"КӨКШІЛ ЖАСЫЛ"</item>
- </string-array>
-</resources>
diff --git a/res/values-km/clock_colors.xml b/res/values-km/clock_colors.xml
deleted file mode 100644
index 25bc604..0000000
--- a/res/values-km/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ក្រហម"</item>
- <item msgid="6882970855289978213">"ទឹកក្រូច"</item>
- <item msgid="5560732545714984533">"លឿង"</item>
- <item msgid="7246284817845434226">"បៃតង"</item>
- <item msgid="6762906417604676001">"ខៀវ"</item>
- <item msgid="8974135109557664892">"ទឹកប៊ិក"</item>
- <item msgid="786643557830463422">"ត្របែកព្រៃ"</item>
- <item msgid="6835537356703747621">"ប្រផេះ"</item>
- <item msgid="2470141365136884119">"បៃតងចាស់"</item>
- </string-array>
-</resources>
diff --git a/res/values-kn/clock_colors.xml b/res/values-kn/clock_colors.xml
deleted file mode 100644
index 775db7f..0000000
--- a/res/values-kn/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ಕೆಂಪು"</item>
- <item msgid="6882970855289978213">"ಕಿತ್ತಳೆ"</item>
- <item msgid="5560732545714984533">"ಹಳದಿ"</item>
- <item msgid="7246284817845434226">"ಹಸಿರು"</item>
- <item msgid="6762906417604676001">"ನೀಲಿ"</item>
- <item msgid="8974135109557664892">"ಇಂಡಿಗೊ"</item>
- <item msgid="786643557830463422">"ನೇರಳೆ"</item>
- <item msgid="6835537356703747621">"ಬೂದು"</item>
- <item msgid="2470141365136884119">"ಟೀಲ್"</item>
- </string-array>
-</resources>
diff --git a/res/values-ko/clock_colors.xml b/res/values-ko/clock_colors.xml
deleted file mode 100644
index 2b596c8..0000000
--- a/res/values-ko/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"빨간색"</item>
- <item msgid="6882970855289978213">"주황색"</item>
- <item msgid="5560732545714984533">"노란색"</item>
- <item msgid="7246284817845434226">"초록색"</item>
- <item msgid="6762906417604676001">"파란색"</item>
- <item msgid="8974135109557664892">"인디고"</item>
- <item msgid="786643557830463422">"보라색"</item>
- <item msgid="6835537356703747621">"회색"</item>
- <item msgid="2470141365136884119">"청록색"</item>
- </string-array>
-</resources>
diff --git a/res/values-ky/clock_colors.xml b/res/values-ky/clock_colors.xml
deleted file mode 100644
index 06d711c..0000000
--- a/res/values-ky/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"КЫЗЫЛ"</item>
- <item msgid="6882970855289978213">"КЫЗГЫЛТ САРЫ"</item>
- <item msgid="5560732545714984533">"САРЫ"</item>
- <item msgid="7246284817845434226">"ЖАШЫЛ"</item>
- <item msgid="6762906417604676001">"КӨК"</item>
- <item msgid="8974135109557664892">"ИНДИГО"</item>
- <item msgid="786643557830463422">"КЫЗГЫЛТ КӨК"</item>
- <item msgid="6835537356703747621">"БОЗ"</item>
- <item msgid="2470141365136884119">"КӨГҮШ ЖАШЫЛ"</item>
- </string-array>
-</resources>
diff --git a/res/values-lo/clock_colors.xml b/res/values-lo/clock_colors.xml
deleted file mode 100644
index 857c2b0..0000000
--- a/res/values-lo/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ສີແດງ"</item>
- <item msgid="6882970855289978213">"ສີສົ້ມ"</item>
- <item msgid="5560732545714984533">"ສີເຫຼືອງ"</item>
- <item msgid="7246284817845434226">"ສີຂຽວ"</item>
- <item msgid="6762906417604676001">"ສີຟ້າ"</item>
- <item msgid="8974135109557664892">"ສີຄາມ"</item>
- <item msgid="786643557830463422">"ສີມ່ວງ"</item>
- <item msgid="6835537356703747621">"ສີເທົາ"</item>
- <item msgid="2470141365136884119">"ສີຟ້າອົມຂຽວ"</item>
- </string-array>
-</resources>
diff --git a/res/values-lt/clock_colors.xml b/res/values-lt/clock_colors.xml
deleted file mode 100644
index 4e30d75..0000000
--- a/res/values-lt/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RAUDONA"</item>
- <item msgid="6882970855289978213">"ORANŽINĖ"</item>
- <item msgid="5560732545714984533">"GELTONA"</item>
- <item msgid="7246284817845434226">"ŽALIA"</item>
- <item msgid="6762906417604676001">"MĖLYNA"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLETINĖ"</item>
- <item msgid="6835537356703747621">"PILKA"</item>
- <item msgid="2470141365136884119">"ŽALSVAI MĖLYNA"</item>
- </string-array>
-</resources>
diff --git a/res/values-lv/clock_colors.xml b/res/values-lv/clock_colors.xml
deleted file mode 100644
index 0983836..0000000
--- a/res/values-lv/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"SARKANA"</item>
- <item msgid="6882970855289978213">"ORANŽA"</item>
- <item msgid="5560732545714984533">"DZELTENA"</item>
- <item msgid="7246284817845434226">"ZAĻA"</item>
- <item msgid="6762906417604676001">"ZILA"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLETA"</item>
- <item msgid="6835537356703747621">"PELĒKA"</item>
- <item msgid="2470141365136884119">"ZILGANZAĻA"</item>
- </string-array>
-</resources>
diff --git a/res/values-mk/clock_colors.xml b/res/values-mk/clock_colors.xml
deleted file mode 100644
index e89597c..0000000
--- a/res/values-mk/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ЦРВЕНА"</item>
- <item msgid="6882970855289978213">"ПОРТОКАЛОВА"</item>
- <item msgid="5560732545714984533">"ЖОЛТА"</item>
- <item msgid="7246284817845434226">"ЗЕЛЕНА"</item>
- <item msgid="6762906417604676001">"СИНА"</item>
- <item msgid="8974135109557664892">"ИНДИГО"</item>
- <item msgid="786643557830463422">"ВИОЛЕТОВА"</item>
- <item msgid="6835537356703747621">"СИВА"</item>
- <item msgid="2470141365136884119">"СИНО-ЗЕЛЕНА"</item>
- </string-array>
-</resources>
diff --git a/res/values-ml/clock_colors.xml b/res/values-ml/clock_colors.xml
deleted file mode 100644
index b194aed..0000000
--- a/res/values-ml/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ചുവപ്പ്"</item>
- <item msgid="6882970855289978213">"ഓറഞ്ച്"</item>
- <item msgid="5560732545714984533">"മഞ്ഞ"</item>
- <item msgid="7246284817845434226">"പച്ച"</item>
- <item msgid="6762906417604676001">"നീല"</item>
- <item msgid="8974135109557664892">"ഇൻഡിഗോ"</item>
- <item msgid="786643557830463422">"വയലറ്റ്"</item>
- <item msgid="6835537356703747621">"ചാരനിറം"</item>
- <item msgid="2470141365136884119">"ടീൽ"</item>
- </string-array>
-</resources>
diff --git a/res/values-mn/clock_colors.xml b/res/values-mn/clock_colors.xml
deleted file mode 100644
index d059fc0..0000000
--- a/res/values-mn/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"УЛААН"</item>
- <item msgid="6882970855289978213">"УЛБАР ШАР"</item>
- <item msgid="5560732545714984533">"ШАР"</item>
- <item msgid="7246284817845434226">"НОГООН"</item>
- <item msgid="6762906417604676001">"ЦЭНХЭР"</item>
- <item msgid="8974135109557664892">"ХӨХӨВТӨР НИЛ ЯГААН"</item>
- <item msgid="786643557830463422">"ХӨХ ЯГААН"</item>
- <item msgid="6835537356703747621">"СААРАЛ"</item>
- <item msgid="2470141365136884119">"УСАН ЦЭНХЭР"</item>
- </string-array>
-</resources>
diff --git a/res/values-mr/clock_colors.xml b/res/values-mr/clock_colors.xml
deleted file mode 100644
index a37bf2a..0000000
--- a/res/values-mr/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"लाल"</item>
- <item msgid="6882970855289978213">"नारिंगी"</item>
- <item msgid="5560732545714984533">"पिवळा"</item>
- <item msgid="7246284817845434226">"हिरवा"</item>
- <item msgid="6762906417604676001">"निळा"</item>
- <item msgid="8974135109557664892">"गडद निळा"</item>
- <item msgid="786643557830463422">"जांभळा"</item>
- <item msgid="6835537356703747621">"राखाडी"</item>
- <item msgid="2470141365136884119">"हिरवट निळा"</item>
- </string-array>
-</resources>
diff --git a/res/values-ms/clock_colors.xml b/res/values-ms/clock_colors.xml
deleted file mode 100644
index fb06584..0000000
--- a/res/values-ms/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"MERAH"</item>
- <item msgid="6882970855289978213">"JINGGA"</item>
- <item msgid="5560732545714984533">"KUNING"</item>
- <item msgid="7246284817845434226">"HIJAU"</item>
- <item msgid="6762906417604676001">"BIRU"</item>
- <item msgid="8974135109557664892">"BIRU NILA"</item>
- <item msgid="786643557830463422">"LEMBAYUNG"</item>
- <item msgid="6835537356703747621">"KELABU"</item>
- <item msgid="2470141365136884119">"HIJAU KEBIRUAN"</item>
- </string-array>
-</resources>
diff --git a/res/values-my/clock_colors.xml b/res/values-my/clock_colors.xml
deleted file mode 100644
index 121056b..0000000
--- a/res/values-my/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"အနီရောင်"</item>
- <item msgid="6882970855289978213">"လိမ္မော်ရောင်"</item>
- <item msgid="5560732545714984533">"အဝါရောင်"</item>
- <item msgid="7246284817845434226">"အစိမ်းရောင်"</item>
- <item msgid="6762906417604676001">"အပြာရောင်"</item>
- <item msgid="8974135109557664892">"မဲနယ်ရောင်"</item>
- <item msgid="786643557830463422">"ခရမ်းရောင်"</item>
- <item msgid="6835537356703747621">"မီးခိုးရောင်"</item>
- <item msgid="2470141365136884119">"စိမ်းပြာရောင်"</item>
- </string-array>
-</resources>
diff --git a/res/values-nb/clock_colors.xml b/res/values-nb/clock_colors.xml
deleted file mode 100644
index 7b27822..0000000
--- a/res/values-nb/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RØD"</item>
- <item msgid="6882970855289978213">"ORANSJE"</item>
- <item msgid="5560732545714984533">"GUL"</item>
- <item msgid="7246284817845434226">"GRØNN"</item>
- <item msgid="6762906417604676001">"BLÅ"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"FIOLETT"</item>
- <item msgid="6835537356703747621">"GRÅ"</item>
- <item msgid="2470141365136884119">"BLÅGRØNN"</item>
- </string-array>
-</resources>
diff --git a/res/values-ne/clock_colors.xml b/res/values-ne/clock_colors.xml
deleted file mode 100644
index a46e357..0000000
--- a/res/values-ne/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"रातो"</item>
- <item msgid="6882970855289978213">"सुन्तले"</item>
- <item msgid="5560732545714984533">"पहेँलो"</item>
- <item msgid="7246284817845434226">"हरियो"</item>
- <item msgid="6762906417604676001">"निलो"</item>
- <item msgid="8974135109557664892">"इन्डिगो"</item>
- <item msgid="786643557830463422">"बैजनी"</item>
- <item msgid="6835537356703747621">"खैरो"</item>
- <item msgid="2470141365136884119">"निलोमिश्रित हरियो"</item>
- </string-array>
-</resources>
diff --git a/res/values-nl/clock_colors.xml b/res/values-nl/clock_colors.xml
deleted file mode 100644
index bd072a1..0000000
--- a/res/values-nl/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROOD"</item>
- <item msgid="6882970855289978213">"ORANJE"</item>
- <item msgid="5560732545714984533">"GEEL"</item>
- <item msgid="7246284817845434226">"GROEN"</item>
- <item msgid="6762906417604676001">"BLAUW"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GRIJS"</item>
- <item msgid="2470141365136884119">"BLAUWGROEN"</item>
- </string-array>
-</resources>
diff --git a/res/values-or/clock_colors.xml b/res/values-or/clock_colors.xml
deleted file mode 100644
index ab38485..0000000
--- a/res/values-or/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ଲାଲ"</item>
- <item msgid="6882970855289978213">"କମଳା"</item>
- <item msgid="5560732545714984533">"ହଳଦିଆ"</item>
- <item msgid="7246284817845434226">"ସବୁଜ"</item>
- <item msgid="6762906417604676001">"ନୀଳ"</item>
- <item msgid="8974135109557664892">"ଇଣ୍ଡିଗୋ"</item>
- <item msgid="786643557830463422">"ବାଇଗଣୀ"</item>
- <item msgid="6835537356703747621">"ଧୂସର"</item>
- <item msgid="2470141365136884119">"ଟିଲ"</item>
- </string-array>
-</resources>
diff --git a/res/values-pa/clock_colors.xml b/res/values-pa/clock_colors.xml
deleted file mode 100644
index 3201dab..0000000
--- a/res/values-pa/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ਲਾਲ"</item>
- <item msgid="6882970855289978213">"ਸੰਤਰੀ"</item>
- <item msgid="5560732545714984533">"ਪੀਲਾ"</item>
- <item msgid="7246284817845434226">"ਹਰਾ"</item>
- <item msgid="6762906417604676001">"ਨੀਲਾ"</item>
- <item msgid="8974135109557664892">"ਲਾਜਵਰ"</item>
- <item msgid="786643557830463422">"ਜਾਮਣੀ"</item>
- <item msgid="6835537356703747621">"ਸਲੇਟੀ"</item>
- <item msgid="2470141365136884119">"ਟੀਲ"</item>
- </string-array>
-</resources>
diff --git a/res/values-pl/clock_colors.xml b/res/values-pl/clock_colors.xml
deleted file mode 100644
index 2e6f58b..0000000
--- a/res/values-pl/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"CZERWONY"</item>
- <item msgid="6882970855289978213">"POMARAŃCZOWY"</item>
- <item msgid="5560732545714984533">"ŻÓŁTY"</item>
- <item msgid="7246284817845434226">"ZIELONY"</item>
- <item msgid="6762906417604676001">"NIEBIESKI"</item>
- <item msgid="8974135109557664892">"INDYGO"</item>
- <item msgid="786643557830463422">"FIOLETOWY"</item>
- <item msgid="6835537356703747621">"SZARY"</item>
- <item msgid="2470141365136884119">"MORSKI"</item>
- </string-array>
-</resources>
diff --git a/res/values-pt-rPT/clock_colors.xml b/res/values-pt-rPT/clock_colors.xml
deleted file mode 100644
index 029295a..0000000
--- a/res/values-pt-rPT/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"VERMELHO"</item>
- <item msgid="6882970855289978213">"LARANJA"</item>
- <item msgid="5560732545714984533">"AMARELO"</item>
- <item msgid="7246284817845434226">"VERDE"</item>
- <item msgid="6762906417604676001">"AZUL"</item>
- <item msgid="8974135109557664892">"ÍNDIGO"</item>
- <item msgid="786643557830463422">"VIOLETA"</item>
- <item msgid="6835537356703747621">"CINZENTO"</item>
- <item msgid="2470141365136884119">"AZUL-ESVERDEADO"</item>
- </string-array>
-</resources>
diff --git a/res/values-pt/clock_colors.xml b/res/values-pt/clock_colors.xml
deleted file mode 100644
index 57538ba..0000000
--- a/res/values-pt/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"VERMELHO"</item>
- <item msgid="6882970855289978213">"LARANJA"</item>
- <item msgid="5560732545714984533">"AMARELO"</item>
- <item msgid="7246284817845434226">"VERDE"</item>
- <item msgid="6762906417604676001">"AZUL"</item>
- <item msgid="8974135109557664892">"ÍNDIGO"</item>
- <item msgid="786643557830463422">"VIOLETA"</item>
- <item msgid="6835537356703747621">"CINZA"</item>
- <item msgid="2470141365136884119">"AZUL-PETRÓLEO"</item>
- </string-array>
-</resources>
diff --git a/res/values-ro/clock_colors.xml b/res/values-ro/clock_colors.xml
deleted file mode 100644
index 003fa39..0000000
--- a/res/values-ro/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ROȘU"</item>
- <item msgid="6882970855289978213">"PORTOCALIU"</item>
- <item msgid="5560732545714984533">"GALBEN"</item>
- <item msgid="7246284817845434226">"VERDE"</item>
- <item msgid="6762906417604676001">"ALBASTRU"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GRI"</item>
- <item msgid="2470141365136884119">"TURCOAZ"</item>
- </string-array>
-</resources>
diff --git a/res/values-ru/clock_colors.xml b/res/values-ru/clock_colors.xml
deleted file mode 100644
index 17e429a..0000000
--- a/res/values-ru/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"КРАСНЫЙ"</item>
- <item msgid="6882970855289978213">"ОРАНЖЕВЫЙ"</item>
- <item msgid="5560732545714984533">"ЖЕЛТЫЙ"</item>
- <item msgid="7246284817845434226">"ЗЕЛЕНЫЙ"</item>
- <item msgid="6762906417604676001">"СИНИЙ"</item>
- <item msgid="8974135109557664892">"ИНДИГО"</item>
- <item msgid="786643557830463422">"ФИОЛЕТОВЫЙ"</item>
- <item msgid="6835537356703747621">"СЕРЫЙ"</item>
- <item msgid="2470141365136884119">"ТЕМНО-БИРЮЗОВЫЙ"</item>
- </string-array>
-</resources>
diff --git a/res/values-si/clock_colors.xml b/res/values-si/clock_colors.xml
deleted file mode 100644
index c0b3da5..0000000
--- a/res/values-si/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"රතු"</item>
- <item msgid="6882970855289978213">"තැඹිලි"</item>
- <item msgid="5560732545714984533">"කහ"</item>
- <item msgid="7246284817845434226">"කොළ"</item>
- <item msgid="6762906417604676001">"නිල්"</item>
- <item msgid="8974135109557664892">"ඉන්ඩිගෝ"</item>
- <item msgid="786643557830463422">"වයලට්"</item>
- <item msgid="6835537356703747621">"අළු"</item>
- <item msgid="2470141365136884119">"හරිත නිල්"</item>
- </string-array>
-</resources>
diff --git a/res/values-sk/clock_colors.xml b/res/values-sk/clock_colors.xml
deleted file mode 100644
index a443c4b..0000000
--- a/res/values-sk/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ČERVENÁ"</item>
- <item msgid="6882970855289978213">"ORANŽOVÁ"</item>
- <item msgid="5560732545714984533">"ŽLTÁ"</item>
- <item msgid="7246284817845434226">"ZELENÁ"</item>
- <item msgid="6762906417604676001">"MODRÁ"</item>
- <item msgid="8974135109557664892">"INDIGOVÁ"</item>
- <item msgid="786643557830463422">"FIALOVÁ"</item>
- <item msgid="6835537356703747621">"SIVÁ"</item>
- <item msgid="2470141365136884119">"MODROZELENÁ"</item>
- </string-array>
-</resources>
diff --git a/res/values-sl/clock_colors.xml b/res/values-sl/clock_colors.xml
deleted file mode 100644
index edf1377..0000000
--- a/res/values-sl/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RDEČA"</item>
- <item msgid="6882970855289978213">"ORANŽNA"</item>
- <item msgid="5560732545714984533">"RUMENA"</item>
- <item msgid="7246284817845434226">"ZELENA"</item>
- <item msgid="6762906417604676001">"MODRA"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIJOLIČNA"</item>
- <item msgid="6835537356703747621">"SIVA"</item>
- <item msgid="2470141365136884119">"ZELENOMODRA"</item>
- </string-array>
-</resources>
diff --git a/res/values-sq/clock_colors.xml b/res/values-sq/clock_colors.xml
deleted file mode 100644
index 69a2b0c..0000000
--- a/res/values-sq/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"E KUQE"</item>
- <item msgid="6882970855289978213">"PORTOKALLI"</item>
- <item msgid="5560732545714984533">"E VERDHË"</item>
- <item msgid="7246284817845434226">"E GJELBËR"</item>
- <item msgid="6762906417604676001">"BLU"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VJOLLCË"</item>
- <item msgid="6835537356703747621">"GRI"</item>
- <item msgid="2470141365136884119">"GURKALI"</item>
- </string-array>
-</resources>
diff --git a/res/values-sr/clock_colors.xml b/res/values-sr/clock_colors.xml
deleted file mode 100644
index 9250371..0000000
--- a/res/values-sr/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ЦРВЕНА"</item>
- <item msgid="6882970855289978213">"НАРАНЏАСТА"</item>
- <item msgid="5560732545714984533">"ЖУТА"</item>
- <item msgid="7246284817845434226">"ЗЕЛЕНА"</item>
- <item msgid="6762906417604676001">"ПЛАВА"</item>
- <item msgid="8974135109557664892">"ТАМНОПЛАВА"</item>
- <item msgid="786643557830463422">"ЉУБИЧАСТА"</item>
- <item msgid="6835537356703747621">"СИВА"</item>
- <item msgid="2470141365136884119">"ТИРКИЗНА"</item>
- </string-array>
-</resources>
diff --git a/res/values-sv/clock_colors.xml b/res/values-sv/clock_colors.xml
deleted file mode 100644
index 46df56a..0000000
--- a/res/values-sv/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"RÖD"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"GUL"</item>
- <item msgid="7246284817845434226">"GRÖN"</item>
- <item msgid="6762906417604676001">"BLÅ"</item>
- <item msgid="8974135109557664892">"INDIGOBLÅ"</item>
- <item msgid="786643557830463422">"VIOLETT"</item>
- <item msgid="6835537356703747621">"GRÅ"</item>
- <item msgid="2470141365136884119">"BLÅGRÖN"</item>
- </string-array>
-</resources>
diff --git a/res/values-sw/clock_colors.xml b/res/values-sw/clock_colors.xml
deleted file mode 100644
index b2fd0c2..0000000
--- a/res/values-sw/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"NYEKUNDU"</item>
- <item msgid="6882970855289978213">"RANGI YA CHUNGWA"</item>
- <item msgid="5560732545714984533">"NJANO"</item>
- <item msgid="7246284817845434226">"KIJANI"</item>
- <item msgid="6762906417604676001">"BULUU"</item>
- <item msgid="8974135109557664892">"NILI"</item>
- <item msgid="786643557830463422">"ZAMBARAU ILIYOKOLEA"</item>
- <item msgid="6835537356703747621">"KIJIVU"</item>
- <item msgid="2470141365136884119">"SAMAWATI YA KIJANI"</item>
- </string-array>
-</resources>
diff --git a/res/values-ta/clock_colors.xml b/res/values-ta/clock_colors.xml
deleted file mode 100644
index 67824d6..0000000
--- a/res/values-ta/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"சிவப்பு"</item>
- <item msgid="6882970855289978213">"ஆரஞ்சு"</item>
- <item msgid="5560732545714984533">"மஞ்சள்"</item>
- <item msgid="7246284817845434226">"பச்சை"</item>
- <item msgid="6762906417604676001">"நீலம்"</item>
- <item msgid="8974135109557664892">"அடர் நீலம்"</item>
- <item msgid="786643557830463422">"ஊதா"</item>
- <item msgid="6835537356703747621">"சாம்பல்"</item>
- <item msgid="2470141365136884119">"பசும் நீலம்"</item>
- </string-array>
-</resources>
diff --git a/res/values-te/clock_colors.xml b/res/values-te/clock_colors.xml
deleted file mode 100644
index a142c76..0000000
--- a/res/values-te/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ఎరుపు రంగు"</item>
- <item msgid="6882970855289978213">"నారింజ రంగు"</item>
- <item msgid="5560732545714984533">"పసుపు రంగు"</item>
- <item msgid="7246284817845434226">"ఆకుపచ్చ రంగు"</item>
- <item msgid="6762906417604676001">"నీలం రంగు"</item>
- <item msgid="8974135109557664892">"ఇండిగో రంగు"</item>
- <item msgid="786643557830463422">"ఊదా రంగు"</item>
- <item msgid="6835537356703747621">"బూడిద రంగు"</item>
- <item msgid="2470141365136884119">"టీల్ రంగు"</item>
- </string-array>
-</resources>
diff --git a/res/values-th/clock_colors.xml b/res/values-th/clock_colors.xml
deleted file mode 100644
index c63bdd1..0000000
--- a/res/values-th/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"แดง"</item>
- <item msgid="6882970855289978213">"ส้ม"</item>
- <item msgid="5560732545714984533">"เหลือง"</item>
- <item msgid="7246284817845434226">"เขียว"</item>
- <item msgid="6762906417604676001">"น้ำเงิน"</item>
- <item msgid="8974135109557664892">"น้ำเงินอมม่วง"</item>
- <item msgid="786643557830463422">"ม่วงอมน้ำเงิน"</item>
- <item msgid="6835537356703747621">"เทา"</item>
- <item msgid="2470141365136884119">"น้ำเงินอมเขียว"</item>
- </string-array>
-</resources>
diff --git a/res/values-tl/clock_colors.xml b/res/values-tl/clock_colors.xml
deleted file mode 100644
index 6c26409..0000000
--- a/res/values-tl/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"PULA"</item>
- <item msgid="6882970855289978213">"ORANGE"</item>
- <item msgid="5560732545714984533">"DILAW"</item>
- <item msgid="7246284817845434226">"BERDE"</item>
- <item msgid="6762906417604676001">"ASUL"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"VIOLET"</item>
- <item msgid="6835537356703747621">"GRAY"</item>
- <item msgid="2470141365136884119">"TEAL"</item>
- </string-array>
-</resources>
diff --git a/res/values-tr/clock_colors.xml b/res/values-tr/clock_colors.xml
deleted file mode 100644
index 45c8118..0000000
--- a/res/values-tr/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"KIRMIZI"</item>
- <item msgid="6882970855289978213">"TURUNCU"</item>
- <item msgid="5560732545714984533">"SARI"</item>
- <item msgid="7246284817845434226">"YEŞİL"</item>
- <item msgid="6762906417604676001">"MAVİ"</item>
- <item msgid="8974135109557664892">"ÇİVİT MAVİSİ"</item>
- <item msgid="786643557830463422">"MOR"</item>
- <item msgid="6835537356703747621">"GRİ"</item>
- <item msgid="2470141365136884119">"TURKUAZ"</item>
- </string-array>
-</resources>
diff --git a/res/values-uk/clock_colors.xml b/res/values-uk/clock_colors.xml
deleted file mode 100644
index aaa3b71..0000000
--- a/res/values-uk/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ЧЕРВОНИЙ"</item>
- <item msgid="6882970855289978213">"ОРАНЖЕВИЙ"</item>
- <item msgid="5560732545714984533">"ЖОВТИЙ"</item>
- <item msgid="7246284817845434226">"ЗЕЛЕНИЙ"</item>
- <item msgid="6762906417604676001">"СИНІЙ"</item>
- <item msgid="8974135109557664892">"ІНДИГО"</item>
- <item msgid="786643557830463422">"ФІОЛЕТОВИЙ"</item>
- <item msgid="6835537356703747621">"СІРИЙ"</item>
- <item msgid="2470141365136884119">"БІРЮЗОВИЙ"</item>
- </string-array>
-</resources>
diff --git a/res/values-ur/clock_colors.xml b/res/values-ur/clock_colors.xml
deleted file mode 100644
index 2203d92..0000000
--- a/res/values-ur/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"سرخ"</item>
- <item msgid="6882970855289978213">"نارنجی"</item>
- <item msgid="5560732545714984533">"زرد"</item>
- <item msgid="7246284817845434226">"سبز"</item>
- <item msgid="6762906417604676001">"نیلا"</item>
- <item msgid="8974135109557664892">"گہرا نیلا"</item>
- <item msgid="786643557830463422">"بیگنی"</item>
- <item msgid="6835537356703747621">"خاکستری"</item>
- <item msgid="2470141365136884119">"نیلگوں سبز"</item>
- </string-array>
-</resources>
diff --git a/res/values-uz/clock_colors.xml b/res/values-uz/clock_colors.xml
deleted file mode 100644
index 737d2bd..0000000
--- a/res/values-uz/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"QIZIL"</item>
- <item msgid="6882970855289978213">"TOʻQ SARIQ"</item>
- <item msgid="5560732545714984533">"SARIQ"</item>
- <item msgid="7246284817845434226">"YASHIL"</item>
- <item msgid="6762906417604676001">"KOʻK"</item>
- <item msgid="8974135109557664892">"INDIGO"</item>
- <item msgid="786643557830463422">"BINAFSHARANG"</item>
- <item msgid="6835537356703747621">"KULRANG"</item>
- <item msgid="2470141365136884119">"MOVIY"</item>
- </string-array>
-</resources>
diff --git a/res/values-vi/clock_colors.xml b/res/values-vi/clock_colors.xml
deleted file mode 100644
index 5ef97c5..0000000
--- a/res/values-vi/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"ĐỎ"</item>
- <item msgid="6882970855289978213">"CAM"</item>
- <item msgid="5560732545714984533">"VÀNG"</item>
- <item msgid="7246284817845434226">"XANH LỤC"</item>
- <item msgid="6762906417604676001">"XANH LAM"</item>
- <item msgid="8974135109557664892">"CHÀM"</item>
- <item msgid="786643557830463422">"TÍM"</item>
- <item msgid="6835537356703747621">"XÁM"</item>
- <item msgid="2470141365136884119">"XANH MÒNG KÉT"</item>
- </string-array>
-</resources>
diff --git a/res/values-zh-rCN/clock_colors.xml b/res/values-zh-rCN/clock_colors.xml
deleted file mode 100644
index e3c68c0..0000000
--- a/res/values-zh-rCN/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"红色"</item>
- <item msgid="6882970855289978213">"橙色"</item>
- <item msgid="5560732545714984533">"黄色"</item>
- <item msgid="7246284817845434226">"绿色"</item>
- <item msgid="6762906417604676001">"蓝色"</item>
- <item msgid="8974135109557664892">"靛蓝色"</item>
- <item msgid="786643557830463422">"紫罗兰色"</item>
- <item msgid="6835537356703747621">"灰色"</item>
- <item msgid="2470141365136884119">"蓝绿色"</item>
- </string-array>
-</resources>
diff --git a/res/values-zh-rHK/clock_colors.xml b/res/values-zh-rHK/clock_colors.xml
deleted file mode 100644
index 2861c3b..0000000
--- a/res/values-zh-rHK/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"紅色"</item>
- <item msgid="6882970855289978213">"橙色"</item>
- <item msgid="5560732545714984533">"黃色"</item>
- <item msgid="7246284817845434226">"綠色"</item>
- <item msgid="6762906417604676001">"藍色"</item>
- <item msgid="8974135109557664892">"靛藍色"</item>
- <item msgid="786643557830463422">"紫羅蘭色"</item>
- <item msgid="6835537356703747621">"灰色"</item>
- <item msgid="2470141365136884119">"藍綠色"</item>
- </string-array>
-</resources>
diff --git a/res/values-zh-rTW/clock_colors.xml b/res/values-zh-rTW/clock_colors.xml
deleted file mode 100644
index 596109b..0000000
--- a/res/values-zh-rTW/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"紅色"</item>
- <item msgid="6882970855289978213">"橘色"</item>
- <item msgid="5560732545714984533">"黃色"</item>
- <item msgid="7246284817845434226">"綠色"</item>
- <item msgid="6762906417604676001">"藍色"</item>
- <item msgid="8974135109557664892">"靛藍色"</item>
- <item msgid="786643557830463422">"紫羅蘭色"</item>
- <item msgid="6835537356703747621">"灰色"</item>
- <item msgid="2470141365136884119">"藍綠色"</item>
- </string-array>
-</resources>
diff --git a/res/values-zu/clock_colors.xml b/res/values-zu/clock_colors.xml
deleted file mode 100644
index f33ef25..0000000
--- a/res/values-zu/clock_colors.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2023 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string-array name="clock_color_ids">
- <item msgid="4948142733161826319">"OKUBOMVU"</item>
- <item msgid="6882970855289978213">"OKUWOLINTSHI"</item>
- <item msgid="5560732545714984533">"OKUPHUZI"</item>
- <item msgid="7246284817845434226">"OKULUHLAZA OKOTSHANI"</item>
- <item msgid="6762906417604676001">"OKULUHLAZA OKWESIBHAKABHAKA"</item>
- <item msgid="8974135109557664892">"OKU-INDIGO"</item>
- <item msgid="786643557830463422">"OKU-VIOLET"</item>
- <item msgid="6835537356703747621">"OKUMPUNGA"</item>
- <item msgid="2470141365136884119">"OKU-TEAL"</item>
- </string-array>
-</resources>
diff --git a/res/values/clock_colors.xml b/res/values/clock_colors.xml
index 1539a92..465f0a0 100644
--- a/res/values/clock_colors.xml
+++ b/res/values/clock_colors.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
<resources>
- <string-array name="clock_color_ids">
+ <string-array translatable="false" name="clock_color_ids">
+ <item>GRAY</item>
<item>RED</item>
<item>ORANGE</item>
<item>YELLOW</item>
@@ -23,10 +24,10 @@
<item>BLUE</item>
<item>INDIGO</item>
<item>VIOLET</item>
- <item>GRAY</item>
<item>TEAL</item>
</string-array>
<array name="clock_color_names">
+ <item>@string/clock_color_gray</item>
<item>@string/clock_color_red</item>
<item>@string/clock_color_orange</item>
<item>@string/clock_color_yellow</item>
@@ -34,10 +35,10 @@
<item>@string/clock_color_blue</item>
<item>@string/clock_color_indigo</item>
<item>@string/clock_color_violet</item>
- <item>@string/clock_color_gray</item>
<item>@string/clock_color_teal</item>
</array>
<array name="clock_colors">
+ <item>#B9B9B9</item>
<item>#FFA3A7</item>
<item>#F7AC69</item>
<item>#FFC951</item>
@@ -45,10 +46,10 @@
<item>#8EC8FF</item>
<item>#B9AAFF</item>
<item>#F6A2FF</item>
- <item>#B9B9B9</item>
<item>#40D9CF</item>
</array>
<array name="clock_color_tone_min">
+ <item>0</item>
<item>20</item>
<item>20</item>
<item>50</item>
@@ -56,10 +57,10 @@
<item>20</item>
<item>10</item>
<item>20</item>
- <item>0</item>
<item>20</item>
</array>
<array name="clock_color_tone_max">
+ <item>100</item>
<item>95</item>
<item>95</item>
<item>95</item>
@@ -67,7 +68,6 @@
<item>95</item>
<item>95</item>
<item>97</item>
- <item>100</item>
<item>99</item>
</array>
</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 01113c4..1f71bd6 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -412,14 +412,6 @@
<string name="keyguard_quick_affordance_none_selected">None</string>
<!--
- Title for a section in a list of sections in the settings app that allows the user to modify
- how notifications behave whilst the device is locked.
-
- [CHAR LIMIT=32].
- -->
- <string name="notifications_section_title">Notifications</string>
-
- <!--
Summary for a setting that lets the user toggle between showing or hiding notifications on their
device's lock screen. This one is shown when the user is allowing notifications to show on their
device's lock screen.
@@ -443,7 +435,7 @@
[CHAR LIMIT=32].
-->
- <string name="more_settings_section_title">More options</string>
+ <string name="more_settings_section_title">More lock screen options</string>
<!--
Summary for a setting that lets the user access additional settings related to lock screen
@@ -453,7 +445,7 @@
[CHAR LIMIT=64].
-->
- <string name="more_settings_section_description">Text on lock screen, Now Playing, and more</string>
+ <string name="more_settings_section_description">Privacy, Now Playing, and more</string>
<!--
Label for button that lets the user navigate to a full-screen experience of selecting
diff --git a/src/com/android/customization/model/clock/BaseClockManager.java b/src/com/android/customization/model/clock/BaseClockManager.java
deleted file mode 100644
index 3434780..0000000
--- a/src/com/android/customization/model/clock/BaseClockManager.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock;
-
-import com.android.customization.model.CustomizationManager;
-
-/**
- * {@link CustomizationManager} for clock faces.
- */
-public abstract class BaseClockManager implements CustomizationManager<Clockface> {
-
- private final ClockProvider mClockProvider;
-
- public BaseClockManager(ClockProvider provider) {
- mClockProvider = provider;
- }
-
- @Override
- public boolean isAvailable() {
- return mClockProvider.isAvailable();
- }
-
- @Override
- public void apply(Clockface option, Callback callback) {
- handleApply(option, callback);
- }
-
- @Override
- public void fetchOptions(OptionsFetchedListener<Clockface> callback, boolean reload) {
- mClockProvider.fetch(callback, false);
- }
-
- /** Returns the ID of the current clock face, which may be null for the default clock face. */
- String getCurrentClock() {
- return lookUpCurrentClock();
- }
-
- /**
- * Implement to apply the clock picked by the user for {@link BaseClockManager#apply}.
- *
- * @param option Clock option, containing ID of the clock, that the user picked.
- * @param callback Report success and failure.
- */
- protected abstract void handleApply(Clockface option, Callback callback);
-
- /**
- * Implement to look up the current clock face for {@link BaseClockManager#getCurrentClock()}.
- *
- * @return ID of current clock. Can be null for the default clock face.
- */
- protected abstract String lookUpCurrentClock();
-}
diff --git a/src/com/android/customization/model/clock/ClockManager.java b/src/com/android/customization/model/clock/ClockManager.java
deleted file mode 100644
index 4e77a49..0000000
--- a/src/com/android/customization/model/clock/ClockManager.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock;
-
-import android.content.ContentResolver;
-import android.provider.Settings.Secure;
-import android.text.TextUtils;
-
-import com.android.customization.module.ThemesUserEventLogger;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * {@link CustomizationManager} for clock faces that implements apply by writing to secure settings.
- */
-public class ClockManager extends BaseClockManager {
-
- // TODO: use constant from Settings.Secure
- static final String CLOCK_FACE_SETTING = "lock_screen_custom_clock_face";
- private static final String CLOCK_FIELD = "clock";
- private static final String TIMESTAMP_FIELD = "_applied_timestamp";
- private final ContentResolver mContentResolver;
- private final ThemesUserEventLogger mEventLogger;
-
- public ClockManager(ContentResolver resolver, ClockProvider provider,
- ThemesUserEventLogger logger) {
- super(provider);
- mContentResolver = resolver;
- mEventLogger = logger;
- }
-
- @Override
- protected void handleApply(Clockface option, Callback callback) {
- boolean stored;
- try {
- final JSONObject json = new JSONObject();
- json.put(CLOCK_FIELD, option.getId());
- json.put(TIMESTAMP_FIELD, System.currentTimeMillis());
- stored = Secure.putString(mContentResolver, CLOCK_FACE_SETTING, json.toString());
- } catch (JSONException ex) {
- stored = false;
- }
- if (stored) {
- mEventLogger.logClockApplied(option);
- callback.onSuccess();
- } else {
- callback.onError(null);
- }
- }
-
- @Override
- protected String lookUpCurrentClock() {
- final String value = Secure.getString(mContentResolver, CLOCK_FACE_SETTING);
- if (TextUtils.isEmpty(value)) {
- return value;
- }
- try {
- final JSONObject json = new JSONObject(value);
- return json.getString(CLOCK_FIELD);
- } catch (JSONException ex) {
- return value;
- }
- }
-}
diff --git a/src/com/android/customization/model/clock/ClockProvider.java b/src/com/android/customization/model/clock/ClockProvider.java
deleted file mode 100644
index d9a6779..0000000
--- a/src/com/android/customization/model/clock/ClockProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock;
-
-import com.android.customization.model.CustomizationManager.OptionsFetchedListener;
-
-/**
- * Interface for a class that can retrieve Themes from the system.
- */
-public interface ClockProvider {
- /**
- * Returns whether clockfaces are available in the current setup.
- */
- boolean isAvailable();
-
- /**
- * Retrieve the available clockfaces.
- * @param callback called when the clockfaces have been retrieved (or immediately if cached)
- * @param reload whether to reload clockfaces if they're cached.
- */
- void fetch(OptionsFetchedListener<Clockface> callback, boolean reload);
-}
diff --git a/src/com/android/customization/model/clock/Clockface.java b/src/com/android/customization/model/clock/Clockface.java
deleted file mode 100644
index 9bdcaef..0000000
--- a/src/com/android/customization/model/clock/Clockface.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock;
-
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.ImageView;
-
-import com.android.customization.model.CustomizationManager;
-import com.android.customization.model.CustomizationOption;
-import com.android.wallpaper.R;
-import com.android.wallpaper.asset.Asset;
-
-public class Clockface implements CustomizationOption<Clockface> {
-
- private final String mTitle;
- private final String mId;
- private final Asset mPreview;
- private final Asset mThumbnail;
-
- private Clockface(String title, String id, Asset preview, Asset thumbnail) {
- mTitle = title;
- mId = id;
- mPreview = preview;
- mThumbnail = thumbnail;
- }
-
- @Override
- public String getTitle() {
- return mTitle;
- }
-
- @Override
- public void bindThumbnailTile(View view) {
- ImageView thumbView = view.findViewById(R.id.clock_option_thumbnail);
- mThumbnail.loadDrawableWithTransition(thumbView.getContext(), thumbView, 50, null,
- thumbView.getResources().getColor(android.R.color.transparent, null));
- }
-
- @Override
- public boolean isActive(CustomizationManager<Clockface> manager) {
- String currentClock = ((BaseClockManager) manager).getCurrentClock();
- // Empty clock Id is the default system clock
- return (TextUtils.isEmpty(currentClock) && TextUtils.isEmpty(mId))
- || (mId != null && mId.equals(currentClock));
- }
-
- @Override
- public int getLayoutResId() {
- return R.layout.clock_option;
- }
-
- public Asset getPreviewAsset() {
- return mPreview;
- }
-
- public String getId() {
- return mId;
- }
-
- public static class Builder {
- private String mTitle;
- private String mId;
- private Asset mPreview;
- private Asset mThumbnail;
-
- public Clockface build() {
- return new Clockface(mTitle, mId, mPreview, mThumbnail);
- }
-
- public Builder setTitle(String title) {
- mTitle = title;
- return this;
- }
-
- public Builder setId(String id) {
- mId = id;
- return this;
- }
-
- public Builder setPreview(Asset preview) {
- mPreview = preview;
- return this;
- }
-
- public Builder setThumbnail(Asset thumbnail) {
- mThumbnail = thumbnail;
- return this;
- }
- }
-}
diff --git a/src/com/android/customization/model/clock/ContentProviderClockProvider.java b/src/com/android/customization/model/clock/ContentProviderClockProvider.java
deleted file mode 100644
index f0df031..0000000
--- a/src/com/android/customization/model/clock/ContentProviderClockProvider.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.android.customization.model.clock;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ProviderInfo;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.customization.model.CustomizationManager.OptionsFetchedListener;
-import com.android.customization.model.clock.Clockface.Builder;
-import com.android.wallpaper.R;
-import com.android.wallpaper.asset.ContentUriAsset;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class ContentProviderClockProvider implements ClockProvider {
-
- private static final String TAG = "ContentProviderClockProvider";
- private static final ExecutorService sExecutorService = Executors.newSingleThreadExecutor();
- private static final String LIST_OPTIONS = "list_options";
- private static final String COL_TITLE = "title";
- private static final String COL_ID = "id";
- private static final String COL_THUMBNAIL = "thumbnail";
- private static final String COL_PREVIEW = "preview";
-
- private final Context mContext;
- private final ProviderInfo mProviderInfo;
- private List<Clockface> mClocks;
- private boolean mClockContentAvailable;
-
- public ContentProviderClockProvider(Context context) {
- mContext = context;
- String providerAuthority = mContext.getString(R.string.clocks_provider_authority);
- // TODO: check permissions if needed
- mProviderInfo = TextUtils.isEmpty(providerAuthority) ? null
- : mContext.getPackageManager().resolveContentProvider(providerAuthority,
- PackageManager.MATCH_SYSTEM_ONLY);
-
- if (TextUtils.isEmpty(mContext.getString(R.string.clocks_stub_package))) {
- mClockContentAvailable = false;
- } else {
- try {
- ApplicationInfo applicationInfo = mContext.getPackageManager().getApplicationInfo(
- mContext.getString(R.string.clocks_stub_package),
- PackageManager.MATCH_SYSTEM_ONLY);
- mClockContentAvailable = applicationInfo != null;
- } catch (NameNotFoundException e) {
- mClockContentAvailable = false;
- }
- }
- }
-
- @Override
- public boolean isAvailable() {
- return mProviderInfo != null && mClockContentAvailable
- && (mClocks == null || !mClocks.isEmpty());
- }
-
- @Override
- public void fetch(OptionsFetchedListener<Clockface> callback, boolean reload) {
- if (!isAvailable()) {
- if (callback != null) {
- callback.onError(null);
- }
- return;
- }
- if (mClocks != null && !reload) {
- if (callback != null) {
- if (!mClocks.isEmpty()) {
- callback.onOptionsLoaded(mClocks);
- } else {
- callback.onError(null);
- }
- }
- return;
- }
- sExecutorService.submit(() -> {
- Uri optionsUri = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(mProviderInfo.authority)
- .appendPath(LIST_OPTIONS)
- .build();
-
- ContentResolver resolver = mContext.getContentResolver();
-
- List<Clockface> clockfaces = new ArrayList<>();
- try (Cursor c = resolver.query(optionsUri, null, null, null, null)) {
- while (c != null && c.moveToNext()) {
- String id = c.getString(c.getColumnIndex(COL_ID));
- String title = c.getString(c.getColumnIndex(COL_TITLE));
- String thumbnailUri = c.getString(c.getColumnIndex(COL_THUMBNAIL));
- String previewUri = c.getString(c.getColumnIndex(COL_PREVIEW));
- Uri thumbnail = Uri.parse(thumbnailUri);
- Uri preview = Uri.parse(previewUri);
-
- Clockface.Builder builder = new Builder();
- builder.setId(id).setTitle(title)
- .setThumbnail(new ContentUriAsset(mContext, thumbnail,
- RequestOptions.fitCenterTransform()))
- .setPreview(new ContentUriAsset(mContext, preview,
- RequestOptions.fitCenterTransform()));
- clockfaces.add(builder.build());
- }
- Glide.get(mContext).clearDiskCache();
- } catch (Exception e) {
- clockfaces = null;
- Log.e(TAG, "Failed to query clock face options.", e);
- }
- final List<Clockface> clockfaceList = clockfaces;
- new Handler(Looper.getMainLooper()).post(() -> {
- mClocks = clockfaceList;
- if (callback != null) {
- if (!mClocks.isEmpty()) {
- callback.onOptionsLoaded(mClocks);
- } else {
- callback.onError(null);
- }
- }
- });
- });
- }
-}
diff --git a/src/com/android/customization/model/clock/custom/ClockCustomManager.java b/src/com/android/customization/model/clock/custom/ClockCustomManager.java
deleted file mode 100644
index 0815a3e..0000000
--- a/src/com/android/customization/model/clock/custom/ClockCustomManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock.custom;
-
-import com.android.customization.model.CustomizationManager;
-
-import com.google.common.collect.Lists;
-
-/**
- * {@link CustomizationManager} for clock faces.
- */
-public class ClockCustomManager implements CustomizationManager<ClockOption> {
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public void apply(ClockOption option, Callback callback) {
- // TODO(/b241966062) execute applying the clock when user selects a clock
- }
-
- @Override
- public void fetchOptions(OptionsFetchedListener<ClockOption> callback, boolean reload) {
- // TODO(/b241966062) fetch the real clock metadata from the ClockRegistry
- callback.onOptionsLoaded(
- Lists.newArrayList(new ClockOption(), new ClockOption(), new ClockOption(),
- new ClockOption(), new ClockOption()));
- }
-}
diff --git a/src/com/android/customization/model/clock/custom/ClockOption.java b/src/com/android/customization/model/clock/custom/ClockOption.java
deleted file mode 100644
index 5a9f051..0000000
--- a/src/com/android/customization/model/clock/custom/ClockOption.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock.custom;
-
-import android.view.View;
-
-import com.android.customization.model.CustomizationManager;
-import com.android.customization.model.CustomizationOption;
-import com.android.wallpaper.R;
-
-/**
- * {@link CustomizationOption} for a clock face.
- */
-public class ClockOption implements CustomizationOption<ClockOption> {
-
- @Override
- public String getTitle() {
- // TODO(/b241966062) use the title from the clock metadata
- return "title";
- }
-
- @Override
- public void bindThumbnailTile(View view) {
- // TODO(/b241966062) bind the thumbnail
- }
-
- @Override
- public boolean isActive(CustomizationManager<ClockOption> manager) {
- return false;
- }
-
-
- @Override
- public int getLayoutResId() {
- return R.layout.clock_option;
- }
-}
diff --git a/src/com/android/customization/model/color/ColorCustomizationManager.java b/src/com/android/customization/model/color/ColorCustomizationManager.java
index 29f6ba6..790c86f 100644
--- a/src/com/android/customization/model/color/ColorCustomizationManager.java
+++ b/src/com/android/customization/model/color/ColorCustomizationManager.java
@@ -181,7 +181,23 @@
if (lockWallpaperColors != null && mLockWallpaperColors.equals(mHomeWallpaperColors)) {
lockWallpaperColors = null;
}
- mProvider.fetch(callback, reload, mHomeWallpaperColors, lockWallpaperColors);
+ mProvider.fetch(callback, reload, mHomeWallpaperColors,
+ lockWallpaperColors, /* shouldUseRevampedUi= */ false);
+ }
+
+ /**
+ * Fetch options function for the customization hub revamped UI
+ *
+ * TODO (b/276417460): refactor to reduce code repetition with the other fetch options function
+ */
+ public void fetchRevampedUIOptions(OptionsFetchedListener<ColorOption> callback,
+ boolean reload) {
+ WallpaperColors lockWallpaperColors = mLockWallpaperColors;
+ if (lockWallpaperColors != null && mLockWallpaperColors.equals(mHomeWallpaperColors)) {
+ lockWallpaperColors = null;
+ }
+ mProvider.fetch(callback, reload, mHomeWallpaperColors,
+ lockWallpaperColors, /* shouldUseRevampedUi= */ true);
}
/**
diff --git a/src/com/android/customization/model/color/ColorOptionsProvider.java b/src/com/android/customization/model/color/ColorOptionsProvider.java
index 2803c7b..166b4da 100644
--- a/src/com/android/customization/model/color/ColorOptionsProvider.java
+++ b/src/com/android/customization/model/color/ColorOptionsProvider.java
@@ -70,8 +70,12 @@
* @param homeWallpaperColors to get seed colors from
* @param lockWallpaperColors WallpaperColors from the lockscreen wallpaper to get seeds from,
* if different than homeWallpaperColors
+ * @param shouldUseRevampedUi fetches color options with new preview mappings for the revamped
+ * UI if set to true
*/
void fetch(OptionsFetchedListener<ColorOption> callback, boolean reload,
@Nullable WallpaperColors homeWallpaperColors,
- @Nullable WallpaperColors lockWallpaperColors);
+ @Nullable WallpaperColors lockWallpaperColors,
+ boolean shouldUseRevampedUi
+ );
}
diff --git a/src/com/android/customization/model/color/ColorProvider.kt b/src/com/android/customization/model/color/ColorProvider.kt
index f91ec6b..639a886 100644
--- a/src/com/android/customization/model/color/ColorProvider.kt
+++ b/src/com/android/customization/model/color/ColorProvider.kt
@@ -87,7 +87,8 @@
callback: OptionsFetchedListener<ColorOption>?,
reload: Boolean,
homeWallpaperColors: WallpaperColors?,
- lockWallpaperColors: WallpaperColors?
+ lockWallpaperColors: WallpaperColors?,
+ shouldUseRevampedUi: Boolean
) {
val wallpaperColorsChanged =
this.homeWallpaperColors != homeWallpaperColors ||
@@ -103,7 +104,11 @@
loadPreset()
}
if (wallpaperColorsChanged || reload) {
- loadSeedColors(homeWallpaperColors, lockWallpaperColors)
+ loadSeedColors(
+ homeWallpaperColors,
+ lockWallpaperColors,
+ shouldUseRevampedUi
+ )
}
} catch (e: Throwable) {
colorsAvailable = false
@@ -127,7 +132,8 @@
private fun loadSeedColors(
homeWallpaperColors: WallpaperColors?,
- lockWallpaperColors: WallpaperColors?
+ lockWallpaperColors: WallpaperColors?,
+ shouldUseRevampedUi: Boolean,
) {
if (homeWallpaperColors == null) return
@@ -147,7 +153,8 @@
colorsPerSource,
if (shouldLockColorsGoFirst) COLOR_SOURCE_LOCK else COLOR_SOURCE_HOME,
true,
- bundles
+ bundles,
+ shouldUseRevampedUi
)
// Second half of the colors
buildColorSeeds(
@@ -155,10 +162,18 @@
MAX_SEED_COLORS - bundles.size / styleSize,
if (shouldLockColorsGoFirst) COLOR_SOURCE_HOME else COLOR_SOURCE_LOCK,
false,
- bundles
+ bundles,
+ shouldUseRevampedUi
)
} else {
- buildColorSeeds(homeWallpaperColors, colorsPerSource, COLOR_SOURCE_HOME, true, bundles)
+ buildColorSeeds(
+ homeWallpaperColors,
+ colorsPerSource,
+ COLOR_SOURCE_HOME,
+ true,
+ bundles,
+ shouldUseRevampedUi
+ )
}
bundles.addAll(colorBundles?.filterNot { it is ColorSeedOption } ?: emptyList())
@@ -170,13 +185,14 @@
maxColors: Int,
source: String,
containsDefault: Boolean,
- bundles: MutableList<ColorOption>
+ bundles: MutableList<ColorOption>,
+ shouldUseRevampedUi: Boolean,
) {
val seedColors = ColorScheme.getSeedColors(wallpaperColors)
val defaultSeed = seedColors.first()
- buildBundle(defaultSeed, 0, containsDefault, source, bundles)
+ buildBundle(defaultSeed, 0, containsDefault, source, bundles, shouldUseRevampedUi)
for ((i, colorInt) in seedColors.drop(1).take(maxColors - 1).withIndex()) {
- buildBundle(colorInt, i + 1, false, source, bundles)
+ buildBundle(colorInt, i + 1, false, source, bundles, shouldUseRevampedUi)
}
}
@@ -185,7 +201,8 @@
i: Int,
isDefault: Boolean,
source: String,
- bundles: MutableList<ColorOption>
+ bundles: MutableList<ColorOption>,
+ shouldUseRevampedUi: Boolean,
) {
// TODO(b/202145216): Measure time cost in the loop.
for (style in styleList) {
@@ -193,8 +210,14 @@
val lightColorScheme = ColorScheme(colorInt, /* darkTheme= */ false, style)
val darkColorScheme = ColorScheme(colorInt, /* darkTheme= */ true, style)
builder
- .setLightColors(lightColorScheme.getLightColorPreview())
- .setDarkColors(darkColorScheme.getDarkColorPreview())
+ .setLightColors(
+ if (shouldUseRevampedUi) lightColorScheme.getRevampedUILightColorPreview()
+ else lightColorScheme.getLightColorPreview()
+ )
+ .setDarkColors(
+ if (shouldUseRevampedUi) darkColorScheme.getRevampedUIDarkColorPreview()
+ else darkColorScheme.getDarkColorPreview()
+ )
.addOverlayPackage(
OVERLAY_CATEGORY_SYSTEM_PALETTE,
if (isDefault) "" else toColorString(colorInt)
@@ -247,6 +270,30 @@
return getLightColorPreview()
}
+ @ColorInt
+ private fun ColorScheme.getRevampedUILightColorPreview(): IntArray {
+ return intArrayOf(
+ setAlphaComponent(this.accent1.s600, ALPHA_MASK),
+ setAlphaComponent(this.accent1.s600, ALPHA_MASK),
+ setAlphaComponent(this.accent2.s100, ALPHA_MASK),
+ ColorStateList.valueOf(this.accent3.s500).withLStar(59f).colors[0],
+ )
+ }
+
+ /**
+ * Returns the color for the dark theme version of the preview of a ColorScheme based on this
+ * order: |-------| | 0 | 1 | |---+---| | 2 | 3 | |-------|
+ */
+ @ColorInt
+ private fun ColorScheme.getRevampedUIDarkColorPreview(): IntArray {
+ return intArrayOf(
+ setAlphaComponent(this.accent1.s200, ALPHA_MASK),
+ setAlphaComponent(this.accent1.s200, ALPHA_MASK),
+ setAlphaComponent(this.accent2.s700, ALPHA_MASK),
+ setAlphaComponent(this.accent3.s100, ALPHA_MASK),
+ )
+ }
+
private fun ColorScheme.getPresetColorPreview(seed: Int): IntArray {
return when (this.style) {
Style.FRUIT_SALAD -> intArrayOf(seed, this.accent1.s100)
diff --git a/src/com/android/customization/model/color/ColorSeedOption.java b/src/com/android/customization/model/color/ColorSeedOption.java
index ba61ed1..ed38049 100644
--- a/src/com/android/customization/model/color/ColorSeedOption.java
+++ b/src/com/android/customization/model/color/ColorSeedOption.java
@@ -100,6 +100,7 @@
/**
* Returns the colors to be applied corresponding with the current
* configuration's UI mode.
+ * @param res resources to read to the UI mode configuration from
* @return one of {@link #lightColors} or {@link #darkColors}
*/
@ColorInt
@@ -108,6 +109,17 @@
== Configuration.UI_MODE_NIGHT_YES;
return night ? darkColors : lightColors;
}
+
+ /**
+ * Returns the preview colors based on whether dark theme or light theme colors are
+ * requested.
+ * @param darkTheme if true, returns dark theme colors, otherwise returns light theme colors
+ * @return one of {@link #lightColors} or {@link #darkColors}
+ */
+ @ColorInt
+ public int[] resolveColors(boolean darkTheme) {
+ return darkTheme ? darkColors : lightColors;
+ }
}
/**
diff --git a/src/com/android/customization/module/StatsLogUserEventLogger.java b/src/com/android/customization/module/StatsLogUserEventLogger.java
index 9645454..32e0599 100644
--- a/src/com/android/customization/module/StatsLogUserEventLogger.java
+++ b/src/com/android/customization/module/StatsLogUserEventLogger.java
@@ -44,7 +44,6 @@
import androidx.annotation.Nullable;
-import com.android.customization.model.clock.Clockface;
import com.android.customization.model.color.ColorOption;
import com.android.customization.model.grid.GridOption;
import com.android.customization.model.theme.ThemeBundle;
@@ -237,22 +236,6 @@
}
@Override
- public void logClockSelected(Clockface clock) {
- new SysUiStatsLogger()
- .setAction(StyleEnums.PICKER_SELECT)
- .setClockPackageHash(Objects.hashCode(clock.getId()))
- .log();
- }
-
- @Override
- public void logClockApplied(Clockface clock) {
- new SysUiStatsLogger()
- .setAction(StyleEnums.PICKER_APPLIED)
- .setClockPackageHash(Objects.hashCode(clock.getId()))
- .log();
- }
-
- @Override
public void logGridSelected(GridOption grid) {
new SysUiStatsLogger()
.setAction(StyleEnums.PICKER_SELECT)
diff --git a/src/com/android/customization/module/ThemesUserEventLogger.java b/src/com/android/customization/module/ThemesUserEventLogger.java
index 3e5bb54..b1a87b9 100644
--- a/src/com/android/customization/module/ThemesUserEventLogger.java
+++ b/src/com/android/customization/module/ThemesUserEventLogger.java
@@ -15,7 +15,6 @@
*/
package com.android.customization.module;
-import com.android.customization.model.clock.Clockface;
import com.android.customization.model.color.ColorOption;
import com.android.customization.model.grid.GridOption;
import com.android.customization.model.theme.ThemeBundle;
@@ -38,10 +37,6 @@
*/
void logColorApplied(int action, ColorOption colorOption);
- void logClockSelected(Clockface clock);
-
- void logClockApplied(Clockface clock);
-
void logGridSelected(GridOption grid);
void logGridApplied(GridOption grid);
diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
index 30eac55..8d5924e 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockCarouselViewBinder.kt
@@ -59,6 +59,12 @@
}
launch {
+ viewModel.allClockIds.collect {
+ it.forEach { clockId -> clockViewFactory.updateTimeFormat(clockId) }
+ }
+ }
+
+ launch {
viewModel.selectedIndex.collect { selectedIndex ->
carouselView.setSelectedClockIndex(selectedIndex)
}
diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
index 7de45e9..4664bd0 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
@@ -15,6 +15,7 @@
*/
package com.android.customization.picker.clock.ui.binder
+import android.content.res.Configuration
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
@@ -67,7 +68,10 @@
lifecycleOwner = lifecycleOwner,
bindIcon = { foregroundView: View, colorIcon: ColorOptionIconViewModel ->
val viewGroup = foregroundView as? ViewGroup
- viewGroup?.let { ColorOptionIconBinder.bind(viewGroup, colorIcon) }
+ val night =
+ (view.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
+ Configuration.UI_MODE_NIGHT_YES)
+ viewGroup?.let { ColorOptionIconBinder.bind(viewGroup, colorIcon, night) }
}
)
colorOptionContainerView.adapter = colorOptionAdapter
diff --git a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
index 1a58d7a..cf154d5 100644
--- a/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ClockViewFactory.kt
@@ -60,6 +60,12 @@
.onSeedColorChanged(seedColor)
}
+ fun updateTimeFormat(clockId: String) {
+ getController(clockId)
+ .events
+ .onTimeFormatChanged(android.text.format.DateFormat.is24HourFormat(activity))
+ }
+
fun registerTimeTicker(owner: LifecycleOwner) {
registerTimeTicker(owner, null)
}
diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt
index ea60ae3..9d622da 100644
--- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt
+++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockColorViewModel.kt
@@ -35,8 +35,8 @@
}
companion object {
- const val DEFAULT_COLOR_TONE_MIN = 0
- const val DEFAULT_COLOR_TONE_MAX = 100
+ private const val DEFAULT_COLOR_TONE_MIN = 0
+ private const val DEFAULT_COLOR_TONE_MAX = 100
fun getPresetColorMap(resources: Resources): Map<String, ClockColorViewModel> {
val ids = resources.getStringArray(R.array.clock_color_ids)
diff --git a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
index b66f977..a0ac370 100644
--- a/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
+++ b/src/com/android/customization/picker/clock/ui/viewmodel/ClockSettingsViewModel.kt
@@ -145,10 +145,14 @@
key = MutableStateFlow(colorModel.colorId) as StateFlow<String>,
payload =
ColorOptionIconViewModel(
- colorModel.color,
- colorModel.color,
- colorModel.color,
- colorModel.color,
+ lightThemeColor0 = colorModel.color,
+ lightThemeColor1 = colorModel.color,
+ lightThemeColor2 = colorModel.color,
+ lightThemeColor3 = colorModel.color,
+ darkThemeColor0 = colorModel.color,
+ darkThemeColor1 = colorModel.color,
+ darkThemeColor2 = colorModel.color,
+ darkThemeColor3 = colorModel.color,
),
text =
Text.Loaded(
@@ -200,8 +204,26 @@
val optionItemPayload =
when (colorOption) {
is ColorSeedOption -> {
- val colors = colorOption.previewInfo.resolveColors(context.resources)
- ColorOptionIconViewModel(colors[0], colors[1], colors[2], colors[3])
+ val lightThemeColors =
+ colorOption.previewInfo.resolveColors(
+ /** darkTheme= */
+ false
+ )
+ val darkThemeColors =
+ colorOption.previewInfo.resolveColors(
+ /** darkTheme= */
+ true
+ )
+ ColorOptionIconViewModel(
+ lightThemeColor0 = lightThemeColors[0],
+ lightThemeColor1 = lightThemeColors[1],
+ lightThemeColor2 = lightThemeColors[2],
+ lightThemeColor3 = lightThemeColors[3],
+ darkThemeColor0 = darkThemeColors[0],
+ darkThemeColor1 = darkThemeColors[1],
+ darkThemeColor2 = darkThemeColors[2],
+ darkThemeColor3 = darkThemeColors[3],
+ )
}
is ColorBundle -> {
val primaryColor =
@@ -209,10 +231,14 @@
val secondaryColor =
colorOption.previewInfo.resolveSecondaryColor(context.resources)
ColorOptionIconViewModel(
- primaryColor,
- secondaryColor,
- primaryColor,
- secondaryColor
+ lightThemeColor0 = primaryColor,
+ lightThemeColor1 = secondaryColor,
+ lightThemeColor2 = primaryColor,
+ lightThemeColor3 = secondaryColor,
+ darkThemeColor0 = primaryColor,
+ darkThemeColor1 = secondaryColor,
+ darkThemeColor2 = primaryColor,
+ darkThemeColor3 = secondaryColor,
)
}
else -> null
diff --git a/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt b/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
index 512a500..a044174 100644
--- a/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
@@ -52,7 +52,7 @@
.map { (homeColors, lockColors) ->
suspendCancellableCoroutine { continuation ->
colorManager.setWallpaperColors(homeColors, lockColors)
- colorManager.fetchOptions(
+ colorManager.fetchRevampedUIOptions(
object : CustomizationManager.OptionsFetchedListener<ColorOption?> {
override fun onOptionsLoaded(options: MutableList<ColorOption?>?) {
val wallpaperColorOptions: MutableList<ColorOptionModel> =
diff --git a/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder.kt
index 1478cc4..d238180 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorOptionIconBinder.kt
@@ -28,14 +28,30 @@
fun bind(
view: ViewGroup,
viewModel: ColorOptionIconViewModel,
+ darkTheme: Boolean,
) {
val color0View: ImageView = view.requireViewById(R.id.color_preview_0)
val color1View: ImageView = view.requireViewById(R.id.color_preview_1)
val color2View: ImageView = view.requireViewById(R.id.color_preview_2)
val color3View: ImageView = view.requireViewById(R.id.color_preview_3)
- color0View.drawable.colorFilter = BlendModeColorFilter(viewModel.color0, BlendMode.SRC)
- color1View.drawable.colorFilter = BlendModeColorFilter(viewModel.color1, BlendMode.SRC)
- color2View.drawable.colorFilter = BlendModeColorFilter(viewModel.color2, BlendMode.SRC)
- color3View.drawable.colorFilter = BlendModeColorFilter(viewModel.color3, BlendMode.SRC)
+ if (darkTheme) {
+ color0View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.darkThemeColor0, BlendMode.SRC)
+ color1View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.darkThemeColor1, BlendMode.SRC)
+ color2View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.darkThemeColor2, BlendMode.SRC)
+ color3View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.darkThemeColor3, BlendMode.SRC)
+ } else {
+ color0View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.lightThemeColor0, BlendMode.SRC)
+ color1View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.lightThemeColor1, BlendMode.SRC)
+ color2View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.lightThemeColor2, BlendMode.SRC)
+ color3View.drawable.colorFilter =
+ BlendModeColorFilter(viewModel.lightThemeColor3, BlendMode.SRC)
+ }
}
}
diff --git a/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt
index 7623048..452e8b6 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorPickerBinder.kt
@@ -17,6 +17,7 @@
package com.android.customization.picker.color.ui.binder
+import android.content.res.Configuration
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
@@ -32,7 +33,6 @@
import com.android.customization.picker.common.ui.view.ItemSpacing
import com.android.wallpaper.R
import com.android.wallpaper.picker.option.ui.adapter.OptionItemAdapter
-import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
@@ -64,7 +64,10 @@
lifecycleOwner = lifecycleOwner,
bindIcon = { foregroundView: View, colorIcon: ColorOptionIconViewModel ->
val viewGroup = foregroundView as? ViewGroup
- viewGroup?.let { ColorOptionIconBinder.bind(viewGroup, colorIcon) }
+ val night =
+ (view.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
+ Configuration.UI_MODE_NIGHT_YES)
+ viewGroup?.let { ColorOptionIconBinder.bind(viewGroup, colorIcon, night) }
}
)
colorOptionContainerView.adapter = colorOptionAdapter
diff --git a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
index 05b0916..10013e6 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
@@ -17,6 +17,7 @@
package com.android.customization.picker.color.ui.binder
+import android.content.res.Configuration
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -91,10 +92,15 @@
})
.let { if (it < 0) 0 else it }
options.subList(0, colorOptionSlotSize).forEach { item ->
+ val night =
+ (view.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK ==
+ Configuration.UI_MODE_NIGHT_YES)
val itemView =
LayoutInflater.from(view.context)
.inflate(R.layout.color_option_no_background, view, false)
- item.payload?.let { ColorOptionIconBinder.bind(itemView as ViewGroup, item.payload) }
+ item.payload?.let {
+ ColorOptionIconBinder.bind(itemView as ViewGroup, item.payload, night)
+ }
val optionSelectedView = itemView.findViewById<ImageView>(R.id.option_selected)
lifecycleOwner.lifecycleScope.launch {
diff --git a/src/com/android/customization/picker/color/ui/viewmodel/ColorOptionIconViewModel.kt b/src/com/android/customization/picker/color/ui/viewmodel/ColorOptionIconViewModel.kt
index d32538d..8723c8c 100644
--- a/src/com/android/customization/picker/color/ui/viewmodel/ColorOptionIconViewModel.kt
+++ b/src/com/android/customization/picker/color/ui/viewmodel/ColorOptionIconViewModel.kt
@@ -20,8 +20,12 @@
import android.annotation.ColorInt
data class ColorOptionIconViewModel(
- @ColorInt val color0: Int,
- @ColorInt val color1: Int,
- @ColorInt val color2: Int,
- @ColorInt val color3: Int,
+ @ColorInt val lightThemeColor0: Int,
+ @ColorInt val lightThemeColor1: Int,
+ @ColorInt val lightThemeColor2: Int,
+ @ColorInt val lightThemeColor3: Int,
+ @ColorInt val darkThemeColor0: Int,
+ @ColorInt val darkThemeColor1: Int,
+ @ColorInt val darkThemeColor2: Int,
+ @ColorInt val darkThemeColor3: Int,
)
diff --git a/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt b/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt
index 73c1ac6..97dbba6 100644
--- a/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt
+++ b/src/com/android/customization/picker/color/ui/viewmodel/ColorPickerViewModel.kt
@@ -101,8 +101,14 @@
colorOptionEntry.value.map { colorOptionModel ->
val colorSeedOption: ColorSeedOption =
colorOptionModel.colorOption as ColorSeedOption
- val colors =
- colorSeedOption.previewInfo.resolveColors(context.resources)
+ val lightThemeColors =
+ colorSeedOption.previewInfo.resolveColors(
+ /* darkTheme= */ false
+ )
+ val darkThemeColors =
+ colorSeedOption.previewInfo.resolveColors(
+ /* darkTheme= */ true
+ )
val isSelectedFlow: StateFlow<Boolean> =
interactor.activeColorOption
.map {
@@ -118,10 +124,14 @@
as StateFlow<String>,
payload =
ColorOptionIconViewModel(
- colors[0],
- colors[1],
- colors[2],
- colors[3]
+ lightThemeColor0 = lightThemeColors[0],
+ lightThemeColor1 = lightThemeColors[1],
+ lightThemeColor2 = lightThemeColors[2],
+ lightThemeColor3 = lightThemeColors[3],
+ darkThemeColor0 = darkThemeColors[0],
+ darkThemeColor1 = darkThemeColors[1],
+ darkThemeColor2 = darkThemeColors[2],
+ darkThemeColor3 = darkThemeColors[3],
),
text =
Text.Loaded(
@@ -173,10 +183,14 @@
as StateFlow<String>,
payload =
ColorOptionIconViewModel(
- primaryColor,
- secondaryColor,
- primaryColor,
- secondaryColor
+ lightThemeColor0 = primaryColor,
+ lightThemeColor1 = secondaryColor,
+ lightThemeColor2 = primaryColor,
+ lightThemeColor3 = secondaryColor,
+ darkThemeColor0 = primaryColor,
+ darkThemeColor1 = secondaryColor,
+ darkThemeColor2 = primaryColor,
+ darkThemeColor3 = secondaryColor,
),
text =
Text.Loaded(
diff --git a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt
index 54f9bf6..edd469f 100644
--- a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt
+++ b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt
@@ -47,7 +47,7 @@
lifecycleOwner.lifecycleScope.launch {
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
launch {
- viewModel.subtitleStringResourceId.collect {
+ viewModel.titleStringResourceId.collect {
subtitle.text = view.context.getString(it)
}
}
diff --git a/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModel.kt b/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModel.kt
index 97b0448..58a84a4 100644
--- a/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModel.kt
+++ b/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModel.kt
@@ -35,9 +35,9 @@
private val interactor: NotificationsInteractor,
) : ViewModel() {
- /** A string resource ID for the subtitle. */
+ /** A string resource ID for the title. */
@StringRes
- val subtitleStringResourceId: Flow<Int> =
+ val titleStringResourceId: Flow<Int> =
interactor.settings.map { model ->
when (model.isShowNotificationsOnLockScreenEnabled) {
true -> R.string.show_notifications_on_lock_screen
diff --git a/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java b/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java
deleted file mode 100644
index 2b80bde..0000000
--- a/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock;
-
-import static junit.framework.TestCase.assertTrue;
-import static junit.framework.TestCase.fail;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import androidx.annotation.Nullable;
-
-import com.android.customization.model.CustomizationManager.Callback;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class BaseClockManagerTest {
-
- private static final String CURRENT_CLOCK = "current_clock";
-
- @Mock ClockProvider mProvider;
- private TestClockManager mManager;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mManager = new TestClockManager(mProvider);
- }
-
- @Test
- public void testIsAvailable() {
- // GIVEN that the ClockProvider is available
- when(mProvider.isAvailable()).thenReturn(true);
- // THEN the BaseClockManager is true
- assertTrue(mManager.isAvailable());
- }
-
- @Test
- public void testApply() {
- final String id = "id";
- Clockface clock = new Clockface.Builder().setId(id).build();
-
- mManager.apply(clock, new Callback() {
- @Override
- public void onSuccess() {
- //Nothing to do here, the test passed
- }
- @Override
- public void onError(@Nullable Throwable throwable) {
- fail("onError was called when grid had been applied successfully");
- }
- });
-
- assertEquals(id, mManager.getClockId());
- }
-
- @Test
- public void testFetch() {
- mManager.fetchOptions(null, false);
- verify(mProvider).fetch(eq(null), anyBoolean());
- }
-
- /**
- * Testable BaseClockManager that provides basic implementations of abstract methods.
- */
- private static final class TestClockManager extends BaseClockManager {
-
- private String mClockId;
-
- TestClockManager(ClockProvider provider) {
- super(provider);
- }
-
- String getClockId() {
- return mClockId;
- }
-
- @Override
- protected void handleApply(Clockface option, Callback callback) {
- mClockId = option.getId();
- callback.onSuccess();
- }
-
- @Override
- protected String lookUpCurrentClock() {
- return CURRENT_CLOCK;
- }
- }
-}
diff --git a/tests/robotests/src/com/android/customization/model/clock/ClockManagerTest.java b/tests/robotests/src/com/android/customization/model/clock/ClockManagerTest.java
deleted file mode 100644
index 574548a..0000000
--- a/tests/robotests/src/com/android/customization/model/clock/ClockManagerTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.customization.model.clock;
-
-import static junit.framework.TestCase.fail;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.verify;
-
-import android.content.ContentResolver;
-import android.provider.Settings.Secure;
-
-import androidx.annotation.Nullable;
-
-import com.android.customization.model.CustomizationManager.Callback;
-import com.android.customization.module.ThemesUserEventLogger;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class ClockManagerTest {
-
- private static final String CLOCK_ID = "id";
- private static final String CLOCK_FIELD = "clock";
- private static final String CLOCK_FACE_SETTING = "fake_clock_face_setting";
-
- @Mock ClockProvider mProvider;
- @Mock ThemesUserEventLogger mLogger;
- private ContentResolver mContentResolver;
- private ClockManager mManager;
- @Mock private Clockface mMockClockface;
- @Mock private Callback mMockCallback;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContentResolver = RuntimeEnvironment.application.getContentResolver();
- mManager = new ClockManager(mContentResolver, mProvider, mLogger);
- }
-
- @Test
- public void testApply() throws JSONException {
- Clockface clock = new Clockface.Builder().setId(CLOCK_ID).build();
-
- mManager.apply(clock, new Callback() {
- @Override
- public void onSuccess() {
- //Nothing to do here, the test passed
- }
-
- @Override
- public void onError(@Nullable Throwable throwable) {
- fail("onError was called when grid had been applied successfully");
- }
- });
-
- // THEN the clock id is written to secure settings.
- JSONObject json =
- new JSONObject(Secure.getString(mContentResolver, ClockManager.CLOCK_FACE_SETTING));
- assertEquals(CLOCK_ID, json.getString(CLOCK_FIELD));
- // AND the event is logged
- verify(mLogger).logClockApplied(clock);
- }
-
- @Test
- public void testApply_whenJSONExceptionOccurs_callsOnError() {
- doAnswer((invocation) -> {
- throw new JSONException("Fake Test Excepton");
- }).when(mMockClockface).getId();
-
- mManager.apply(mMockClockface, mMockCallback);
-
- verify(mMockCallback).onError(null);
- }
-
- @Test
- public void testGetCurrentClock_returnsClockId() throws JSONException {
- // Secure settings contains a clock id
- JSONObject json = new JSONObject().put(CLOCK_FIELD, CLOCK_ID);
- Secure.putString(mContentResolver, ClockManager.CLOCK_FACE_SETTING, json.toString());
-
- // The current clock is that id
- assertEquals(CLOCK_ID, mManager.getCurrentClock());
- }
-
- @Test
- public void testGetCurrentClock_whenJSONExceptionOccurs_returnsClockFaceSetting() {
- // Secure settings contains a clock face setting with invalid format to cause JSONException.
- Secure.putString(mContentResolver, ClockManager.CLOCK_FACE_SETTING, CLOCK_FACE_SETTING);
-
- // The current clock is the clock face setting which is saved in secure settings.
- assertEquals(CLOCK_FACE_SETTING, mManager.getCurrentClock());
- }
-
- @Test
- public void testGetCurrentClock_withNullIdInSecureSettings_returnsNullId() {
- // Secure settings contains a null clock id
- Secure.putString(mContentResolver, ClockManager.CLOCK_FACE_SETTING, /* value= */ null);
-
- // The current clock is null
- assertEquals(null, mManager.getCurrentClock());
- }
-
- @Test
- public void testGetCurrentClock_withEmptyIdInSecureSettings_returnsEmptyId() {
- // Secure settings contains an empty clock id
- Secure.putString(mContentResolver, ClockManager.CLOCK_FACE_SETTING, /* value= */ "");
-
- // The current clock is empty
- assertEquals("", mManager.getCurrentClock());
- }
-}
diff --git a/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSectionViewModelTest.kt b/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSectionViewModelTest.kt
index 61976ad..573777d 100644
--- a/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSectionViewModelTest.kt
+++ b/tests/src/com/android/customization/picker/clock/ui/viewmodel/ClockSectionViewModelTest.kt
@@ -65,18 +65,18 @@
@Test
fun setSelectedClock() = runTest {
- val colorRed = clockColorMap.values.first()
+ val colorGrey = clockColorMap.values.first()
val observedSelectedClockColorAndSizeText =
collectLastValue(underTest.selectedClockColorAndSizeText)
interactor.setClockColor(
- colorRed.colorId,
+ colorGrey.colorId,
ClockMetadataModel.DEFAULT_COLOR_TONE_PROGRESS,
ClockSettingsViewModel.blendColorWithTone(
- colorRed.color,
- colorRed.getColorTone(ClockMetadataModel.DEFAULT_COLOR_TONE_PROGRESS),
+ colorGrey.color,
+ colorGrey.getColorTone(ClockMetadataModel.DEFAULT_COLOR_TONE_PROGRESS),
)
)
interactor.setClockSize(ClockSize.DYNAMIC)
- assertThat(observedSelectedClockColorAndSizeText()).isEqualTo("Red, dynamic")
+ assertThat(observedSelectedClockColorAndSizeText()).isEqualTo("Grey, dynamic")
}
}
diff --git a/tests/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModelTest.kt b/tests/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModelTest.kt
index 6442609..43ddea7 100644
--- a/tests/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModelTest.kt
+++ b/tests/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModelTest.kt
@@ -84,18 +84,18 @@
@Test
fun `toggles back and forth`() =
testScope.runTest {
- val subtitleStringResId = collectLastValue(underTest.subtitleStringResourceId)
+ val titleStringResId = collectLastValue(underTest.titleStringResourceId)
val isSwitchOn = collectLastValue(underTest.isSwitchOn)
- val initialSubtitleStringRes = subtitleStringResId()
+ val initialSubtitleStringRes = titleStringResId()
val initialIsSwitchOn = isSwitchOn()
underTest.onClicked()
- assertThat(subtitleStringResId()).isNotEqualTo(initialSubtitleStringRes)
+ assertThat(titleStringResId()).isNotEqualTo(initialSubtitleStringRes)
assertThat(isSwitchOn()).isNotEqualTo(initialIsSwitchOn)
underTest.onClicked()
- assertThat(subtitleStringResId()).isEqualTo(initialSubtitleStringRes)
+ assertThat(titleStringResId()).isEqualTo(initialSubtitleStringRes)
assertThat(isSwitchOn()).isEqualTo(initialIsSwitchOn)
}
}
diff --git a/tests/src/com/android/customization/testing/TestThemesUserEventLogger.java b/tests/src/com/android/customization/testing/TestThemesUserEventLogger.java
index 9250a86..2bb2082 100644
--- a/tests/src/com/android/customization/testing/TestThemesUserEventLogger.java
+++ b/tests/src/com/android/customization/testing/TestThemesUserEventLogger.java
@@ -1,6 +1,5 @@
package com.android.customization.testing;
-import com.android.customization.model.clock.Clockface;
import com.android.customization.model.color.ColorOption;
import com.android.customization.model.grid.GridOption;
import com.android.customization.model.theme.ThemeBundle;
@@ -28,16 +27,6 @@
}
@Override
- public void logClockSelected(Clockface clock) {
- // Do nothing.
- }
-
- @Override
- public void logClockApplied(Clockface clock) {
- // Do nothing.
- }
-
- @Override
public void logGridSelected(GridOption grid) {
// Do nothing.
}