commit fba6a29ea2b743ee7dbd077aeeeaef0a5c156d1e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 08 18:49:50 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 08 18:49:50 2023 +0000
tree ce77977004e61585cb1513b92a2bbb427713b3c2
parent 25eb3809f66b8b2383c72021a28260cdc40de91f
parent 28ad798b1f35b0625c6ca28f0e6c4ec024bbad59

Merge changes from topic "blackflash" into udc-qpr-dev

* changes:
  Reuse ClockViewFactory
  Cache affordances and selection picker side
  Use BaseFlags for quickAffordances

res/values-fa/strings.xml

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 34f4d4e..6954575 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -35,7 +35,7 @@
     <string name="clock_color_indigo" msgid="8910855386698452917">"نیلی"</string>
     <string name="clock_color_violet" msgid="3454503847169375826">"یاسی"</string>
     <string name="clock_color_gray" msgid="9221530636948859231">"خاکستری"</string>
-    <string name="clock_color_teal" msgid="7499223425741344251">"سبز دودی"</string>
+    <string name="clock_color_teal" msgid="7499223425741344251">"سبزآبی"</string>
     <string name="clock_size" msgid="5028923902364418263">"اندازه"</string>
     <string name="clock_size_dynamic" msgid="1023930312455061642">"پویا"</string>
     <string name="clock_size_dynamic_description" msgid="2776620745774561662">"اندازه ساعت نسبت به محتوای صفحه قفل تغییر می‌کند"</string>

res/values-uk/strings.xml

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fea58fa..c7f3dd4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="1647136562008520313">"Оформлення і стиль"</string>
+    <string name="app_name" msgid="1647136562008520313">"Оформлення й стиль"</string>
     <string name="theme_title" msgid="2144932106319405101">"Стиль"</string>
     <string name="clock_title" msgid="1974314575211361352">"Свій циферблат"</string>
     <string name="clock_description" msgid="3563839327378948">"Виберіть свій циферблат"</string>