commit 6fbc7d47a63bcd6e0d62662abe4ed970e9a41dd2
author Xin Li <delphij@google.com> Mon Dec 11 22:58:00 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 11 22:58:00 2023 +0000
tree 88c3e432e77ed925df1ebac177a4f0dd34ed9458
parent f415cda981a800592675b73b8896f35ccc771eae
parent 46d50460c68f1c1155189e650956a1a007a176f4

[automerger skipped] Merge Android 14 QPR1 am: 161cc53079 -s ours am: b3b9856e12 -s ours am: 46d50460c6 -s ours

am skip reason: Merged-In Icf67858b6ac45dfbc16d51d17a83d44b9a26d08a with SHA-1 fb4849041f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/2863560

Change-Id: I56bcc0ac1b7563d27124c4c989366a919e60362e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

res/values-ky/strings.xml

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 89cf318..d5c2f78 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -22,7 +22,7 @@
     <string name="accessibility_settings" msgid="1488998032020612740">"Атайын мүмкүнчүлүктөр"</string>
     <string name="physical_keyboard_title" msgid="3955072245281785000">"Аппараттык баскычтоп"</string>
     <string name="add_virtual_keyboard" msgid="542703692821933851">"Баскычтопторду башкаруу"</string>
-    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Жөндөөлөрдү сунуштоо"</string>
+    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Параметрлерди сунуштоо"</string>
     <string name="search_clear_history" msgid="6232116698940067519">"Таржымалды тазалоо"</string>
     <string name="search_no_results" msgid="6855095945475439835">"Бир да натыйжа жок"</string>
 </resources>

res/values-uk/strings.xml

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6793b3a..1184cf5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,7 +19,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applications_settings" msgid="3446736638853404682">"Про додаток"</string>
     <string name="accessibility_settings_classname" msgid="973410590374198997">"com.android.settings.accessibility.AccessibilitySettings"</string>
-    <string name="accessibility_settings" msgid="1488998032020612740">"Спеціальні можливості"</string>
+    <string name="accessibility_settings" msgid="1488998032020612740">"Доступність"</string>
     <string name="physical_keyboard_title" msgid="3955072245281785000">"Фізична клавіатура"</string>
     <string name="add_virtual_keyboard" msgid="542703692821933851">"Керувати клавіатурами"</string>
     <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Пропозиції налаштувань"</string>

src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java

diff --git a/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java b/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java
index d3e5c25..98d5f17 100644
--- a/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java
+++ b/src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java
@@ -24,7 +24,7 @@
 import android.util.Log;
 import android.util.TypedValue;
 
-import com.android.settings.intelligence.R;
+import androidx.preference.R;
 
 /**
  * Utility class to parse elements of XML preferences