summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-03-06 09:30:06 -0800
committerXin Li <delphij@google.com>2024-03-06 09:30:06 -0800
commitd49c89822666ee792b7bd49a953261498a305016 (patch)
tree88c3e432e77ed925df1ebac177a4f0dd34ed9458
parent161cc530793994ac56550e426fde881691935dd9 (diff)
parent3d8da95b8fe3e0e4b5b786b4e0d04f5cb1cc6956 (diff)
downloadSettingsIntelligence-d49c89822666ee792b7bd49a953261498a305016.tar.gz
Merge Android 14 QPR2 to AOSP mainHEADmastermain
Bug: 319669529 Merged-In: Icf0a411fd16a3c2ee95bcc1949b2d6dc489f0645 Change-Id: I46b483ca387a152eb40a4059978a98560e4a3043
-rw-r--r--res/values-ky/strings.xml2
-rw-r--r--res/values-uk/strings.xml2
-rw-r--r--src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java2
3 files changed, 3 insertions, 3 deletions
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>
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>
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.AttributeSet;
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