Merge "Add intent action to launch face enrollment" into sc-v2-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed05a83..7ed69e5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -129,7 +129,6 @@
<uses-library android:name="androidx.window.sidecar" android:required="false"/>
<!-- Settings -->
-
<activity android:name=".homepage.SettingsHomepageActivity"
android:label="@string/settings_label_launcher"
android:theme="@style/Theme.Settings.Home"
@@ -145,18 +144,15 @@
android:value="true" />
</activity>
- <activity android:name=".network.telephony.MobileNetworkActivity"
- android:label="@string/network_settings_title"
- android:exported="true"
- android:launchMode="singleTask">
- <intent-filter android:priority="1">
- <!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->
- <action android:name="android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN" />
- <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
- <action android:name="android.settings.DATA_ROAMING_SETTINGS" />
- <action android:name="android.settings.MMS_MESSAGE_SETTING" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
+ <activity android:name=".homepage.SliceDeepLinkHomepageActivity"
+ android:label="@string/settings_label_launcher"
+ android:theme="@style/Theme.Settings.Home"
+ android:taskAffinity=""
+ android:launchMode="singleTask"
+ android:exported="false"
+ android:configChanges="orientation|keyboard|keyboardHidden|screenSize|screenLayout">
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
</activity>
<!-- Alias for launcher activity only, as this belongs to each profile. -->
@@ -234,6 +230,20 @@
android:value="true" />
</activity>
+ <activity android:name=".network.telephony.MobileNetworkActivity"
+ android:label="@string/network_settings_title"
+ android:exported="true"
+ android:launchMode="singleTask">
+ <intent-filter android:priority="1">
+ <!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->
+ <action android:name="android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN" />
+ <action android:name="android.settings.NETWORK_OPERATOR_SETTINGS" />
+ <action android:name="android.settings.DATA_ROAMING_SETTINGS" />
+ <action android:name="android.settings.MMS_MESSAGE_SETTING" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity android:name=".Settings$MobileNetworkListActivity"
android:exported="true"
android:label="@string/network_settings_title">
@@ -2551,6 +2561,8 @@
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.fuelgauge.batterysaver.BatterySaverSettings" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_battery"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
@@ -2576,6 +2588,8 @@
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accounts.AccountSyncSettings" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_accounts"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
@@ -2590,6 +2604,8 @@
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accounts.ManagedProfileSettings" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_accounts"/>
</activity>
<activity
@@ -2610,6 +2626,8 @@
android:configChanges="orientation|keyboardHidden|screenSize">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accounts.ChooseAccountFragment" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_accounts"/>
</activity>
<activity android:name=".CryptKeeper"
@@ -2668,6 +2686,8 @@
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.security.CryptKeeperSettings" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_security"/>
</activity>
<activity
@@ -2685,6 +2705,8 @@
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.datausage.DataUsageSummary" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_network"/>
</activity>
<activity
android:name="Settings$MobileDataUsageListActivity"
@@ -2696,6 +2718,8 @@
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.datausage.DataUsageList" />
+ <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
+ android:value="@string/menu_key_network"/>
</activity>
<activity
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index da7fc30..62203f7 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -17,7 +17,6 @@
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
style="?attr/fingerprint_layout_theme"
android:layout_width="match_parent"
@@ -41,27 +40,5 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"/>
- <com.airbnb.lottie.LottieAnimationView
- android:id="@+id/illustration_lottie"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="centerInside"
- android:visibility="gone"
- app:lottie_imageAssetsFolder="images"
- app:lottie_autoPlay="true"
- app:lottie_loop="true"
- app:lottie_rawRes="@raw/fingerprint_edu_lottie"/>
-
- <com.airbnb.lottie.LottieAnimationView
- android:id="@+id/illustration_lottie_portrait"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="centerInside"
- android:visibility="gone"
- app:lottie_imageAssetsFolder="images"
- app:lottie_autoPlay="true"
- app:lottie_loop="true"
- app:lottie_rawRes="@raw/fingerprint_edu_lottie_portrait"/>
-
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>
diff --git a/res/raw/fingerprint_edu_lottie.json b/res/raw/fingerprint_edu_lottie.json
deleted file mode 100644
index e69de29..0000000
--- a/res/raw/fingerprint_edu_lottie.json
+++ /dev/null
diff --git a/res/raw/fingerprint_edu_lottie_portrait.json b/res/raw/fingerprint_edu_lottie_portrait.json
deleted file mode 100644
index e69de29..0000000
--- a/res/raw/fingerprint_edu_lottie_portrait.json
+++ /dev/null
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 452d27c..2e38716 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Skakel vliegtuigmodus af om UWB te gebruik"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kameratoegang"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofoontoegang"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Vir programme en dienste"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Vir programme en dienste. As hierdie instelling af is, kan mikrofoondata steeds gedeel word wanneer jy \'n noodnommer bel."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Speletjie-instellings"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Skakel Spelkontroleskerm-kortpad ensovoorts aan"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Vorige"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index b73acaf..ae35b13 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWBን ለመጠቀም የአውሮፕላን ሁነታን ያጥፉ"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"የካሜራ መዳረሻ"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"የማይክሮፎን መዳረሻ"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ለመተግበሪያዎች እና አገልግሎቶች"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ለመተግበሪያዎች እና አገልግሎቶች። ይህ ቅንብር ከጠፋ እርስዎ ወደ አንድ የአደጋ ጊዜ ቁጥር ሲደውሉ የማይክሮፎን ውሂብ አሁንም ሊጋራ ይችላል።"</string>
<string name="game_settings_title" msgid="1028178627743422090">"የጨዋታ ቅንብሮች"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"የጨዋታ ዳሽቦርድ አቋራጭን ያብሩ ወዘተ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"ቀዳሚ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f59cf31..5f2aebe 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -5920,10 +5920,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"يجب إيقاف وضع الطيران لاستخدام النطاق الواسع جدًا."</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"الوصول إلى الكاميرا"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"الوصول إلى الميكروفون"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"للتطبيقات والخدمات"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"للتطبيقات والخدمات إذا كان هذا الخيار غير مفعّل، ستستمر إمكانية مشاركة بيانات الميكروفون عند الاتصال برقم طوارئ."</string>
<string name="game_settings_title" msgid="1028178627743422090">"إعدادات الألعاب"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"تفعيل \"اختصار لوحة بيانات الألعاب\" إلخ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"السابق"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 65c3e8e..f5923ba 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ব্যৱহাৰ কৰিবলৈ এয়াৰপ্লেন ম’ডটো অফ কৰক"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"কেমেৰাৰ এক্সেছ"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"মাইক্ৰ’ফ’নৰ এক্সেছ"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"এপ্ আৰু সেৱাৰ বাবে"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"এপ্ আৰু সেৱাৰ বাবে। এই ছেটিংটো অফ হৈ থাকিলে, আপুনি কোনো জৰুৰীকালীন নম্বৰত কল কৰিলে মাইক্ৰ’ফ’নৰ ডেটা তথাপি শ্বেয়াৰ কৰা হ’ব পাৰে।"</string>
<string name="game_settings_title" msgid="1028178627743422090">"গে’ম ছেটিং"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"গে’ম ডেশ্বব’ৰ্ডৰ শ্বৰ্টকাট ইত্যাদি অন কৰক"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"পূৰ্বৱৰ্তী"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 940fba4..234a88b 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB istifadə etmək üçün təyyarə rejimini deaktiv edin"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kameraya giriş"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofona giriş"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Tətbiqlər və xidmətlər üçün"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Tətbiqlər və xidmətlər üçün. Bu ayar deaktivdirsə, fövqəladə hal nömrəsinə zəng etdiyiniz zaman mikrofon datası hələ də paylaşıla bilər."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Oyun ayarları"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Oyun Paneli qısayolunu aktiv edin və s."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Öncəki"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1f23704..b4e2255 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -5744,10 +5744,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Каб выкарыстоўваць UWB, выключыце рэжым палёту"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Доступ да камеры"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Доступ да мікрафона"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Для праграм і сэрвісаў"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Для праграм і сэрвісаў. Нават калі гэта налада выключана, даныя з мікрафона будуць абагульвацца падчас выкліку нумара экстраннай службы."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Налады гульні"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Уключэнне ярлыка гульнявой панэлі і г. д."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bffaf86..11d1f4a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -5566,10 +5566,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Изключете самолетния режим, за да използвате UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Достъп до камерата"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Достъп до микрофона"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"За приложения и услуги"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"За приложения и услуги. Ако тази настройка е изключена, данните от микрофона пак може да бъдат споделени, когато се обадите на номер за спешни случаи."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Настройки за игри"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Включване на прекия път в таблото за управление на играта и др."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3773bf4..21d1fcb 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"ইউডব্লুউবি ব্যবহার করতে \'বিমান মোড\' বন্ধ করুন"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"ক্যামেরার অ্যাক্সেস"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"মাইক্রোফোনের অ্যাক্সেস"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"অ্যাপ ও পরিষেবার জন্য"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"অ্যাপ ও পরিষেবার জন্য। এই সেটিং বন্ধ থাকলেও, মাইক্রোফোনের ডেটা শেয়ার করা যেতে পারে। আপনি কোনও জরুরি নম্বরে কল করলে এমন হতে পারে।"</string>
<string name="game_settings_title" msgid="1028178627743422090">"গেম সেটিংস"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"গেম ড্যাশবোর্ড শর্টকাট ইত্যাদি চালু করুন"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"আগের"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 9ef81ad..39d2c5e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -5654,7 +5654,7 @@
<string name="camera_toggle_title" msgid="8952668677727244992">"Pristup kameri"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Pristup mikrofonu"</string>
<string name="cam_toggle_description" msgid="9212762204005146404">"Za aplikacije i usluge"</string>
- <string name="mic_toggle_description" msgid="484139688645092237">"Za aplikacije i usluge. Ako je ta postavka isključena, podaci mikrofona i dalje se mogu dijeliti kad nazovete broj hitne službe."</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Za aplikacije i usluge. Ako je ova postavka isključena, podaci mikrofona se i dalje mogu dijeliti kada pozovete broj za hitne slučajeve."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Postavke igre"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Uključite prečicu za kontrolnu tablu igre, itd."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Nazad"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d4076cc..3dc1732 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Desactiva el mode d\'avió per utilitzar la banda ultraampla"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Accés a la càmera"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Accés al micròfon"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Per a aplicacions i serveis"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Per a aplicacions i serveis. Si aquesta opció de configuració està desactivada, és possible que les dades del micròfon es continuïn compartint quan truquis a un número d\'emergència."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Configuració de jocs"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Activa la drecera al tauler de joc, etc."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ca900fe..3d7ebd2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -5742,10 +5742,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Pokud chcete používat technologii UWB, vypněte režim Letadlo"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Přístup k fotoaparátu"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Přístup k mikrofonu"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Aplikace a služby"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Aplikace a služby. Pokud je toto nastavení vypnuté a zavoláte na číslo tísňového volání, mohou být nadále sdílena data z mikrofonu."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Nastavení her"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Zapnout zkratku Herního panelu atd."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Předchozí"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b02a41d..34da424 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Deaktiver flytilstand for at bruge UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kameraadgang"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofonadgang"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Apps og tjenester"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Apps og tjenester. Hvis denne indstilling er deaktiveret, deles mikrofondata muligvis stadig, når du ringer til et alarmnummer."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Spilindstillinger"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Aktivér genvejen til Spilpanel osv."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Forrige"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index bec5a39..c01f299 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -5567,10 +5567,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Flugmodus deaktivieren, um UWB zu verwenden"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kamerazugriff"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofonzugriff"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Für Apps und Dienste"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Für Apps und Dienste. Wenn diese Einstellung deaktiviert ist, können Mikrofondaten dennoch freigegeben werden, wenn du den Notruf wählst."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Spieleinstellungen"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"„Dashboard für Spiele“-Schaltfläche aktivieren usw."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Zurück"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4e3eaa3..cc8b57c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Απενεργοποιήστε τη λειτουργία πτήσης για να χρησιμοποιήσετε το UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Πρόσβαση κάμερας"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Πρόσβαση μικροφώνου"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Για εφαρμογές και υπηρεσίες"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Για εφαρμογές και υπηρεσίες. Εάν είναι απενεργοποιημένη αυτή η ρύθμιση, τα δεδομένα μικροφώνου ενδέχεται να κοινοποιούνται όταν καλείτε έναν αριθμό έκτακτης ανάγκης."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Ρυθμίσεις παιχνιδιών"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Ενεργοποίηση συντόμευσης Πίνακα ελέγχου παιχνιδιού κ.λπ."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Προηγούμενο"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index cd150c1..5a26d82 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Desactiva el modo avión para usar la banda ultraancha"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Acceso a la cámara"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Acceso al micrófono"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Para aplicaciones y servicios"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Para aplicaciones y servicios. Si este ajuste está desactivado, puede que los datos del micrófono se compartan cuando llames a un número de emergencia."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Ajustes de juego"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Activa el acceso directo al Panel de juego, etc."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index fa9b2e0..3d157b0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -5566,10 +5566,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Ülilairibaühenduse kasutamiseks lülitage lennukirežiim välja."</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Juurdepääs kaamerale"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Juurdepääs mikrofonile"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Rakenduste ja teenuste jaoks"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Rakenduste ja teenuste jaoks. Isegi kui see seade on välja lülitatud, võidakse mikrofoni andmeid siiski jagada hädaabinumbrile helistades."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Mängude seaded"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Mängu juhtpaneeli otsetee sisselülitamine jm"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Eelmine"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index a74b721..1c065dc 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Desaktibatu hegaldi modua banda ultrazabala erabiltzeko"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kamera atzitzeko baimena"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofonoa atzitzeko baimena"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Aplikazio eta zerbitzuetarako"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Aplikazio eta zerbitzuetarako. Ezarpena desaktibatuta badago, agian mikrofonotik lortutako datuak partekatu egingo dira larrialdietarako zenbaki batera deitzen duzunean."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Jokoen ezarpenak"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Aktibatu joko-paneleko lasterbidea, etab."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Aurrekoa"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 94075ed..d324107 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"برای استفاده از باند فوقوسیع، «حالت هواپیما» را خاموش کنید"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"دسترسی به دوربین"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"دسترسی میکروفون"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"برای برنامهها و سرویسها"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"برای برنامهها و سرویسها. اگر این تنظیم خاموش باشد، ممکن است وقتی با شماره تلفنی اضطراری تماس میگیرید دادههای میکروفون همچنان همرسانی شود."</string>
<string name="game_settings_title" msgid="1028178627743422090">"تنظیمات بازی"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"روشن کردن میانبر «داشبورد بازیها» و غیره"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"قبلی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8596b36..188ec63 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Laita lentokonetila pois päältä, jotta voit käyttää UWB:tä"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Pääsy kameraan"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Pääsy mikrofoniin"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Sovellukset ja palvelut"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Sovellukset ja palvelut. Vaikka asetus olisi poissa päältä, mikrofonidataa saatetaan silti jakaa, kun soitat hätänumeroon."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Peliasetukset"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Laita päälle esim. Pelipaneelin pikakuvake"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Edellinen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3fe29da..b91e2cb 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Désactivez le mode Avion pour utiliser la connectivité à bande ultralarge"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Accès à l\'appareil photo"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Accès au microphone"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Pour les applications et les services"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Pour les applications et les services. Si ce paramètre est désactivé, il est possible que les données du microphone soient partagées lorsque vous appelez un numéro d\'urgence."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Paramètres de jeu"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Activer le raccourci vers le tableau de bord de jeu, etc."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Précédent"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 11f25b7..5e6adec 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Desactiva o modo avión para utilizar a banda ultralarga"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Acceso á cámara"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Acceso ao micrófono"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Para aplicacións e servizos"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Para aplicacións e servizos. Aínda que esta opción de configuración se atope desactivada, poderán compartirse datos do micrófono se chamas a un número de emerxencias."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Configuración para xogos"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Activa o atallo ao panel de xogo etc."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Anterior"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8fd2cd0..1f01ca0 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWBનો ઉપયોગ કરવા માટે એરપ્લેન મોડ બંધ કરો"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"કૅમેરાનો ઍક્સેસ"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"માઇક્રોફોનનો ઍક્સેસ"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ઍપ અને સેવાઓ માટે"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ઍપ અને સેવાઓ માટે. આ સેટિંગ બંધ હોવા છતાં પણ, જ્યારે તમે ઇમર્જન્સી નંબર પર કૉલ કરો ત્યારે કદાચ માઇક્રોફોનનો ડેટા શેર કરવામાં આવી શકે."</string>
<string name="game_settings_title" msgid="1028178627743422090">"ગેમ સેટિંગ"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ગેમ ડૅશબોર્ડનો શૉર્ટકટ, વગેરે ચાલુ કરો"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"પાછળ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0ca05d0..491024b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"यूडब्ल्यूबी की सुविधा का इस्तेमाल करने के लिए, हवाई जहाज़ मोड बंद करें"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"कैमरे का ऐक्सेस"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"माइक्रोफ़ोन का ऐक्सेस"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ऐप्लिकेशन और सेवाओं के लिए"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ऐप्लिकेशन और सेवाओं के लिए. इस सेटिंग के बंद होने पर भी, माइक्रोफ़ोन डेटा को शेयर किया जा सकता है. ऐसा तब होता है, जब किसी आपातकालीन नंबर पर कॉल किया जाता है."</string>
<string name="game_settings_title" msgid="1028178627743422090">"गेम की सेटिंग"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"गेम डैशबोर्ड का शॉर्टकट और दूसरी सुविधाएं चालू करें"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"पीछे जाएं"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 5b39bf9..a9facf3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Անջատել ավիառեժիմը՝ UWB-ն օգտագործելու համար"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Տեսախցիկն օգտագործելու թույլտվություն"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Խոսափողն օգտագործելու թույլտվություն"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Հավելվածների և ծառայությունների համար"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Հավելվածների և ծառայությունների համար։ Եթե այս կարգավորումն անջատված է, տվյալները կարող են դեռ փոխանցվել, երբ զանգեք արտակարգ իրավիճակների որևէ հեռախոսահամարի։"</string>
<string name="game_settings_title" msgid="1028178627743422090">"Խաղերի կարգավորումներ"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Խաղային վահանակի դյուրանցման և այլ գործառույթների ակտիվացում"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Հետ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 69bbbb8..cd36727 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Nonaktifkan mode pesawat untuk menggunakan UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Akses kamera"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Akses mikrofon"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Untuk aplikasi dan layanan"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Untuk aplikasi dan layanan. Jika setelan ini nonaktif, data mikrofon mungkin tetap dibagikan saat Anda menelepon nomor darurat."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Setelan game"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Aktifkan pintasan Dasbor Game, dsb."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Sebelumnya"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 524b108..568bb8c 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Slökkva á flugstillingu til að nota ofurbreiðband (UWB)"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Aðgangur að myndavél"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Aðgangur að hljóðnema"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Fyrir forrit og þjónustur"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Fyrir forrit og þjónustur. Þegar slökkt er á þessari stillingu verður hljóðnemagögnum þó hugsanlega deilt þegar þú hringir í neyðarnúmer."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Leikjastillingar"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Kveikja á leikjastjórnborðsflýtileið o.s.frv."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Til baka"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ae908bf..25d94a7 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -3475,7 +3475,7 @@
<string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"הבנתי"</string>
<string name="nfc_more_title" msgid="1041094244767216498">"עוד…"</string>
<string name="nfc_payment_set_default_label" msgid="7395939287766230293">"הגדרה של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
- <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"עדכון של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
+ <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"עדכון אפליקציית התשלום הראשית"</string>
<string name="nfc_payment_set_default" msgid="4101484767872365195">"במסוף תשלום ללא מגע, יש לשלם באמצעות <xliff:g id="APP">%1$s</xliff:g>"</string>
<string name="nfc_payment_set_default_instead_of" msgid="565237441045013280">"במסוף ללא מגע, יש לשלם באמצעות <xliff:g id="APP_0">%1$s</xliff:g>.\n\nהאפליקציה הזו מחליפה את <xliff:g id="APP_1">%2$s</xliff:g> כאפליקציית התשלומים שתשמש כברירת מחדל."</string>
<string name="nfc_payment_btn_text_set_deault" msgid="1821065137209590196">"הגדרה כברירת מחדל"</string>
@@ -5744,10 +5744,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"כיבוי מצב טיסה לשימוש בתחום רחב סרט (UWB)"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"גישה למצלמה"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"גישה למיקרופון"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"לאפליקציות ולשירותים"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"לאפליקציות ולשירותים. אם ההגדרה מושבתת, נתוני המיקרופון ישותפו כשתתבצע שיחה למספר חירום."</string>
<string name="game_settings_title" msgid="1028178627743422090">"הגדרות משחקים"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"הפעלת הלחצן המהיר למרכז בקרת המשחקים, וכו\'"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"הקודם"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 02c5548..d6b3adc 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB を使用するには機内モードを OFF にしてください"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"カメラへのアクセス"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"マイクへのアクセス"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"アプリとサービス"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"アプリとサービス。この設定が OFF の場合、緊急通報番号に発信したときは、マイクのデータが共有されることがあります。"</string>
<string name="game_settings_title" msgid="1028178627743422090">"ゲームの設定"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ゲーム ダッシュボード ショートカットやその他の機能を有効にします"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"前へ"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index bfcf89b..ccffe0b 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB технологиясын пайдалану үшін ұшақ режимі өшіріледі."</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Камераны пайдалану"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Микрофонды пайдалану"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Қолданбалар мен қызметтерге арналған."</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Қолданбалар мен қызметтерге арналған. Бұл параметр өшірілсе де, құтқару қызметінің нөміріне қоңырау шалғанда, микрофон деректері жіберілуі мүмкін."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Ойын параметрлері"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Ойын тақтасының таңбашасын қосу және т.б."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Алдыңғы"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b08b99c..bc29823 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"បិទមុខងារពេលជិះយន្តហោះ ដើម្បីប្រើ UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"ការចូលប្រើកាមេរ៉ា"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"ការចូលប្រើមីក្រូហ្វូន"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"សម្រាប់កម្មវិធី និងសេវាកម្ម"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"សម្រាប់កម្មវិធី និងសេវាកម្ម។ ប្រសិនបើបិទការកំណត់នេះ ទិន្នន័យមីក្រូហ្វូននៅតែអាចត្រូវបានចែករំលែកដដែល នៅពេលអ្នកហៅទៅលេខសង្គ្រោះបន្ទាន់។"</string>
<string name="game_settings_title" msgid="1028178627743422090">"ការកំណត់ហ្គេម"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"បើកផ្លូវកាត់ផ្ទាំងគ្រប់គ្រងហ្គេម ។ល។"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"មុន"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 437b866..1caf6a6 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ಬಳಸಲು ಏರ್ಪ್ಲೇನ್ ಮೋಡ್ ಅನ್ನು ಆಫ್ ಮಾಡಿ"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"ಕ್ಯಾಮರಾ ಪ್ರವೇಶದ ಅನುಮತಿ"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"ಮೈಕ್ರೊಫೋನ್ ಪ್ರವೇಶದ ಅನುಮತಿ"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ಆ್ಯಪ್ಗಳು ಮತ್ತು ಸೇವೆಗಳಿಗಾಗಿ"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ಆ್ಯಪ್ಗಳು ಮತ್ತು ಸೇವೆಗಳಿಗಾಗಿ. ಈ ಸೆಟ್ಟಿಂಗ್ ಆಫ್ ಆಗಿದ್ದರೆ, ನೀವು ತುರ್ತು ಸಂಖ್ಯೆಗೆ ಕರೆ ಮಾಡಿದಾಗಲೂ ಮೈಕ್ರೊಫೋನ್ ಡೇಟಾವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು."</string>
<string name="game_settings_title" msgid="1028178627743422090">"ಗೇಮ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ಗೇಮ್ ಡ್ಯಾಶ್ಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್, ಇತ್ಯಾದಿ ಆನ್ ಮಾಡಿ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"ಹಿಂದಿನದು"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index eeea121..962c4fc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -5566,10 +5566,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB를 사용하려면 비행기 모드를 사용 중지하세요."</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"카메라 액세스"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"마이크 액세스"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"앱 및 서비스에 적용됩니다."</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"앱 및 서비스에 적용됩니다. 설정이 꺼져 있어도 긴급 전화번호로 전화를 걸 때 마이크 데이터가 계속 공유될 수 있습니다."</string>
<string name="game_settings_title" msgid="1028178627743422090">"게임 설정"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"게임 대시보드 바로가기 사용 설정 등"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"이전"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 10edb8f..aa3123a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -3025,8 +3025,8 @@
<string name="backup_configure_account_default_summary" msgid="5323225330966306690">"Камдык көчүрмөлөр сакталган бир дагы аккаунт табылган жок"</string>
<string name="backup_erase_dialog_title" msgid="5892431263348766484"></string>
<string name="backup_erase_dialog_message" msgid="2250872501409574331">"Колдонмолордун берилиштерин, Wi-Fi сырсөздөрүн, бүктөмөлөрдү, жана башка тууралоолорду, колдономолордун берилиштерин Google\'дун серверине сактоо токтотулуп, бардык көчүрмөлөр жок кылынсынбы?"</string>
- <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү мындан ары сакталбай, аралыктагы серверлердеги бардык көчүрмөлөр өчүрүлөт. Уланта бересизби?"</string>
- <string name="fullbackup_data_summary" msgid="971587401251601473">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү алыстан автоматтык түрдө сакталат.\n\nКамдык көчүрмөнү автоматтык түрдө сактоо мүмкүнчүлүгү иштетилгенде, түзмөктүн жана колдонмонун дайындары маалы менен автоматтык түрдө сакталып турат. Иштеп чыгуучунун жөндөөлөрүнө ылайык колдонмодо сакталган дайындарда байланыштар, билдирүүлөр, сүрөттөр сыяктуу купуя маалыматтар камтылышы мүмкүн."</string>
+ <string name="fullbackup_erase_dialog_message" msgid="2379053988557486162">"Түзмөктөгү нерселердин (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмодогу нерселердин (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү мындан ары сакталбай, аралыктагы серверлердеги бардык көчүрмөлөр өчүрүлөт. Уланта бересизби?"</string>
+ <string name="fullbackup_data_summary" msgid="971587401251601473">"Түзмөктөгү нерселердин (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмодогу нерселердин (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү алыстан автоматтык түрдө сакталат.\n\nКамдык көчүрмөнү автоматтык түрдө сактоо мүмкүнчүлүгү иштетилгенде, түзмөктүн жана колдонмонун дайындары маалы менен автоматтык түрдө сакталып турат. Иштеп чыгуучунун жөндөөлөрүнө ылайык колдонмодо сакталган дайындарда байланыштар, билдирүүлөр, сүрөттөр сыяктуу купуя маалыматтар камтылышы мүмкүн."</string>
<string name="device_admin_settings_title" msgid="31392408594557070">"Түзмөктү башкарган колдонмонун жөндөөлөрү"</string>
<string name="active_device_admin_msg" msgid="7744106305636543184">"Түзмөктү башкарган колдонмо"</string>
<string name="remove_device_admin" msgid="3143059558744287259">"Түзмөктү башкарган колдонмону өчүрүп салуу"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 7a8f9d8..3c9c82b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"ປິດໂໝດຢູ່ໃນຍົນເພື່ອໃຊ້ UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"ການເຂົ້າເຖິງກ້ອງຖ່າຍຮູບ"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"ການເຂົ້າເຖິງໄມໂຄຣໂຟນ"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ສຳລັບແອັບ ແລະ ບໍລິການ"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ສຳລັບແອັບ ແລະ ບໍລິການ. ຫາກປິດການຕັ້ງຄ່ານີ້ໄວ້, ຂໍ້ມູນໄມໂຄຣໂຟນອາດຍັງຄົງຖືກແບ່ງປັນໃນເວລາທີ່ທ່ານໂທຫາເບີໂທສຸກເສີນ."</string>
<string name="game_settings_title" msgid="1028178627743422090">"ການຕັ້ງຄ່າເກມ"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ເປີດໃຊ້ທາງລັດແຜງໜ້າປັດເກມ ແລະ ອື່ນໆ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"ກ່ອນໜ້າ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8b6e7fa..97a7813 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -5742,10 +5742,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Norėdami naudoti UWB, išjunkite lėktuvo režimą"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Prieiga prie fotoaparato"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Prieiga prie mikrofono"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Programos ir paslaugos"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Programos ir paslaugos. Jei šis nustatymas išjungtas, mikrofono duomenys vis tiek gali būti bendrinami, skambinant pagalbos numeriu."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Žaidimų nustatymai"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Įjunkite žaidimų informacijos suvestinės spartųjį klavišą ir t. t."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Ankstesnis"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index c9f3125..2c3313d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -5653,10 +5653,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Izslēdziet lidojuma režīmu, lai izmantotu UWB."</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Piekļuve kamerai"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Piekļuve mikrofonam"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Lietotnēm un pakalpojumiem"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Lietotnēm un pakalpojumiem. Ja šis iestatījums ir izslēgts, mikrofona dati joprojām var tikt kopīgoti, kad zvanīsiet uz ārkārtas numuru."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Spēļu iestatījumi"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Spēļu informācijas paneļa saīsnes ieslēgšana u.c."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Iepriekšējā"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 14618ca..f554d7f 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ഉപയോഗിക്കാൻ ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"ക്യാമറ ആക്സസ്"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"മൈക്രോഫോൺ ആക്സസ്"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ആപ്പുകൾക്കും സേവനങ്ങൾക്കും"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ആപ്പുകൾക്കും സേവനങ്ങൾക്കും. ഈ ക്രമീകരണം ഓഫാണെങ്കിൽ, നിങ്ങൾ അടിയന്തര നമ്പറിൽ വിളിക്കുമ്പോഴും മൈക്രോഫോൺ ഡാറ്റ തുടർന്നും പങ്കിടും."</string>
<string name="game_settings_title" msgid="1028178627743422090">"ഗെയിം ക്രമീകരണം"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ഗെയിം ഡാഷ്ബോർഡ് ഷോർട്ട്കട്ട് മുതലായവ ഓണാക്കുക"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"മുമ്പത്തേത്"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index b347f26..0c3ed9c 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB-г ашиглахын тулд нислэгийн горимыг унтраах"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Камерын хандалт"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Микрофоны хандалт"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Апп болон үйлчилгээнд"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Апп болон үйлчилгээнд. Энэ тохиргоо унтраалттай тохиолдолд та яаралтай тусламжийн утасны дугаар луу залгах үедээ микрофоны өгөгдлийг хуваалцсан хэвээр байж болзошгүй."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Тоглоомын тохиргоо"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Тоглоомын хяналтын самбарын товчлолыг асаах гэх мэт"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Өмнөх"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 8648ec1..f8001ba 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -5565,10 +5565,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB वापरण्यासाठी विमान मोड बंद करा"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"कॅमेराचा अॅक्सेस"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"मायक्रोफोनचा अॅक्सेस"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ॲप्स आणि सेवांसाठी"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ॲप्स आणि सेवांसाठी. हे सेटिंग बंद असल्यास, तुम्ही आणीबाणी नंबरवर कॉल करता तेव्हा, मायक्रोफोन डेटा तरीही कदाचित शेअर केला जाईल."</string>
<string name="game_settings_title" msgid="1028178627743422090">"गेम सेटिंग्ज"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"गेम डॅशबोर्ड शॉर्टकट इ. सुरू करा"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"मागील"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 89ef9be..40b9f1f 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2680,11 +2680,11 @@
<string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Sesetengah ciri mungkin terhad"</string>
<string name="battery_tip_high_usage_title" msgid="9110720762506146697">"Penggunaan bateri tertinggi"</string>
<string name="battery_tip_high_usage_summary" msgid="3938999581403084551">"Lihat apl dengan penggunaan tertinggi"</string>
- <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Pengecasan terhad buat sementara waktu"</string>
+ <string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"Pengecasan terhad sementara"</string>
<string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"Untuk menjimatkan bateri anda. Ketahui lebih lanjut."</string>
<string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"Sambung semula pengecasan"</string>
- <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, telefon anda akan dicas secara automatik seperti biasa."</string>
- <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, tablet anda akan dicas secara automatik seperti biasa."</string>
+ <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu anda mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, telefon anda akan dicas secara automatik seperti biasa."</string>
+ <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"Dalam keadaan tertentu, seperti suhu tinggi dan tempoh pengecasan yang panjang, pengecasan mungkin dihadkan kepada <xliff:g id="PERCENT">%1$s</xliff:g> untuk membantu anda mengekalkan kesihatan bateri.\n\nApabila keadaan tersebut berakhir, tablet anda akan dicas secara automatik seperti biasa."</string>
<string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"Oleh sebab anda telah menggunakan telefon anda lebih kerap berbanding biasa, bateri anda mungkin kehabisan lebih cepat daripada biasa.\n\nApl yang menggunakan kebanyakan bateri:"</string>
<string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"Oleh sebab anda telah menggunakan tablet anda lebih kerap berbanding biasa, bateri anda mungkin kehabisan lebih cepat daripada biasa.\n\nApl yang menggunakan kebanyakan bateri:"</string>
<string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"Oleh sebab anda telah menggunakan peranti anda lebih kerap berbanding biasa, bateri anda mungkin kehabisan lebih cepat daripada biasa.\n\nApl yang menggunakan kebanyakan bateri:"</string>
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Matikan mod pesawat untuk menggunakan UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Akses kamera"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Akses mikrofon"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Untuk apl dan perkhidmatan"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Untuk apl dan perkhidmatan. Jika tetapan ini dimatikan, data mikrofon mungkin masih dikongsi apabila anda memanggil nombor kecemasan."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Tetapan permainan"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Hidupkan pintasan Papan Pemuka Permainan, dll"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Sebelumnya"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 93a8fc3..5f8baa1 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -217,7 +217,7 @@
</string-array>
<string-array name="app_install_location_entries">
<item msgid="3771157789865587832">"စက်တွင်းသိုလှောင်ကိရိယာ"</item>
- <item msgid="5501345333507193420">"ဖယ်ရှား၍ရသောSDကတ်"</item>
+ <item msgid="5501345333507193420">"ဖယ်ရှား၍ရသော SD ကတ်"</item>
<item msgid="2362840341195111674">"စနစ်အား ဆုံးဖြတ်ပါစေ"</item>
</string-array>
<string-array name="app_ops_categories">
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9741a13..0813edb 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -44,7 +44,7 @@
<string name="radioInfo_data_suspended" msgid="2001254415431299603">"ဆိုင်းငံ့ထားသည်"</string>
<string name="radioInfo_unknown" msgid="2892562356748600367">"မသိ"</string>
<string name="sdcard_unmount" product="nosdcard" msgid="1816306320988638382">"USBကိရိယာထိုင်ခြင်းဖြုတ်"</string>
- <string name="sdcard_unmount" product="default" msgid="8078570285871053815">"SDကဒ်အားအထိုင်မှဖြုတ်ခြင်း"</string>
+ <string name="sdcard_unmount" product="default" msgid="8078570285871053815">"SD ကတ်ကို စနစ်မှဖြုတ်ခြင်း"</string>
<string name="sdcard_format" product="nosdcard" msgid="3248760426252305366">"USBသိုလှောင်မှု ဖျက်ခြင်း"</string>
<string name="sdcard_format" product="default" msgid="3676635435136326182">"SDကတ်အား ဖျက်ရန်"</string>
<string name="preview_pager_content_description" msgid="3762247188224576303">"အစမ်းကြည့်ပါ"</string>
@@ -133,7 +133,7 @@
<string name="bluetooth_map_request" msgid="8664081227240707479">"စာသုံးခွင့်ပြုရန်တောင်းခံချက်"</string>
<string name="bluetooth_map_acceptance_dialog_text" msgid="2647611490952377156">"%1$s သည် သင်၏ စာများကို ရယူအသုံးပြုလိုသည်။ %2$s ကို အသုံးပြုခွင့် ပေးမည်လား?"</string>
<string name="bluetooth_sap_request" msgid="473439406287008397">"SIM ကတ် သုံးခွင့် တောင်းဆိုမှု"</string>
- <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> သည် သင့် SIM ကဒ်အား ဝင်ရောက်သုံးလို၏။ SIM ကဒ်အား ဝင်ရောက်သုံးခွင့်ပြုပါက ချိတ်ဆက်နေစဉ်ကာလအတွင်း သင့် စက်ကိရိယာ၏ ဒေတာချိတ်ဆက်မှုအား ပိတ်ထားလိမ့်မည်။ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> အား ဝင်ရောက်သုံးခွင့်ပြုရန်"</string>
+ <string name="bluetooth_sap_acceptance_dialog_text" msgid="2849083276356078655">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> သည် သင့် SIM ကတ်အား အသုံးပြုလို၏။ SIM ကတ်အား သုံးခွင့်ပြုပါက ချိတ်ဆက်နေစဉ်ကာလအတွင်း သင့် စက်ကိရိယာ၏ ဒေတာချိတ်ဆက်မှုအား ပိတ်ထားလိမ့်မည်။ <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> အား ဝင်သုံးခွင့်ပြုရန်"</string>
<string name="bluetooth_device_name_summary" msgid="8678342689845439583">"အခြားစက်ပစ္စည်းများက “<xliff:g id="DEVICE_NAME">^1</xliff:g>” အဖြစ် မြင်ရပါမည်"</string>
<string name="bluetooth_off_footer" msgid="76578735660216295">"အခြားစက်များသို့ ချိတ်ဆက်ရန် \'ဘလူးတုသ်\' ကို ဖွင့်ပါ။"</string>
<string name="bluetooth_paired_device_title" msgid="3240639218362342026">"သင်၏ စက်ပစ္စည်းများ"</string>
@@ -189,19 +189,19 @@
<string name="sdcard_settings_screen_mass_storage_text" msgid="129059989000252994">"USB ဖြင့်အချက်အလက်မြောက်များစွာ သိမ်းဆည်းနိုင်သော နေရာကို ရနိုင်ခြင်း"</string>
<string name="sdcard_settings_total_bytes_label" msgid="5298511430610207103">"စုစုပေါင်း bytes"</string>
<string name="sdcard_settings_not_present_status" product="nosdcard" msgid="6189761476582690998">"USB သိုလှောင်ကိရိယာ မတပ်ရသေးပါ"</string>
- <string name="sdcard_settings_not_present_status" product="default" msgid="6601962586941623203">"SD ကဒ်မရှိပါ"</string>
+ <string name="sdcard_settings_not_present_status" product="default" msgid="6601962586941623203">"SD ကတ်မရှိပါ"</string>
<string name="sdcard_settings_available_bytes_label" msgid="7721283102767669004">"ရရှိနိုင်သောbyteများ:"</string>
<string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="4878190674458263222">"USB သိုလှောင်ကိရိယာကို စုပေါင်းသိုလှောင်ရာပစ္စည်းအနေဖြင့် အသုံးပြုနေပါသည်။"</string>
- <string name="sdcard_settings_mass_storage_status" product="default" msgid="8850227049504860012">"SD ကဒ်ကို သိုလှောင်ရာပစ္စည်းအနေဖြင့် အသုံးပြုနေပါသည်။"</string>
+ <string name="sdcard_settings_mass_storage_status" product="default" msgid="8850227049504860012">"SD ကတ်ကို သိုလှောင်ရာပစ္စည်းအနေဖြင့် အသုံးပြုနေပါသည်။"</string>
<string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="1053258530368541571">"ယခု SDကဒ်ဖြုတ်ရန် စိတ်ချရပါပြီ"</string>
- <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"ယခု SDကဒ်ဆွဲဖြုတ်ရန် စိတ်ချရပါပြီ။"</string>
+ <string name="sdcard_settings_unmounted_status" product="default" msgid="5813940671700138561">"ယခု SD ကတ်ဖြုတ်ရန် စိတ်ချရပါပြီ။"</string>
<string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="209564009449909311">"USBသိုလှောင်မှုသုံးနေစဉ်ဖယ်သည်"</string>
- <string name="sdcard_settings_bad_removal_status" product="default" msgid="6817342973919819392">"SD ကဒ်အား အသုံးပြုနေဆဲတွင် ဖယ်ရှားခဲ့ပါသည်"</string>
+ <string name="sdcard_settings_bad_removal_status" product="default" msgid="6817342973919819392">"SD ကတ်အား အသုံးပြုနေစဉ် ဖယ်ရှားခဲ့ပါသည်"</string>
<string name="sdcard_settings_used_bytes_label" msgid="5646588579332741943">"အသုံးပြုသောbytes"</string>
<string name="sdcard_settings_scanning_status" product="nosdcard" msgid="8037280964384235345">"မီဒီယာအတွက် USBသိုလှောင်ကိရိယာကို စကင်ပြုလုပ်နေသည်"</string>
- <string name="sdcard_settings_scanning_status" product="default" msgid="3297316465982471437">"မီဒီယာအတွက် SDကဒ်ကို စကင်ပြုလုပ်နေသည်"</string>
+ <string name="sdcard_settings_scanning_status" product="default" msgid="3297316465982471437">"SD ကတ်ကို မီဒီယာအတွက် စကင်ဖတ်နေသည်..."</string>
<string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3444648373391629840">"USB ကိုဖတ်ရန်သပ်သပ်အတွက်သာ တပ်ထားပြီး"</string>
- <string name="sdcard_settings_read_only_status" product="default" msgid="4338796260718910164">"SDကဒ်ကို ဖတ်ရန်သပ်သပ်အတွက်သာ တပ်ထားပြီး။"</string>
+ <string name="sdcard_settings_read_only_status" product="default" msgid="4338796260718910164">"SD ကတ်ကို ဖတ်ရန်အတွက်သာ တပ်ထားသည်။"</string>
<string name="skip_label" msgid="6380034601349015895">"ကျော်ရန်"</string>
<string name="next_label" msgid="1248293387735652187">"ရှေ့သို့"</string>
<string name="language_picker_title" msgid="4271307478263345133">"ဘာသာစကားများ"</string>
@@ -314,7 +314,7 @@
<string name="decryption_settings_summary" product="tablet" msgid="1864963068216544631">"စက်ပစ္စည်းကို အသွင်ဝှက်မထားပါ"</string>
<string name="lockscreen_settings_title" msgid="4086121748092341549">"လော့ခ်မျက်နှာပြင်"</string>
<string name="lockscreen_settings_what_to_show_category" msgid="9205490627927741254">"ပြသမည့်အရာ"</string>
- <string name="security_settings_summary" msgid="1627059516127354233">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
+ <string name="security_settings_summary" msgid="1627059516127354233">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုလော့ခ်ဖွင့်ခြင်း ဆင်းမ်ကတ်လော့ခ်ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
<string name="cdma_security_settings_summary" msgid="2455517905101186330">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
<string name="security_passwords_title" msgid="4154420930973818581">"ကန့်သတ်ရန် ဆက်တင်"</string>
<string name="disabled_by_administrator_summary" msgid="5424846182313851124">"မရနိုင်ပါ"</string>
@@ -1434,7 +1434,7 @@
<string name="sim_lock_settings_category" msgid="4280307997492851625">"ဆင်းမ်ကတ် လော့ခ်"</string>
<string name="sim_lock_settings_summary_off" msgid="4570941250786847095">"ပိတ်"</string>
<string name="sim_lock_settings_summary_on" msgid="1562184566830887925">"လော့ခ်ချထားသည်"</string>
- <string name="sim_lock_settings_title" msgid="1401619059761012696">"ဆင်းကဒ် သော့ချခြင်း"</string>
+ <string name="sim_lock_settings_title" msgid="1401619059761012696">"ဆင်းမ်ကတ် လော့ခ်ချခြင်း"</string>
<string name="sim_pin_toggle" msgid="98754920202404425">"ဆင်းမ်ကတ် လော့ခ်ချခြင်း"</string>
<string name="sim_lock_on" product="tablet" msgid="5857965768682972363">"တက်ဘလက်ကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
<string name="sim_lock_on" product="default" msgid="3303147192981388923">"ဖုန်းကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
@@ -1443,7 +1443,7 @@
<string name="sim_pin_change" msgid="5978881209990507379">"ဆင်းမ်ကတ် ပင်နံပါတ်ပြောင်းရန်"</string>
<string name="sim_enter_pin" msgid="8235202785516053253">"ဆင်းကဒ် ပင်နံပါတ်"</string>
<string name="sim_enable_sim_lock" msgid="8993991669975548653">"ဆင်းမ်ကတ် လော့ခ်ချခြင်း"</string>
- <string name="sim_disable_sim_lock" msgid="7656447857474746157">"ဆင်းမ်ကဒ်ကို သော့ဖွင့်ရန်"</string>
+ <string name="sim_disable_sim_lock" msgid="7656447857474746157">"ဆင်းမ်ကတ်ကို လော့ခ်ဖွင့်ရန်"</string>
<string name="sim_enter_old" msgid="6882545610939674813">"ဆင်းကဒ် ပင်နံပါတ်အဟောင်း"</string>
<string name="sim_enter_new" msgid="9010947802784561582">"ဆင်းကဒ် ပင်နံပါတ် အသစ်"</string>
<string name="sim_reenter_new" msgid="6131418271490374263">"PIN အသစ်ကို ပြန်ပြီး တိုက်ရိုက်ပါ"</string>
@@ -1452,7 +1452,7 @@
<string name="sim_pins_dont_match" msgid="1540348773896609260">"ပင်နံပါတ်များ မတူပါ။"</string>
<string name="sim_change_failed" msgid="316723087029061740">"ပင်နံပါတ်ပြောင်း၍မရပါ\nပင်နံပါတ်အမှား ဖြစ်နိုင်သည်"</string>
<string name="sim_change_succeeded" msgid="3516905528149069739">"ဆင်းကဒ် ပင်နံပါတ် ပြောင်းခြင်းအောင်မြင်ပါသည်"</string>
- <string name="sim_lock_failed" msgid="16360418201678317">"ဆင်းမ်ကဒ်သော့ကျနေမှုအခြေအနေအား ပြောင်းမရပါ။ \nပင်နံပါတ်မှားယွင်းမှု ဖြစ်နိုင်သည်။"</string>
+ <string name="sim_lock_failed" msgid="16360418201678317">"ဆင်းမ် လော့ခ်ကျနေသည်။ \nပင် မှားနေသည်။"</string>
<string name="sim_pin_disable_failed" msgid="8719890393181032837">"ပင်နံပါတ်ကို ပိတ်၍မရပါ။"</string>
<string name="sim_pin_enable_failed" msgid="5156513975085380284">"ပင်နံပါတ်ကို ဖွင့်၍မရပါ။"</string>
<string name="sim_enter_ok" msgid="3401715290135787531">"OK"</string>
@@ -1462,7 +1462,7 @@
<string name="sim_change_data_title" msgid="4663239438584588847">"မိုဘိုင်းဒေတာအတွက် <xliff:g id="CARRIER">%1$s</xliff:g> သုံးမလား။"</string>
<string name="sim_change_data_message" msgid="3046178883369645132">"မိုဘိုင်းဒေတာအတွက် <xliff:g id="CARRIER2_0">%2$s</xliff:g> အသုံးပြုနေသည်။ <xliff:g id="CARRIER1">%1$s</xliff:g> သို့ပြောင်းလျှင် မိုဘိုင်းဒေတာအတွက် <xliff:g id="CARRIER2_1">%2$s</xliff:g> ကို အသုံးပြုတော့မည် မဟုတ်ပါ။"</string>
<string name="sim_change_data_ok" msgid="4922114750417276560">"<xliff:g id="CARRIER">%1$s</xliff:g> သုံးရန်"</string>
- <string name="sim_preferred_title" msgid="7182406911552216373">"SIM ကဒ်ကို အပ်ဒိတ်လုပ်မလား"</string>
+ <string name="sim_preferred_title" msgid="7182406911552216373">"SIM ကတ်ကို အပ်ဒိတ်လုပ်မလား"</string>
<string name="sim_preferred_message" msgid="6004009449266648351">"<xliff:g id="NEW_SIM">%1$s</xliff:g> သည် သင့်ဖုန်းထဲရှိ တစ်ခုတည်းသော ဆင်းမ်ကဒ်ဖြစ်သည်။ ဤဆင်းမ်ကဒ်ကို မိုဘိုင်းဒေတာ အသုံးပြုရန်၊ ဖုန်းခေါ်ရန်နှင့် SMS မက်ဆေ့ဂျ်ပို့ရန် အတွက် အသုံးပြုလိုပါသလား။"</string>
<string name="wrong_pin_code_pukked" msgid="3414172752791445033">"ဆင်းမ်ကတ်၏ လျှို့ဝှက်နံပါတ် မှားနေပါသည်၊ သင်၏ စက်ပစ္စည်းကို သော့ဖွင့်ရန် ဖုန်းလိုင်းဌာနသို့ ဆက်သွယ်ရမည် ဖြစ်ပါတယ်"</string>
<plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
@@ -1493,7 +1493,7 @@
<string name="storage_usb_settings" msgid="7058142934214211583">"သိုလှောင်ခန်း"</string>
<string name="storage_settings_title" msgid="486118156723194815">"သိုလှောင်မှု ဆက်တင်များ"</string>
<string name="storage_settings_summary" product="nosdcard" msgid="3858049818577638926">"USBသိုလှောင်မှုကိရိယာအား အထိုင်မှဖြုတ်မည် သိုလှောင်နိုင်မှုအားကြည့်မည်"</string>
- <string name="storage_settings_summary" product="default" msgid="267557695753980969">"SDကဒ်ကို အထိုင်မှဖြုတ်မည်။ သိုလှောင်နိုင်မှုအား ကြည့်မည်။"</string>
+ <string name="storage_settings_summary" product="default" msgid="267557695753980969">"SD ကတ်ကို စနစ်မှဖြုတ်မည်။ သိုလှောင်နိုင်မှုအား ကြည့်မည်။"</string>
<string name="imei_multi_sim" msgid="71477088017585479">"IMEI (ဆင်းမ် အထိုင် %1$d)"</string>
<string name="view_saved_network" msgid="1232387673095080910">"ကြည့်ရန် သိမ်းထားသည့် ကွန်ရက်ကို ရွေးပါ"</string>
<string name="status_number" product="tablet" msgid="3597945414666253183">"MDNနံပါတ်"</string>
@@ -1544,30 +1544,30 @@
<string name="memory_media_misc_usage" msgid="7066851245178533269">"အခြားဖိုင်များ"</string>
<string name="memory_media_cache_usage" msgid="780808666853685824">"မှတ်သိမ်းထားသော ဒေတာ"</string>
<string name="sd_eject" product="nosdcard" msgid="6136102589751843304">"မျှဝေသုံးသောသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
- <string name="sd_eject" product="default" msgid="8062832622096296251">"SDကဒ်အားအထိုင်မှဖြုတ်ခြင်း"</string>
+ <string name="sd_eject" product="default" msgid="8062832622096296251">"SD ကတ်အား စနစ်မှဖြုတ်ခြင်း"</string>
<string name="sd_eject_summary" product="nosdcard" msgid="6859940774161708871">"စက်အတွင်းUSBသိုလှောင်မှုအား အထိုင်မှဖြုတ်ခြင်း"</string>
- <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"SDကဒ်ကိုအထိုင်မှဖြုတ်ယူခြင်းဖြင့် အန္တရာယ်ကင်းစွာဖယ်ရှားနုိင်မည်"</string>
+ <string name="sd_eject_summary" product="default" msgid="5151243312587186226">"SD ကတ်ကို စနစ်မှဖြုတ်ခြင်းဖြင့် အန္တရာယ်ကင်းစွာဖယ်ရှားနိုင်မည်"</string>
<string name="sd_insert_summary" product="nosdcard" msgid="9164545135649775664">"အထိုင်အတွက်USBထည့်ပါ"</string>
- <string name="sd_insert_summary" product="default" msgid="5949168259622002192">"အထိုင်တွင်စိုက်ရန်အတွက် SDကဒ်ကို တပ်မည်"</string>
+ <string name="sd_insert_summary" product="default" msgid="5949168259622002192">"စနစ်တွင် SD ကတ်ကို တပ်မည်"</string>
<string name="sd_mount" product="nosdcard" msgid="8305985249945415150">"USBသိုလှောင်မှုကိုထိုင်ပါ"</string>
- <string name="sd_mount" product="default" msgid="5279813999455776169">"SD ကဒ်ကိုအထိုင်တွင်စိုက်မည်"</string>
+ <string name="sd_mount" product="default" msgid="5279813999455776169">"SD ကတ်ကို စနစ်တွင်တပ်မည်"</string>
<string name="sd_mount_summary" product="nosdcard" msgid="2190410240845521205"></string>
<string name="sd_mount_summary" product="default" msgid="2190410240845521205"></string>
<string name="sd_format" product="nosdcard" msgid="8657427883364711513">"USBသိုလှောင်မှု ဖျက်ခြင်း"</string>
<string name="sd_format" product="default" msgid="9085302892248732329">"SDကတ်အား ဖျက်ရန်"</string>
<string name="sd_format_summary" product="nosdcard" msgid="6179784504937189658">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
- <string name="sd_format_summary" product="default" msgid="60583152211068164">"SDကဒ်ထဲရှိ သီးချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
+ <string name="sd_format_summary" product="default" msgid="60583152211068164">"SD ကတ်ထဲရှိ သီးချင်း သို့မဟုတ် ဓာတ်ပုံကဲ့သို့ ဒေတာအားလုံးကို ဖျက်ရန်"</string>
<string name="mtp_ptp_mode_summary" msgid="7969656567437639239">"MTP သို့ PTP လုပ်ငန်း အသက်ဝင်နေသည်။"</string>
<string name="dlg_confirm_unmount_title" product="nosdcard" msgid="7694112411895701320">"USBသိမ်းဆည်းမှုဖြုတ်မလား"</string>
- <string name="dlg_confirm_unmount_title" product="default" msgid="8251329019960361646">"SDကဒ်အားအထိုင်မှဖြုတ်မည်လား?"</string>
+ <string name="dlg_confirm_unmount_title" product="default" msgid="8251329019960361646">"SD ကတ်ကို စနစ်မှဖြုတ်မလား။"</string>
<string name="dlg_confirm_unmount_text" product="nosdcard" msgid="1212025106709645023">"သင် ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှုကို အထိုင်မှဖြုတ်လိုက်ပါက တချို့ အက်ပ်များ က ယူအက်စ်ဘီ နဲ့ သိမ်းဆည်းမှု ပြန်ပိတ်သည်အထိ အလုပ်မလုပ် သို့ သုံးစွဲရန် ရှိနေမည် မဟုတ်ပါ"</string>
- <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"SDကဒ်ကို အထိုင်မှဖြုတ်လျှင် သင်အသုံးပြုနေသောတချို့အပ်ပလီကေးရှင်းများမှာ ရပ်ကာ ပြန်လည်အထိုင်တွင်မတပ်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
+ <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"SD ကတ်ကို စနစ်မှဖြုတ်လျှင် သင်အသုံးပြုနေသော အချို့အပလီကေးရှင်းများ ရပ်သွားနိုင်ပြီး စနစ်တွင် ပြန်လည်တပ်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
<string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
<string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
<string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"USBသိုလှောင်မှုကိရိယာအားအထိုင်မှ ဖြုတ်၍မရပါ။ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
- <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SDကဒ်အားအထိုင်မှ ဖြုတ်၍မရပါ ပြန်လည်ကြိုးစားလုပ်ကြည့်ပါ"</string>
+ <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SD ကတ်ကို စနစ်မှ ဖြုတ်၍မရပါ ထပ်ကြိုးစားကြည့်ပါ"</string>
<string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"USBသိုလှောင်ကိရိယာအား အထိုင်မှဖြုတ်မည်"</string>
- <string name="unmount_inform_text" product="default" msgid="716578785262713312">"SDကဒ်အား အထိုင်မှဖြုတ်မည်"</string>
+ <string name="unmount_inform_text" product="default" msgid="716578785262713312">"SD ကတ်ကို စနစ်မှဖြုတ်မည်"</string>
<string name="sd_ejecting_title" msgid="1641122369013595273">"အထိုင်မှဖြုတ်နေပါသည်"</string>
<string name="sd_ejecting_summary" msgid="861928572729341132">"အထိုင်မှဖြုတ်နေပါသည်"</string>
<string name="storage_low_title" msgid="8002650511493419567">"သိမ်းဆည်းရန်နေရာနည်းနေသည်။"</string>
@@ -1752,9 +1752,9 @@
<string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏အခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USB သိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
<string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"သီချင်း၊ ပုံများနှင့် အခြားာအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SD ကတ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
<string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USBသိုလှောင်ကိရိယာအား ဖျက်ခြင်း"</string>
- <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SDကတ်အား ဖျက်ရန်"</string>
+ <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ကတ်အား ဖျက်ရန်"</string>
<string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
- <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
+ <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD ကတ်ထဲရှိ သီချင်း သို့မဟုတ် ဓာတ်ပုံကဲ့သို့ ဒေတာအားလုံးကို ဖျက်ရန်"</string>
<string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
<string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
<string name="main_clear_final_desc" msgid="5800877928569039580">"သင့်ကိုယ်ရေးကိုယ်တာအချက်အလက်များနှင့် ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
@@ -1827,7 +1827,7 @@
<string name="network_scorer_change_active_no_previous_dialog_text" msgid="680685773455072321">"သင်၏ ကွန်ရက် ချိတ်ဆက်မှုများကို စီမံကွပ်ကဲရန် <xliff:g id="NEW_APP">%s</xliff:g>ကို သုံးရမလား?{"</string>
<string name="mobile_unknown_sim_operator" msgid="6650422533065760963">"မသိရ ဆင်းမ် အော်ပရေတာ"</string>
<string name="mobile_no_provisioning_url" msgid="609462719893503773">"<xliff:g id="OPERATOR">%1$s</xliff:g> တွင် မည်သည့်ဝဘ်ဆိုက်မျှ ပေးထားခြင်းမရှိပါ"</string>
- <string name="mobile_insert_sim_card" msgid="3639245241283948038">"ကျေးဇူးပြု၍ ဆင်းမ်ကဒ်ထည့်၍ အစမှ ပြန်စပါ။"</string>
+ <string name="mobile_insert_sim_card" msgid="3639245241283948038">"ကျေးဇူးပြု၍ ဆင်းမ်ကတ်ထည့်၍ အစမှ ပြန်စပါ။"</string>
<string name="mobile_connect_to_internet" msgid="8162654404357069060">"ကျေးဇူးပြု၍ အင်တာနက်ဖြင့် ချိတ်ဆက်ပါ။"</string>
<string name="location_category_recent_location_requests" msgid="2205900488782832082">"လတ်တလောတည်နေရာ တောင်းခံမှုများ"</string>
<string name="location_recent_location_requests_see_all" msgid="7918405176741692524">"အားလုံး ကြည့်ရန်"</string>
@@ -2079,7 +2079,7 @@
<string name="filter_apps_third_party" msgid="9049447784849114843">"ဒေါင်းလုပ်ပြုလုပ်ပြီး"</string>
<string name="filter_apps_running" msgid="535465683273284141">"အလုပ်လုပ်နေသည်"</string>
<string name="filter_apps_onsdcard" product="nosdcard" msgid="5140211657134608469">"USBသိုလှောင်ကိရိယာ"</string>
- <string name="filter_apps_onsdcard" product="default" msgid="1774499644768369891">"SD ကဒ်ပေါ်တွင်"</string>
+ <string name="filter_apps_onsdcard" product="default" msgid="1774499644768369891">"SD ကတ်ပေါ်တွင်"</string>
<string name="not_installed" msgid="5074606858798519449">"ဤအသုံးပြုသူအတွက် ထည့်သွင်းမထားပါ"</string>
<string name="installed" msgid="2837449358488825884">"ထည့်သွင်းထားသည်"</string>
<string name="no_applications" msgid="985069304755391640">"အက်ပ် မရှိပါ။"</string>
@@ -2101,7 +2101,7 @@
<string name="move_app_to_internal" product="tablet" msgid="5799782476959541144">"တက်ဘလက်သို့ရွေ့မည်"</string>
<string name="move_app_to_internal" product="default" msgid="7395498801589544372">"ဖုန်းသို့ရွေ့မည်"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="1145367822171576972">"USBသိုလှောင်မှုသို့ရွေ့ပါ"</string>
- <string name="move_app_to_sdcard" product="default" msgid="7161667212614143767">"SDကဒ်သို့ရွေ့မည်"</string>
+ <string name="move_app_to_sdcard" product="default" msgid="7161667212614143767">"SD ကတ်သို့ရွှေ့မည်"</string>
<string name="another_migration_already_in_progress" msgid="6550546307856052261">"အခြားရွှေ့ပြောင်းမှု တစ်ခုလုပ်ဆောင်နေပါသည်။"</string>
<string name="insufficient_storage" msgid="8115088042669030558">"သိမ်းဆည်းရန်နေရာအလုံအလောက်မရှိပါ"</string>
<string name="does_not_exist" msgid="6499163879348776120">"အပလီကေးရှင်းမှာ မရှိပါ"</string>
@@ -2185,7 +2185,7 @@
<string name="auto_punctuate_summary" msgid="3549190848611386748">"Space key အားနှစ်ခါနှိပ်ပါက \".\" အား ထည့်မည်"</string>
<string name="show_password" msgid="7101900779571040117">"စကားဝှက်များကို ပြရန်"</string>
<string name="show_password_summary" msgid="9025960283785111619">"စာရိုက်သည့်အခါ အက္ခရာများကို ခဏတာပြပါ"</string>
- <string name="spellchecker_security_warning" msgid="2016059050608271820">"ဤစာလုံးပေါင်းစစ်ဆေးရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ကရက်ဒစ်ကဒ်နံပါတ်စသည်တို့အပါအဝင် သင်ရိုက်ထည့်သောစာများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>ဤစာလုံးပေါင်းစစ်ဆေးခြင်းကို အသုံးပြုမည်လား?"</string>
+ <string name="spellchecker_security_warning" msgid="2016059050608271820">"ဤစာလုံးပေါင်းစစ်ဆေးရာတွင် သင့်ကိုယ်ရေးအချက်အလက်များဖြစ်သော စကားဝှက်များနှင့် ခရက်ဒစ်ကတ်နံပါတ်စသည်တို့အပါအဝင် သင်ရိုက်ထည့်သောစာများအားလုံးကို ရယူသွားမည်ဖြစ်သည်။ ဤသည်မှာ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> အက်ပ်မှဖြစ်သည်။ ဤစာလုံးပေါင်းစစ်စနစ်ကို အသုံးပြုမလား။"</string>
<string name="spellchecker_quick_settings" msgid="6449414356743946577">"ဆက်တင်များ"</string>
<string name="spellchecker_language" msgid="8905487366580285282">"ဘာသာစကား"</string>
<string name="keyboard_and_input_methods_category" msgid="5296847777802891649">"လက်ကွက်များ"</string>
@@ -2968,7 +2968,7 @@
<string name="credentials_title" msgid="7535942196886123656">"ယုံကြည်စိတ်ချရသောသိုလှောင်နေရာ"</string>
<string name="credentials_install" msgid="3933218407598415827">"လက်မှတ်ထည့်သွင်းခြင်း"</string>
<string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"သိုလှောင်နေရာမှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းရန်"</string>
- <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SDကဒ်မှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းမှု"</string>
+ <string name="credentials_install_summary" product="default" msgid="8161351950524166012">"SD ကတ်မှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းမှု"</string>
<string name="credentials_reset" msgid="4246628389366452655">"အထောက်အထားများကို ရှင်းလင်းခြင်း"</string>
<string name="credentials_reset_summary" msgid="5400585520572874255">"အသိအမှတ်ပြုလက်မှတ်အားလုံးကို ဖယ်ရှားရန်"</string>
<string name="trusted_credentials" msgid="2522784976058244683">"ယုံကြည်သော အထောက်အထားများ"</string>
@@ -3468,7 +3468,7 @@
<string name="select_sim_for_sms" msgid="5335510076282673497">"SMS စာတိုစနစ်အတွက် ဆင်းမ်ကတ် ရွေးပါ"</string>
<string name="data_switch_started" msgid="6292759843974720112">"ဒေတာ SIM ပြောင်းနေသည်၊ ၎င်းသည် တစ်မိနစ်ခန့်ကြာနိုင်သည်…"</string>
<string name="select_sim_for_calls" msgid="7843107015635189868">"ဖြင့် ခေါ်ဆိုရန်"</string>
- <string name="sim_select_card" msgid="1226182454109919045">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
+ <string name="sim_select_card" msgid="1226182454109919045">"ဆင်းမ် ကတ်ကို ရွေးရန်"</string>
<string name="sim_card_number_title" msgid="4728780444646439845">"ဆင်းမ် <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
<string name="sim_editor_name" msgid="5900178038499314621">"ဆင်းမ် အမည်"</string>
<string name="sim_name_hint" msgid="8231524869124193119">"ဆင်းမ်အမည် ရိုက်ထည့်ပါ"</string>
@@ -3476,7 +3476,7 @@
<string name="sim_editor_carrier" msgid="2424593350691002557">"စီမံပေးသူ"</string>
<string name="sim_editor_number" msgid="3209002966895156006">"နံပါတ်"</string>
<string name="sim_editor_color" msgid="9067029630083892961">"ဆင်းမ် အရောင်"</string>
- <string name="sim_card_select_title" msgid="8146523005929848793">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
+ <string name="sim_card_select_title" msgid="8146523005929848793">"ဆင်းမ် ကတ်ကို ရွေးရန်"</string>
<string name="color_orange" msgid="216547825489739010">"လိမ္မော်"</string>
<string name="color_purple" msgid="6603701972079904843">"ခရမ်း"</string>
<string name="sim_no_inserted_msg" msgid="7272710974813741735">"ဆင်းမ် ကဒ်များ မထည့်သွင်းရသေး"</string>
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ကို သုံးရန် လေယာဉ်ပျံမုဒ်ကို ပိတ်သည်"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"ကင်မရာသုံးခွင့်"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"မိုက်ခရိုဖုန်းသုံးခွင့်"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"အက်ပ်နှင့် ဝန်ဆောင်မှုများအတွက်"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"အက်ပ်နှင့် ဝန်ဆောင်မှုများအတွက်။ ဤဆက်တင်ကို ပိတ်ထားသော်လည်း အရေးပေါ် နံပါတ်ကို သင်ခေါ်ဆိုချိန်တွင် မိုက်ခရိုဖုန်းဒေတာကို မျှဝေနိုင်သေးသည်။"</string>
<string name="game_settings_title" msgid="1028178627743422090">"ဂိမ်း ဆက်တင်များ"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ဂိမ်းဒက်ရှ်ဘုတ် ဖြတ်လမ်းလင့်ခ်ကို ဖွင့်ခြင်း စသည်"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"ယခင်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e234017..5edcff5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Slå av flymodus for å bruke UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kameratilgang"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofontilgang"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"For apper og tjenester"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"For apper og tjenester. Hvis denne innstillingen er av, kan mikrofondata fremdeles deles når du ringer et nødnummer."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Spillinnstillinger"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Slå på Spilloversikt-snarvei osv."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Forrige"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 02a496e..d81aa83 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB प्रयोग गर्न हवाइजहाज मोड अफ गर्नुहोस्"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"क्यामेरा प्रयोग गर्ने अनुमति"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"माइक्रोफोन प्रयोग गर्ने अनुमति"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"एप र सेवाहरूका लागि"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"एप र सेवाहरूका लागि। यो सेटिङ अफ गरिएको अवस्थामा तपाईंले आपत्कालीन नम्बरमा कल गर्नुभयो भने माइक्रोफोनसम्बन्धी डेटा अझै पनि सेयर गरिन सक्छ।"</string>
<string name="game_settings_title" msgid="1028178627743422090">"गेमका सेटिङ"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"गेम ड्यासबोर्डको सर्टकटलगायतका सुविधाहरू अन गर्नुहोस्"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"अघिल्लो"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 40ba5da..8718c7a 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ବ୍ୟବହାର କରିବାକୁ ଏୟାରପ୍ଲେନ୍ ମୋଡ୍ ବନ୍ଦ କରନ୍ତୁ"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"କ୍ୟାମେରା ଆକ୍ସେସ୍"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"ମାଇକ୍ରୋଫୋନ୍ ଆକ୍ସେସ୍"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ଆପ ଓ ସେବାଗୁଡ଼ିକ ପାଇଁ"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ଆପ ଓ ସେବାଗୁଡ଼ିକ ପାଇଁ। ଯଦି ଏହି ସେଟିଂ ବନ୍ଦ ଥାଏ, ତେବେ ଆପଣ ଏକ ଜରୁରୀକାଳୀନ ନମ୍ବରକୁ କଲ କରିବା ସମୟରେ ମାଇକ୍ରୋଫୋନ ଡାଟା ଏବେ ବି ସେୟାର କରାଯାଇପାରେ।"</string>
<string name="game_settings_title" msgid="1028178627743422090">"ଗେମ୍ ସେଟିଂସ୍"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ଗେମ୍ ଡ୍ୟାସବୋର୍ଡ ସର୍ଟକଟ୍ ଇତ୍ୟାଦି ଚାଲୁ କରନ୍ତୁ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"ପୂର୍ବବର୍ତ୍ତୀ"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 807ac6d..11f47f4 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2624,9 +2624,9 @@
<string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਿਤ ਕਰਨੀ ਹੈ?"</string>
<string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</string>
<string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ਇਹ ਐਪ ਬੈਟਰੀ ਨੂੰ ਸੁਯੋਗ ਕਰੋ \'ਤੇ ਸੈੱਟ ਨਾ ਕੀਤੀ ਹੋਣ ਕਰਕੇ, ਤੁਸੀਂ ਇਸ \'ਤੇ ਪਾਬੰਧੀ ਨਹੀਂ ਲਗਾ ਸਕਦੇ।\n\nਐਪ \'ਤੇ ਪਾਬੰਧੀ ਲਗਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਬੈਟਰੀ ਸੁਯੋਗਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
- <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ"</string>
+ <string name="manager_battery_usage_unrestricted_title" msgid="2426486290463258032">"ਅਣ-ਪ੍ਰਤਿਬੰਧਿਤ"</string>
<string name="manager_battery_usage_optimized_title" msgid="8080765739761921817">"ਸੁਯੋਗ ਬਣਾਈ ਗਈ"</string>
- <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ਪਾਬੰਦੀਸ਼ੁਦਾ"</string>
+ <string name="manager_battery_usage_restricted_title" msgid="7702863764130323118">"ਪ੍ਰਤਿਬੰਧਿਤ"</string>
<string name="manager_battery_usage_unrestricted_summary" msgid="6819279865465667692">"ਪਾਬੰਦੀਆਂ ਤੋਂ ਬਿਨਾਂ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤੋਂ ਦੀ ਆਗਿਆ ਦਿਓ। ਵੱਧ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਹੋ ਸਕਦੀ ਹੈ।"</string>
<string name="manager_battery_usage_optimized_summary" msgid="1332545476428039900">"ਆਪਣੀ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਸੁਯੋਗ ਬਣਾਓ। ਜ਼ਿਆਦਾਤਰ ਐਪਾਂ ਲਈ ਸਿਫ਼ਾਰਸ਼ੀ।"</string>
<string name="manager_battery_usage_restricted_summary" msgid="8324695640704416905">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਹੋਣ \'ਤੇ ਬੈਟਰੀ ਵਰਤੋਂ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਓ। ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਐਪ ਉਮੀਦ ਮੁਤਾਬਕ ਕੰਮ ਨਾ ਕਰੇ। ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਦੇਰੀ ਹੋ ਸਕਦੀ ਹੈ।"</string>
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"ਕੈਮਰਾ ਪਹੁੰਚ"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਪਹੁੰਚ"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਲਈ"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਲਈ। ਇਸ ਸੈਟਿੰਗ ਦੇ ਬੰਦ ਹੋਣ \'ਤੇ, ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਐਮਰਜੈਂਸੀ ਨੰਬਰ \'ਤੇ ਕਾਲ ਕਰਦੇ ਹੋ ਤਾਂ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਡਾਟੇ ਨੂੰ ਫਿਰ ਵੀ ਸਾਂਝਾ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।"</string>
<string name="game_settings_title" msgid="1028178627743422090">"ਗੇਮ ਸੈਟਿੰਗਾਂ"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ਗੇਮ ਡੈਸ਼ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ, ਆਦਿ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"ਪਿੱਛੇ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2af1a3a..aed4639 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -5742,10 +5742,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Aby użyć UWB, wyłącz tryb samolotowy"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Dostęp do aparatu"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Dostęp do mikrofonu"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Aplikacje i usługi"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Aplikacje i usługi. Jeśli wyłączysz to ustawienie, dane mikrofonu wciąż mogą być udostępniane podczas połączenia z numerem alarmowym."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Ustawienia gier"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Włączanie skrótu do panelu gier i inne ustawienia"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Wstecz"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 9132577..995d38a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -5655,10 +5655,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Dezactivați modul Avion pentru a folosi UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Acces la cameră"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Acces la microfon"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Pentru aplicații și servicii"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Pentru aplicații și servicii. Chiar dacă setarea este dezactivată, datele de la microfon pot fi trimise când apelați un număr de urgență."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Setări de joc"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Activați comanda rapidă din Tabloul de bord al jocului, etc."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Înapoi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index bd86130..b2b4e5a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -5742,10 +5742,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Выключает режим полета, чтобы использовать сверхширокополосную связь"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Доступ к камере"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Доступ к микрофону"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Для приложений и сервисов"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Для приложений и сервисов. Даже если эта функция отключена, данные микрофона могут передаваться при звонке на номер экстренной службы."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Настройки игр"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Включение ярлыков игровой панели и т. п."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index c3cdf23..f93dba3 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB භාවිත කිරීමට ගුවන් යානා ප්රකාරය ක්රියාවිරහිත කරන්න"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"කැමරා ප්රවේශය"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"මයික්රෆෝන ප්රවේශය"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"යෙදුම් සහ සේවා සඳහා"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"යෙදුම් සහ සේවා සඳහා. මෙම සැකසීම ක්රියාවිරහිත නම්, ඔබ හදිසි ඇමතුම් අංකයක් අමතන විට මයික්රෆෝනයේ දත්ත තවම බෙදා ගත හැකිය."</string>
<string name="game_settings_title" msgid="1028178627743422090">"ක්රීඩා සැකසීම්"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"ක්රීඩා උපකරණ පුවරු කෙටි මං ආදිය ක්රියාත්මක කරන්න"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"පෙර"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 38a32fe..98c1d88 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -5744,10 +5744,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Ak chcete používať UWB, vypnite režim v lietadle"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Prístup k fotoaparátu"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Prístup k mikrofónu"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Pre aplikácie a služby"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Pre aplikácie a služby. Keď je toto nastavenie vypnuté a zavoláte na tiesňovú linku, môžu sa stále zdieľať údaje mikrofónu."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Nastavenia hier"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Zapnutie odkazu na herný panel a podobne"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Naspäť"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 688ef20..d3c0529 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -5744,10 +5744,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Če želite uporabljati UWB, izklopite način za letalo."</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Dostop do fotoaparata"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Dostop do mikrofona"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Za aplikacije in storitve"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Za aplikacije in storitve. Če je ta nastavitev izklopljena, bodo podatki mikrofona morda še vedno deljeni, ko pokličete številko za klic v sili."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Nastavitve iger"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Vklop bližnjice na nadzorni plošči igre itd."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Nazaj"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index e2ae4ec..29f184d 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Çaktivizo \"Modalitetin e aeroplanit\" për të përdorur UWB."</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Qasja te kamera"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Qasja te mikrofoni"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Për aplikacionet dhe shërbimet"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Për aplikacionet dhe shërbimet. Nëse ky cilësim është joaktiv, të dhënat e mikrofonit mund të vazhdojnë të ndahen kur telefonon një numër urgjence."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Cilësimet e lojërave"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Aktivizo shkurtoren e \"Panelit të lojës\" etj."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Prapa"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c294243..c3fb175 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Inaktivera flygplansläge för att använda UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kameraåtkomst"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofonåtkomst"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"För appar och tjänster"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"För appar och tjänster. Om inställningen är inaktiverad kan mikrofondata fortfarande delas när du ringer ett nödnummer."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Spelinställningar"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Aktivera genväg i Spelöversikt med mera"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Föregående"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f849d22..3e714a9c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -5565,10 +5565,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Zima hali ya ndegeni ili utumie Bendi Pana Zaidi"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Ufikiaji wa kamera"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Ufikiaji wa maikrofoni"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Kwenye programu na huduma"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Kwenye programu na huduma. Mipangilio hii ikizimwa, huenda bado data ya maikrofoni ikashirikiwa unapopigia nambari ya dharura."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Mipangilio ya michezo"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Washa Njia ya mkato ya Dashibodi ya michezo, n.k."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Uliotangulia"</string>
diff --git a/res/values-sw300dp-land-v31/dimens.xml b/res/values-sw300dp-land-v31/dimens.xml
deleted file mode 100644
index fa7d2bf..0000000
--- a/res/values-sw300dp-land-v31/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 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>
- <!-- Top margin for preview view pager -->
- <dimen name="preview_size_top_margin">0dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 959fb89..f94006a 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWBని ఉపయోగించడానికి విమానం మోడ్ను ఆఫ్ చేయండి"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"కెమెరా యాక్సెస్"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"మైక్రోఫోన్ యాక్సెస్"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"యాప్లు, సర్వీస్ల కోసం"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"యాప్లు, సర్వీస్ల కోసం. ఈ సెట్టింగ్ ఆఫ్ చేయబడితే, మీరు ఎమర్జెన్సీ నంబర్కు కాల్ చేసినప్పుడు మైక్రోఫోన్ డేటా ఇప్పటికీ షేర్ చేయబడవచ్చు."</string>
<string name="game_settings_title" msgid="1028178627743422090">"గేమ్ సెట్టింగ్లు"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"గేమ్ డ్యాష్బోర్డ్ షార్ట్కట్ మొదలైనవాటిని ఆన్ చేయండి"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"మునుపటి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a1bb21f..c01a37f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"ปิดโหมดบนเครื่องบินเพื่อใช้ UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"สิทธิ์เข้าถึงกล้อง"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"สิทธิ์เข้าถึงไมโครโฟน"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"สำหรับแอปและบริการ"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"สำหรับแอปและบริการ หากปิดการตั้งค่านี้ ระบบอาจยังคงแชร์ข้อมูลไมโครโฟนเมื่อคุณโทรหาหมายเลขฉุกเฉิน"</string>
<string name="game_settings_title" msgid="1028178627743422090">"การตั้งค่าเกม"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"เปิดทางลัดสำหรับแดชบอร์ดเกม ฯลฯ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"ก่อนหน้า"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index debddab..d3be700 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"I-off ang airplane mode para magamit ang UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Access sa camera"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Access sa mikropono"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Para sa mga app at serbisyo"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Para sa mga app at serbisyo. Kung naka-off ang setting na ito, posible pa ring ibahagi ang data ng mikropono kapag tumawag ka sa isang pang-emergency na numero."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Mga setting ng laro"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"I-on ang shortcut ng Game Dashboard, atbp."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Nakaraan"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b6781bb..c3bcfbc 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Ultra Geniş Bant\'ı kullanmak için uçak modunu kapatın"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kamera erişimi"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofon erişimi"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Uygulamalar ve hizmetler için"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Uygulamalar ve hizmetler için. Bu ayar kapalıyken bir acil durum numarasını aradığınızda mikrofon verileri paylaşılmaya devam edebilir."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Oyun ayarları"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Oyun Paneli kısayolu gibi işlevleri açın"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Önceki"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b386962..978fbd5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -5742,10 +5742,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Коли пристрій використовує UWB, режим польоту вимикається"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Доступ до камери"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Доступ до мікрофона"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Для додатків і сервісів"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Для додатків і сервісів. Якщо це налаштування вимкнено, дані мікрофона можуть усе одно передаватися під час виклику екстреного номера."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Налаштування ігор"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Увімкнути ярлик ігрової панелі тощо"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Назад"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 67b6c9f..91e0cd1 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2683,8 +2683,8 @@
<string name="battery_tip_limited_temporarily_title" msgid="5231061779363606924">"چارجنگ عارضی طور پر محدود ہے"</string>
<string name="battery_tip_limited_temporarily_summary" msgid="8504402301403419444">"آپ کی بیٹری کو محفوظ رکھنے کے لیے۔ مزید جانیں۔"</string>
<string name="battery_tip_limited_temporarily_dialog_resume_charge" msgid="2302295458913832342">"چارج کرنا دوبارہ شروع کریں"</string>
- <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"اعلی درجہ حرارت اور چارجنگ کی طویل مدتوں جیسی مخصوص شرائط میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان شرائط کے ختم ہونے پر آپ کا فون عام طور پر خودکار طور پر چارج ہوگا۔"</string>
- <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"اعلی درجہ حرارت اور چارجنگ کی طویل مدتوں جیسی مخصوص شرائط میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان شرائط کے ختم ہونے پر آپ کا ٹیبلیٹ عام طور پر خودکار طور پر چارج ہوگا۔"</string>
+ <string name="battery_tip_limited_temporarily_dialog_msg" product="default" msgid="8125639486214812735">"بہت زیادہ درجہ حرارت اور چارجنگ کی طویل مدتوں جیسے مخصوص حالات میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان حالات کے ختم ہونے پر آپ کا فون نارمل طریقے سے خودکار طور پر چارج ہوگا۔"</string>
+ <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet" msgid="3890877885222574553">"بہت زیادہ درجہ حرارت اور چارجنگ کی طویل مدتوں جیسے مخصوص حالات میں، چارجنگ بیٹری کی صحت کی حفاظت میں مدد کے لیے <xliff:g id="PERCENT">%1$s</xliff:g> تک محدود ہو سکتی ہے۔\n\nان حالات کے ختم ہونے پر آپ کا ٹیبلیٹ نارمل طریقے سے خودکار طور پر چارج ہوگا۔"</string>
<string name="battery_tip_dialog_message" product="default" msgid="4592387206991500075">"کیونکہ آپ نے اپنا فون معمول سے زیادہ استعمال کیا ہے آپ کی بیٹری اس سے معمول کے مطابق پہلے ختم ہو سکتی ہے\n\nبیشتر بیٹری استعمال کرنے والی ایپس:"</string>
<string name="battery_tip_dialog_message" product="tablet" msgid="111303605119856034">"کیونکہ آپ نے اپنا ٹیبلیٹ معمول سے زیادہ استعمال کیا ہے آپ کی بیٹری اس سے معمول کے مطابق پہلے ختم ہو سکتی ہے\n\nبیشتر بیٹری استعمال کرنے والی ایپس:"</string>
<string name="battery_tip_dialog_message" product="device" msgid="3896805213768863874">"کیونکہ آپ نے اپنا آلہ معمول سے زیادہ استعمال کیا ہے آپ کی بیٹری اس سے معمول کے مطابق پہلے ختم ہو سکتی ہے\n\nبیشتر بیٹری استعمال کرنے والی ایپس:"</string>
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB کا استعمال کرنے کیلئے ہوائی جہاز وضع آف کریں"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"کیمرا تک رسائی"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"مائیکروفون تک رسائی"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"ایپس اور سروسز کے لیے"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"ایپس اور سروسز کے لیے۔ اگر یہ ترتیب آف ہو تو آپ کے ایمرجنسی نمبر پر کال کرتے وقت بھی مائیکروفون کے ڈیٹا کا اشتراک کیا جا سکتا ہے۔"</string>
<string name="game_settings_title" msgid="1028178627743422090">"گیم کی ترتیبات"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"گیم ڈیش بورڈ شارٹ کٹ آن کریں، وغیرہ"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"پچھلا"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 207bb69..b1d4bf2 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -5566,10 +5566,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"UWB ishlatish uchun parvoz rejimini faolsizlantiring"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Kameraga ruxsat"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Mikrofonga ruxsat"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Ilovalar va xizmatlar uchun"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Ilovalar va xizmatlar uchun. Bu sozlama yoqilmasa, favqulodda xizmat raqamiga telefon qilganingizda mikrofon maʼlumotlari hamon ulashilishi mumkin."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Oʻyin sozlamalari"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Oʻyinlar boshqaruv paneli va boshqa yorliqlarni yoqish"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Avvalgisi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ddc6eef..2caee9c 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -5566,10 +5566,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Tắt chế độ trên máy bay để dùng UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Truy cập máy ảnh"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Quyền truy cập vào micrô"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Đối với các ứng dụng và dịch vụ"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Đối với các ứng dụng và dịch vụ. Nếu chế độ cài đặt này tắt, dữ liệu thu được qua micrô vẫn có thể được chia sẻ khi bạn gọi đến số khẩn cấp."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Cài đặt trò chơi"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Bật lối tắt trên Trang tổng quan trò chơi, v.v."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Trước"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9cd7f1a..e4570e0 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -5564,10 +5564,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"会关闭飞行模式，以使用超宽带 (UWB)"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"摄像头使用权限"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"麦克风使用权限"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"对于应用和服务"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"对于应用和服务。如果您关闭此设置，那么当您拨打紧急电话号码时，系统可能仍会分享麦克风数据。"</string>
<string name="game_settings_title" msgid="1028178627743422090">"游戏设置"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"开启游戏信息中心快捷方式等"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"上一页"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 4dadab0..4501845 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -5567,10 +5567,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"請關閉飛行模式，以便使用 UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"相機存取權"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"麥克風存取權"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"應用程式和服務"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"應用程式和服務。關閉此設定後，系統仍可能會在您撥打緊急電話號碼時分享麥克風資料。"</string>
<string name="game_settings_title" msgid="1028178627743422090">"遊戲設定"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"開啟遊戲資訊主頁捷徑等等"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"返回"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8daeb84..bedf1df 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -5566,10 +5566,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"請關閉飛航模式，以便使用 UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"相機存取權"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"麥克風存取權"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"用於應用程式和服務"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"用於應用程式和服務。如果關閉這項設定，系統仍會在你撥打緊急電話號碼時提供麥克風的資料。"</string>
<string name="game_settings_title" msgid="1028178627743422090">"遊戲設定"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"開啟遊戲資訊主頁捷徑等等"</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"返回"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 296a949..baa0865 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -5565,10 +5565,8 @@
<string name="uwb_settings_summary_airplane_mode" msgid="1328864888135086484">"Vala imodi yendiza ukuze usebenzise i-UWB"</string>
<string name="camera_toggle_title" msgid="8952668677727244992">"Ukufinyelela kwekhamera"</string>
<string name="mic_toggle_title" msgid="265145278323852547">"Ukufinyelela kwemakrofoni"</string>
- <!-- no translation found for cam_toggle_description (9212762204005146404) -->
- <skip />
- <!-- no translation found for mic_toggle_description (484139688645092237) -->
- <skip />
+ <string name="cam_toggle_description" msgid="9212762204005146404">"Okwama-app namasevisi"</string>
+ <string name="mic_toggle_description" msgid="484139688645092237">"Okwama-app namasevisi. Uma leli sethingi livaliwe, idatha yemakrofoni ingabiwa uma ushayela inombolo yezimo eziphuthumayo."</string>
<string name="game_settings_title" msgid="1028178627743422090">"Amasethingi egeyimu"</string>
<string name="game_settings_summary" msgid="2548056479103747555">"Vula isinqamuleli Sedeshibhodi Yegeyimu, njjl."</string>
<string name="previous_page_content_description" msgid="6438292457923282991">"Okwangaphambilini"</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 5411264..35e2ce3 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -529,6 +529,9 @@
<!-- Whether to show Smart Storage toggle -->
<bool name="config_show_smart_storage_toggle">true</bool>
+ <!-- Whether suw to support two panes -->
+ <bool name="config_suw_supported_two_panes">false</bool>
+
<!-- Display settings screen, Color mode options. Must be the same length and order as
config_color_mode_options_values below. Only the values that also appear in
frameworks/base/core/res/res/values/config.xml's config_availableColorModes are shown. -->
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 91ad937..df30d8b 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -16,6 +16,10 @@
package com.android.settings;
+import static android.provider.Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY;
+import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY;
+import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI;
+
import static com.android.settings.applications.appinfo.AppButtonsPreferenceController.KEY_REMOVE_TASK_WHEN_FINISHING;
import android.app.ActionBar;
@@ -61,6 +65,7 @@
import com.android.settings.core.gateway.SettingsGateway;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.homepage.SettingsHomepageActivity;
+import com.android.settings.homepage.SliceDeepLinkHomepageActivity;
import com.android.settings.homepage.TopLevelSettings;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.wfd.WifiDisplaySettings;
@@ -140,6 +145,12 @@
":settings:show_fragment_as_subsetting";
/**
+ * Additional extra of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
+ * Set true when the deep link intent is from a slice
+ */
+ public static final String EXTRA_IS_FROM_SLICE = "is_from_slice";
+
+ /**
* Personal or Work profile tab of {@link ProfileSelectFragment}
* <p>0: Personal tab.
* <p>1: Work profile tab.
@@ -363,15 +374,34 @@
return false;
}
+ final Intent detailIntent = new Intent(intent);
// It's a deep link intent, SettingsHomepageActivity will set SplitPairRule and start it.
- final Intent trampolineIntent =
- new Intent(android.provider.Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);
- trampolineIntent.replaceExtras(intent);
+ final Intent trampolineIntent = new Intent(ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY);
+
+ trampolineIntent.replaceExtras(detailIntent);
+
+ // Relay detail intent data to prevent failure of Intent#ParseUri.
+ // If Intent#getData() is not null, Intent#toUri will return an Uri which has the scheme of
+ // Intent#getData() and it may not be the scheme of an Intent.
trampolineIntent.putExtra(
- android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI,
- intent.toUri(Intent.URI_INTENT_SCHEME));
- trampolineIntent.putExtra(
- android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY,
+ SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA,
+ detailIntent.getData());
+ detailIntent.setData(null);
+
+ trampolineIntent.putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI,
+ detailIntent.toUri(Intent.URI_INTENT_SCHEME));
+
+ if (detailIntent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) {
+ trampolineIntent.setClass(this, SliceDeepLinkHomepageActivity.class);
+ // Get menu key for slice deep link case.
+ final String highlightMenuKey = detailIntent.getStringExtra(
+ EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY);
+ if (!TextUtils.isEmpty(highlightMenuKey)) {
+ mHighlightMenuKey = highlightMenuKey;
+ }
+ }
+
+ trampolineIntent.putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY,
mHighlightMenuKey);
trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
startActivity(trampolineIntent);
@@ -391,6 +421,12 @@
return false;
}
+ if (intent.getBooleanExtra(EXTRA_IS_FROM_SLICE, false)) {
+ // Slice deep link starts the Intent using SubSettingLauncher. Returns true to show
+ // 2-pane deep link.
+ return true;
+ }
+
if (isSubSettings(intent)) {
return false;
}
diff --git a/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivity.java
index 026eca3..7894c6e 100644
--- a/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivity.java
@@ -21,6 +21,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
+import android.widget.LinearLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -69,7 +70,7 @@
? R.style.SudDynamicColorThemeGlifV3_DayNight : R.style.SudThemeGlifV3_DayNight;
setTheme(appliedTheme);
setContentView(R.layout.accessibility_screen_size_setup_wizard);
- generateHeader();
+ updateHeaderLayout();
scrollToBottom();
initFooterButton();
if (savedInstanceState == null) {
@@ -101,7 +102,15 @@
}
@VisibleForTesting
- void generateHeader() {
+ void updateHeaderLayout() {
+ if (ThemeHelper.shouldApplyExtendedPartnerConfig(this) && isSuwSupportedTwoPanes()) {
+ final GlifLayout layout = findViewById(R.id.setup_wizard_layout);
+ final LinearLayout headerLayout = layout.findManagedViewById(R.id.sud_layout_header);
+ if (headerLayout != null) {
+ headerLayout.setPadding(0, layout.getPaddingTop(), 0,
+ layout.getPaddingBottom());
+ }
+ }
((TextView) findViewById(R.id.suc_layout_title)).setText(
getFragmentType(getIntent()) == FragmentType.FONT_SIZE
? R.string.title_font_size
@@ -112,6 +121,10 @@
: R.string.screen_zoom_short_summary);
}
+ private boolean isSuwSupportedTwoPanes() {
+ return getResources().getBoolean(R.bool.config_suw_supported_two_panes);
+ }
+
private void initFooterButton() {
final GlifLayout layout = findViewById(R.id.setup_wizard_layout);
final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
index ce3d294..d204bb7 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceController.java
@@ -23,6 +23,7 @@
import android.os.UserHandle;
import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -57,4 +58,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
index ca3befa..dd6edeb 100644
--- a/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilitySlicePreferenceController.java
@@ -26,6 +26,7 @@
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -98,6 +99,11 @@
return true;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+
private AccessibilityServiceInfo getAccessibilityServiceInfo() {
final AccessibilityManager accessibilityManager = mContext.getSystemService(
AccessibilityManager.class);
diff --git a/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
index 1f91a87..5630dd9 100644
--- a/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
+++ b/src/com/android/settings/accessibility/DisableAnimationsPreferenceController.java
@@ -22,6 +22,7 @@
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class DisableAnimationsPreferenceController extends TogglePreferenceController {
@@ -71,4 +72,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java b/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
index 97f96a4..b59b3b2 100644
--- a/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
+++ b/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
@@ -20,6 +20,7 @@
import android.graphics.fonts.FontStyle;
import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/** PreferenceController for displaying all text in bold. */
@@ -47,4 +48,9 @@
return Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.FONT_WEIGHT_ADJUSTMENT, (isChecked ? BOLD_TEXT_ADJUSTMENT : 0));
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java b/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
index f4474d6..e98a28c 100644
--- a/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
+++ b/src/com/android/settings/accessibility/HighTextContrastPreferenceController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class HighTextContrastPreferenceController extends TogglePreferenceController {
@@ -43,4 +44,9 @@
return Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, (isChecked ? 1 : 0));
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java b/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
index a7ee3d5..0220245 100644
--- a/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
+++ b/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java
@@ -21,6 +21,7 @@
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class LargePointerIconPreferenceController extends TogglePreferenceController {
@@ -50,4 +51,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java b/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
index a9716d5..5ed4b5c 100644
--- a/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
+++ b/src/com/android/settings/accessibility/LockScreenRotationPreferenceController.java
@@ -23,6 +23,7 @@
import com.android.internal.view.RotationPolicy;
import com.android.internal.view.RotationPolicy.RotationPolicyListener;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -62,6 +63,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+
+ @Override
public void onStop() {
if (mRotationPolicyListener != null) {
RotationPolicy.unregisterRotationPolicyListener(mContext, mRotationPolicyListener);
diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
index 900e280..37d09a7 100644
--- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
@@ -77,6 +77,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+
+ @Override
public CharSequence getSummary() {
int resId = 0;
if (mIsFromSUW) {
diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
index 9813bde..98855f7 100644
--- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
@@ -83,6 +83,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+
+ @Override
public CharSequence getSummary() {
int resId = 0;
if (mIsFromSUW) {
diff --git a/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java b/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
index 9ea9644..d409fa4 100644
--- a/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
+++ b/src/com/android/settings/accessibility/PowerButtonEndsCallPreferenceController.java
@@ -21,6 +21,7 @@
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
+import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
@@ -51,4 +52,9 @@
return !KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_POWER)
|| !Utils.isVoiceCapable(mContext) ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
index bf12bde..5e69da7 100644
--- a/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
+++ b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
@@ -20,6 +20,7 @@
import android.os.UserHandle;
import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -47,4 +48,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
index 62051c1..7550a30 100644
--- a/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
@@ -22,6 +22,7 @@
import androidx.preference.Preference;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/** PreferenceController for persisting feature activation state after a restart. */
@@ -62,4 +63,9 @@
super.updateState(preference);
preference.setEnabled(mColorDisplayManager.isReduceBrightColorsActivated());
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
}
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
index d886a59..ca91219 100644
--- a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
@@ -95,6 +95,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accessibility;
+ }
+
+ @Override
public void onStart() {
mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED),
diff --git a/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java b/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
index 863e790..3dc05ef 100644
--- a/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
+++ b/src/com/android/settings/accounts/CrossProfileCalendarPreferenceController.java
@@ -22,6 +22,7 @@
import android.provider.Settings;
import android.util.Log;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import java.util.Set;
@@ -71,6 +72,11 @@
CROSS_PROFILE_CALENDAR_ENABLED, value, mManagedUser.getIdentifier());
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_accounts;
+ }
+
static boolean isCrossProfileCalendarDisallowedByAdmin(Context context, int userId) {
final Context managedProfileContext = createPackageContextAsUser(context, userId);
final DevicePolicyManager dpm = managedProfileContext.getSystemService(
diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java
index f16bc3f..a6fa15a 100644
--- a/src/com/android/settings/accounts/ManagedProfileSettings.java
+++ b/src/com/android/settings/accounts/ManagedProfileSettings.java
@@ -16,33 +16,25 @@
package com.android.settings.accounts;
-import android.app.admin.DevicePolicyManager;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.util.Log;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
/**
* Setting page for managed profile.
diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
index d57c0c2..974ec2c 100644
--- a/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
+++ b/src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java
@@ -41,7 +41,7 @@
/** A class to initialize split rules for activity embedding. */
public class ActivityEmbeddingRulesController {
- private static final String TAG = "ActivityEmbeddingCtrl ";
+ private static final String TAG = "ActivityEmbeddingCtrl";
private final Context mContext;
private final SplitController mSplitController;
@@ -63,13 +63,6 @@
// Set a placeholder for home page.
registerHomepagePlaceholderRule();
- // Set subsettings rule.
- registerTwoPanePairRule(mContext,
- getComponentName(Settings.class),
- getComponentName(SubSettings.class),
- null /* secondaryIntentAction */,
- true /* finishPrimaryWithSecondary */,
- true /* finishSecondaryWithPrimary */);
}
/** Register a SplitPairRule for 2-pane. */
@@ -78,7 +71,8 @@
ComponentName secondaryComponent,
String secondaryIntentAction,
boolean finishPrimaryWithSecondary,
- boolean finishSecondaryWithPrimary) {
+ boolean finishSecondaryWithPrimary,
+ boolean clearTop) {
final Set<SplitPairFilter> filters = new HashSet<>();
filters.add(new SplitPairFilter(primaryComponent, secondaryComponent,
secondaryIntentAction));
@@ -86,13 +80,28 @@
SplitController.getInstance().registerRule(new SplitPairRule(filters,
finishPrimaryWithSecondary,
finishSecondaryWithPrimary,
- true /* clearTop */,
+ clearTop,
ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(context),
ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(context),
ActivityEmbeddingUtils.SPLIT_RATIO,
LayoutDirection.LOCALE));
}
+ /** Register a SplitPairRule for SubSettings if the device supports 2-pane. */
+ public static void registerSubSettingsPairRuleIfNeeded(Context context, boolean clearTop) {
+ if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(context)) {
+ return;
+ }
+
+ registerTwoPanePairRule(context,
+ getComponentName(context, Settings.class),
+ getComponentName(context, SubSettings.class),
+ null /* secondaryIntentAction */,
+ true /* finishPrimaryWithSecondary */,
+ true /* finishSecondaryWithPrimary */,
+ clearTop);
+ }
+
private void registerHomepagePlaceholderRule() {
final Set<ActivityFilter> activityFilters = new HashSet<>();
addActivityFilter(activityFilters, SettingsHomepageActivity.class);
@@ -119,11 +128,6 @@
null /* intentAction */));
}
- private void addActivityFilter(Set<ActivityFilter> activityFilters, Intent intent) {
- activityFilters.add(new ActivityFilter(new ComponentName("*" /* pkg */, "*" /* cls */),
- intent.getAction()));
- }
-
private void addActivityFilter(Set<ActivityFilter> activityFilters,
ComponentName componentName) {
activityFilters.add(new ActivityFilter(componentName, null /* intentAction */));
@@ -131,6 +135,12 @@
@NonNull
private ComponentName getComponentName(Class<? extends Activity> activityClass) {
- return new ComponentName(mContext.getPackageName(), activityClass.getName());
+ return getComponentName(mContext, activityClass);
+ }
+
+ @NonNull
+ private static ComponentName getComponentName(Context context,
+ Class<? extends Activity> activityClass) {
+ return new ComponentName(context.getPackageName(), activityClass.getName());
}
}
diff --git a/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java b/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
index 77abfe7..1d395ee 100644
--- a/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
+++ b/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class InstantAppWebActionPreferenceController extends TogglePreferenceController {
@@ -43,4 +44,9 @@
return Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.INSTANT_APPS_ENABLED, isChecked ? 1 : 0);
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_apps;
+ }
}
diff --git a/src/com/android/settings/backup/AutoRestorePreferenceController.java b/src/com/android/settings/backup/AutoRestorePreferenceController.java
index 4dd2eb6..bf63e25 100644
--- a/src/com/android/settings/backup/AutoRestorePreferenceController.java
+++ b/src/com/android/settings/backup/AutoRestorePreferenceController.java
@@ -27,6 +27,7 @@
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
public class AutoRestorePreferenceController extends TogglePreferenceController {
@@ -84,4 +85,9 @@
return result;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
\ No newline at end of file
diff --git a/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java b/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java
index 2da8164..6351621 100644
--- a/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java
+++ b/src/com/android/settings/biometrics/combination/BiometricSettingsAppPreferenceController.java
@@ -91,4 +91,10 @@
public final boolean isSliceable() {
return false;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ // not needed since it's not sliceable
+ return 0;
+ }
}
diff --git a/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java b/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java
index f6f2d5f..4101963 100644
--- a/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java
+++ b/src/com/android/settings/biometrics/combination/BiometricSettingsKeyguardPreferenceController.java
@@ -73,4 +73,10 @@
public final boolean isSliceable() {
return false;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ // not needed since it's not sliceable
+ return 0;
+ }
}
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java
index 36984a2..a8bff6b 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsPreferenceController.java
@@ -51,4 +51,10 @@
public final boolean isSliceable() {
return false;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ // not needed since it's not sliceable
+ return 0;
+ }
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 64e066e..3cea962 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -21,14 +21,13 @@
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
import android.os.Bundle;
-import android.view.OrientationEventListener;
-import android.view.Surface;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.Nullable;
+import com.airbnb.lottie.LottieAnimationView;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
@@ -36,7 +35,6 @@
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.password.ChooseLockSettingsHelper;
-import com.airbnb.lottie.LottieAnimationView;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
@@ -54,10 +52,6 @@
private FingerprintEnrollSidecar mSidecar;
private boolean mNextClicked;
private boolean mCanAssumeUdfps;
- private boolean mCanAssumeSidefps;
-
- private OrientationEventListener mOrientationEventListener;
- private int mPreviousRotation = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -67,7 +61,6 @@
final List<FingerprintSensorPropertiesInternal> props =
fingerprintManager.getSensorPropertiesInternal();
mCanAssumeUdfps = props != null && props.size() == 1 && props.get(0).isAnyUdfpsType();
- mCanAssumeSidefps = props != null && props.size() == 1 && props.get(0).isAnySidefpsType();
setContentView(getContentView());
mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
mFooterBarMixin.setSecondaryButton(
@@ -79,8 +72,6 @@
.build()
);
- listenOrientationEvent();
-
if (mCanAssumeUdfps) {
setHeaderText(R.string.security_settings_udfps_enroll_find_sensor_title);
setDescriptionText(R.string.security_settings_udfps_enroll_find_sensor_message);
@@ -99,28 +90,6 @@
lottieAnimationView.setAnimation(R.raw.udfps_edu_a11y_lottie);
}
- } else if (mCanAssumeSidefps) {
- setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
- setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message);
- final LottieAnimationView lottieAnimationView = findViewById(R.id.illustration_lottie);
- final LottieAnimationView lottieAnimationViewPortrait =
- findViewById(R.id.illustration_lottie_portrait);
- final int rotation = getApplicationContext().getDisplay().getRotation();
- switch(rotation) {
- case Surface.ROTATION_90:
- lottieAnimationView.setVisibility(View.GONE);
- lottieAnimationViewPortrait.setVisibility(View.VISIBLE);
- break;
- case Surface.ROTATION_270:
- lottieAnimationView.setVisibility(View.GONE);
- lottieAnimationViewPortrait.setVisibility(View.VISIBLE);
- lottieAnimationViewPortrait.setRotation(180);
- break;
- default:
- lottieAnimationView.setVisibility(View.VISIBLE);
- lottieAnimationViewPortrait.setVisibility(View.GONE);
- break;
- }
} else {
setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
setDescriptionText(R.string.security_settings_fingerprint_enroll_find_sensor_message);
@@ -251,7 +220,6 @@
@Override
protected void onDestroy() {
- stopListenOrientationEvent();
super.onDestroy();
if (mAnimation != null) {
mAnimation.stopAnimation();
@@ -329,37 +297,4 @@
public int getMetricsCategory() {
return SettingsEnums.FINGERPRINT_FIND_SENSOR;
}
-
- private void listenOrientationEvent() {
- if (!mCanAssumeSidefps) {
- // Do nothing if the device doesn't support SideFPS.
- return;
- }
- mOrientationEventListener = new OrientationEventListener(this) {
- @Override
- public void onOrientationChanged(int orientation) {
- final int currentRotation = getDisplay().getRotation();
- if ((mPreviousRotation == Surface.ROTATION_90
- && currentRotation == Surface.ROTATION_270) || (
- mPreviousRotation == Surface.ROTATION_270
- && currentRotation == Surface.ROTATION_90)) {
- mPreviousRotation = currentRotation;
- recreate();
- }
- }
- };
- mOrientationEventListener.enable();
- mPreviousRotation = getDisplay().getRotation();
- }
-
- private void stopListenOrientationEvent() {
- if (!mCanAssumeSidefps) {
- // Do nothing if the device doesn't support SideFPS.
- return;
- }
- if (mOrientationEventListener != null) {
- mOrientationEventListener.disable();
- }
- mOrientationEventListener = null;
- }
}
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index b09d180..508084d 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -98,7 +98,8 @@
SettingsSlicesContract.KEY_BLUETOOTH).build();
return SliceBuilderUtils.buildSearchResultPageIntent(context,
BluetoothDashboardFragment.class.getName(), null /* key */, screenTitle,
- SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY)
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY,
+ R.string.menu_key_connected_devices)
.setClassName(context.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}
diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java
index c958a93..8b4d6d9 100644
--- a/src/com/android/settings/core/TogglePreferenceController.java
+++ b/src/com/android/settings/core/TogglePreferenceController.java
@@ -89,4 +89,7 @@
public boolean isPublicSlice() {
return false;
}
+
+ @Override
+ public abstract int getSliceHighlightMenuRes();
}
\ No newline at end of file
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 2def817..951eb3c 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -180,7 +180,10 @@
com.android.settings.Settings.class.getName()),
new ComponentName(tile.getPackageName(),
tile.getComponentName()),
- null, true, true);
+ null /* secondaryIntentAction */,
+ true /* finishPrimaryWithSecondary */,
+ true /* finishSecondaryWithPrimary */,
+ true /* clearTop */);
// Highlight preference ui.
final TopLevelSettings topLevelSettings = (TopLevelSettings) fragment;
diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
index e25422f..2bab3e9 100644
--- a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
+++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -118,6 +118,12 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ // not needed since it's not sliceable
+ return 0;
+ }
+
+ @Override
public int getAvailabilityStatus() {
TimeZoneCapabilities timeZoneCapabilities =
getTimeZoneCapabilitiesAndConfig(/* forceRefresh= */ false).getCapabilities();
diff --git a/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
index 3cbf3cb..1c2fcd9 100644
--- a/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
+++ b/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.SystemProperties;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -48,4 +49,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java b/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java
index 38c3208..c3b0624 100644
--- a/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java
+++ b/src/com/android/settings/development/transcode/TranscodeDisableCachePreferenceController.java
@@ -20,6 +20,7 @@
import android.os.SystemProperties;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -50,4 +51,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
index c15806d..b2d446e 100644
--- a/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
+++ b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.SystemProperties;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -49,4 +50,9 @@
SystemProperties.set(TRANSCODE_ENABLED_PROP_KEY, String.valueOf(isChecked));
return true;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
index fd5ec5a..6b6692e 100644
--- a/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
+++ b/src/com/android/settings/development/transcode/TranscodeNotificationPreferenceController.java
@@ -20,6 +20,7 @@
import android.os.SystemProperties;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -50,4 +51,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
index 49456ff..ce82293 100644
--- a/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
+++ b/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.os.SystemProperties;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -48,4 +49,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/display/AlwaysOnDisplaySlice.java b/src/com/android/settings/display/AlwaysOnDisplaySlice.java
index 27374ef..c66f4ed 100644
--- a/src/com/android/settings/display/AlwaysOnDisplaySlice.java
+++ b/src/com/android/settings/display/AlwaysOnDisplaySlice.java
@@ -106,4 +106,9 @@
public Intent getIntent() {
return null;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
}
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 7749c8f..bf81727 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -68,6 +68,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public boolean isChecked() {
return getConfig().alwaysOnEnabled(MY_USER);
}
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index e143d73..a5b0aeb 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -25,6 +25,7 @@
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -100,4 +101,9 @@
return mConfig;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
}
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 0018d84..d925de3 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -61,4 +61,9 @@
? R.string.auto_brightness_summary_on
: R.string.auto_brightness_summary_off);
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
}
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index 202a085..5dc2286 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -20,6 +20,7 @@
import androidx.preference.Preference;
import com.android.internal.view.RotationPolicy;
+import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
@@ -87,6 +88,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public boolean isChecked() {
return !RotationPolicy.isRotationLocked(mContext);
}
diff --git a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
index 65fd846..00573a7 100644
--- a/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/ControlsPrivacyPreferenceController.java
@@ -70,6 +70,11 @@
refreshSummary(preference);
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
private boolean isEnabled() {
return isControlsAvailable();
}
diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java
index 98d9a69..d07410e 100644
--- a/src/com/android/settings/display/DarkUIPreferenceController.java
+++ b/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -95,6 +95,11 @@
return mUiModeManager.setNightModeActivated(isChecked);
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
private void showDarkModeDialog() {
final DarkUIInfoDialogFragment frag = new DarkUIInfoDialogFragment();
if (mFragment != null && mFragment.getFragmentManager() != null) {
diff --git a/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java b/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
index 6fc0b0e..805cb08 100644
--- a/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
+++ b/src/com/android/settings/display/DisplayWhiteBalancePreferenceController.java
@@ -21,19 +21,19 @@
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
-import android.os.UserHandle;
import android.provider.Settings.Secure;
import android.provider.Settings.System;
+
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import com.android.settings.core.TogglePreferenceController;
-
public class DisplayWhiteBalancePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnStart, OnStop {
@@ -63,6 +63,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public void onStart() {
if (!isAvailable()) {
return;
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index e6217ff..d0d4822 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -24,6 +24,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -66,6 +67,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index 0f8ecc5..700b601 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -23,6 +23,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
@@ -56,6 +57,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
final SeekBarPreference preference = screen.findPreference(getPreferenceKey());
diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java
index 003373c..df9e849 100644
--- a/src/com/android/settings/display/NightDisplayPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayPreferenceController.java
@@ -96,6 +96,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public void onActivated(boolean activated) {
updateState(mPreference);
}
diff --git a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
index 9b654dc..27ba340 100644
--- a/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
+++ b/src/com/android/settings/display/PeakRefreshRatePreferenceController.java
@@ -120,6 +120,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public void onStart() {
mDeviceConfigDisplaySettings.startListening();
}
diff --git a/src/com/android/settings/display/SmartAutoRotateController.java b/src/com/android/settings/display/SmartAutoRotateController.java
index 61bbd18..b88aa80 100644
--- a/src/com/android/settings/display/SmartAutoRotateController.java
+++ b/src/com/android/settings/display/SmartAutoRotateController.java
@@ -43,6 +43,7 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.view.RotationPolicy;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -157,6 +158,11 @@
return true;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
static boolean isRotationResolverServiceAvailable(Context context) {
final PackageManager packageManager = context.getPackageManager();
final String resolvePackage = packageManager.getRotationResolverPackageName();
diff --git a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
index 849fbe7..afeea80 100644
--- a/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/SmartAutoRotatePreferenceController.java
@@ -22,7 +22,6 @@
import static com.android.settings.display.SmartAutoRotateController.hasSufficientPermission;
import static com.android.settings.display.SmartAutoRotateController.isRotationResolverServiceAvailable;
-import android.text.TextUtils;
import android.app.settings.SettingsEnums;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -32,6 +31,7 @@
import android.os.PowerManager;
import android.os.UserHandle;
import android.provider.Settings;
+import android.text.TextUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -91,6 +91,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(getPreferenceKey());
diff --git a/src/com/android/settings/display/WalletPrivacyPreferenceController.java b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
index 2e78fe3..92580f3 100644
--- a/src/com/android/settings/display/WalletPrivacyPreferenceController.java
+++ b/src/com/android/settings/display/WalletPrivacyPreferenceController.java
@@ -72,6 +72,11 @@
refreshSummary(preference);
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
private boolean isEnabled() {
return mClient.isWalletServiceAvailable();
}
diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java
index f6a79cc..add1b58f 100644
--- a/src/com/android/settings/dream/StartNowPreferenceController.java
+++ b/src/com/android/settings/dream/StartNowPreferenceController.java
@@ -20,6 +20,7 @@
import androidx.preference.Preference;
+import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
@@ -67,4 +68,9 @@
}
return true;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
}
diff --git a/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
index f9fb647..3d6695b 100644
--- a/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
+++ b/src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
@@ -53,6 +53,12 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ // not needed since it's not sliceable
+ return 0;
+ }
+
+ @Override
public boolean isChecked() {
return mEmergencyNumberUtils.getEmergencyGestureSoundEnabled();
}
diff --git a/src/com/android/settings/flashlight/FlashlightSlice.java b/src/com/android/settings/flashlight/FlashlightSlice.java
index bd7f486..f18d712 100644
--- a/src/com/android/settings/flashlight/FlashlightSlice.java
+++ b/src/com/android/settings/flashlight/FlashlightSlice.java
@@ -117,6 +117,12 @@
return null;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ // no landing page in Settings
+ return 0;
+ }
+
private static String getCameraId(Context context) throws CameraAccessException {
final CameraManager cameraManager = context.getSystemService(CameraManager.class);
final String[] ids = cameraManager.getCameraIdList();
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 0d0cdba..b599207 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -283,6 +283,15 @@
}
@Override
+ public void onPause() {
+ super.onPause();
+ if (mEnableTriState) {
+ Log.d(TAG, "Leave with mode: " + getSelectedPreference());
+ mBatteryOptimizeUtils.setAppUsageState(getSelectedPreference());
+ }
+ }
+
+ @Override
public void onDestroy() {
super.onDestroy();
notifyBackupManager();
@@ -374,12 +383,14 @@
footerString = context.getString(R.string.manager_battery_usage_footer);
}
mFooterPreference.setTitle(footerString);
- mFooterPreference.setLearnMoreAction(v ->
- startActivityForResult(HelpUtils.getHelpIntent(context,
- context.getString(R.string.help_url_app_usage_settings),
- /*backupContext=*/ ""), /*requestCode=*/ 0));
- mFooterPreference.setLearnMoreContentDescription(
- context.getString(R.string.manager_battery_usage_link_a11y));
+ final Intent helpIntent = HelpUtils.getHelpIntent(context, context.getString(
+ R.string.help_url_app_usage_settings), /*backupContext=*/ "");
+ if (helpIntent != null) {
+ mFooterPreference.setLearnMoreAction(v ->
+ startActivityForResult(helpIntent, /*requestCode=*/ 0));
+ mFooterPreference.setLearnMoreContentDescription(
+ context.getString(R.string.manager_battery_usage_link_a11y));
+ }
}
@Override
@@ -490,6 +501,18 @@
mOptimizationMode = mBatteryOptimizeUtils.getAppOptimizationMode();
}
+ private int getSelectedPreference() {
+ if (mRestrictedPreference.isChecked()) {
+ return BatteryOptimizeUtils.MODE_RESTRICTED;
+ } else if (mUnrestrictedPreference.isChecked()) {
+ return BatteryOptimizeUtils.MODE_UNRESTRICTED;
+ } else if (mOptimizePreference.isChecked()) {
+ return BatteryOptimizeUtils.MODE_OPTIMIZED;
+ } else {
+ return BatteryOptimizeUtils.MODE_UNKNOWN;
+ }
+ }
+
private CharSequence getAppActiveTime(Bundle bundle) {
final long foregroundTimeMs = bundle.getLong(EXTRA_FOREGROUND_TIME);
final long backgroundTimeMs = bundle.getLong(EXTRA_BACKGROUND_TIME);
diff --git a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
index af16edb..fdbd12a 100644
--- a/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
+++ b/src/com/android/settings/fuelgauge/BatteryBackupHelper.java
@@ -29,8 +29,8 @@
import android.content.pm.UserInfo;
import android.os.Build;
import android.os.IDeviceIdleController;
-import android.os.RemoteException;
import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.UserManager;
@@ -230,7 +230,7 @@
mBatteryOptimizeUtils != null
? mBatteryOptimizeUtils /*testing only*/
: new BatteryOptimizeUtils(mContext, uid, packageName);
- batteryOptimizeUtils.setAppOptimizationMode(mode);
+ batteryOptimizeUtils.setAppUsageState(mode);
Log.d(TAG, String.format("restore:%s mode=%d", packageName, mode));
}
diff --git a/src/com/android/settings/fuelgauge/BatteryChartView.java b/src/com/android/settings/fuelgauge/BatteryChartView.java
index 98cfdc8..ff61fce 100644
--- a/src/com/android/settings/fuelgauge/BatteryChartView.java
+++ b/src/com/android/settings/fuelgauge/BatteryChartView.java
@@ -526,8 +526,9 @@
? mTrapezoidColor
: mSelectedIndex == index || mSelectedIndex == SELECTED_INDEX_ALL
? mTrapezoidSolidColor : mTrapezoidColor;
- final boolean isHover = mHoveredIndex == index && isValidToDraw(mHoveredIndex);
- mTrapezoidPaint.setColor(isHover ? mTrapezoidHoverColor : trapezoidColor);
+ final boolean isHoverState =
+ mIsSlotsClickabled && mHoveredIndex == index && isValidToDraw(mHoveredIndex);
+ mTrapezoidPaint.setColor(isHoverState ? mTrapezoidHoverColor : trapezoidColor);
final float leftTop = round(trapezoidBottom - mLevels[index] * unitHeight);
final float rightTop = round(trapezoidBottom - mLevels[index + 1] * unitHeight);
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
index 3d95395..9306a34 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizeUtils.java
@@ -19,6 +19,7 @@
import android.annotation.IntDef;
import android.app.AppOpsManager;
import android.content.Context;
+import android.os.AsyncTask;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
@@ -89,36 +90,28 @@
return getAppOptimizationMode(mMode, mAllowListed);
}
- public void setAppOptimizationMode(@OptimizationMode int mode) {
- try {
- setAppUsageStateInternal(mode);
- } catch (Exception e) {
- Log.e(TAG, "setAppUsageState() is failed for " + mPackageName, e);
- }
- }
-
/** Sets the {@link OptimizationMode} for associated app. */
- public void setAppUsageStateInternal(@OptimizationMode int mode) {
+ public void setAppUsageState(@OptimizationMode int mode) {
if (getAppOptimizationMode(mMode, mAllowListed) == mode) {
Log.w(TAG, "set the same optimization mode for: " + mPackageName);
return;
}
- switch (mode) {
- case MODE_RESTRICTED:
- mBatteryUtils.setForceAppStandby(mUid, mPackageName, AppOpsManager.MODE_IGNORED);
- mPowerAllowListBackend.removeApp(mPackageName);
- break;
- case MODE_UNRESTRICTED:
- mBatteryUtils.setForceAppStandby(mUid, mPackageName, AppOpsManager.MODE_ALLOWED);
- mPowerAllowListBackend.addApp(mPackageName);
- break;
- case MODE_OPTIMIZED:
- mBatteryUtils.setForceAppStandby(mUid, mPackageName, AppOpsManager.MODE_ALLOWED);
- mPowerAllowListBackend.removeApp(mPackageName);
- break;
- default:
- Log.d(TAG, "set unknown app optimization mode.");
- }
+
+ AsyncTask.execute(() -> {
+ switch (mode) {
+ case MODE_RESTRICTED:
+ setAppOptimizationMode(AppOpsManager.MODE_IGNORED, /* allowListed */ false);
+ break;
+ case MODE_UNRESTRICTED:
+ setAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ true);
+ break;
+ case MODE_OPTIMIZED:
+ setAppOptimizationMode(AppOpsManager.MODE_ALLOWED, /* allowListed */ false);
+ break;
+ default:
+ Log.d(TAG, "set unknown app optimization mode.");
+ }
+ });
}
/**
@@ -142,6 +135,19 @@
return mPackageName == null ? UNKNOWN_PACKAGE : mPackageName;
}
+ private void setAppOptimizationMode(int appStandbyMode, boolean allowListed) {
+ try {
+ mBatteryUtils.setForceAppStandby(mUid, mPackageName, appStandbyMode);
+ if (allowListed) {
+ mPowerAllowListBackend.addApp(mPackageName);
+ } else {
+ mPowerAllowListBackend.removeApp(mPackageName);
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "set OPTIMIZED failed for " + mPackageName, e);
+ }
+ }
+
private void refreshState() {
mPowerAllowListBackend.refreshList();
mAllowListed = mPowerAllowListBackend.isAllowlisted(mPackageName);
diff --git a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java b/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java
index ffec50d..4b1862a 100644
--- a/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/OptimizedPreferenceController.java
@@ -73,12 +73,6 @@
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (!KEY_OPTIMIZED_PREF.equals(preference.getKey())) {
- return false;
- }
-
- mBatteryOptimizeUtils.setAppOptimizationMode(BatteryOptimizeUtils.MODE_OPTIMIZED);
- Log.d(TAG, "Set optimized");
- return true;
+ return getPreferenceKey().equals(preference.getKey());
}
}
diff --git a/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java
index d50926e..5da439d 100644
--- a/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/RestrictedPreferenceController.java
@@ -76,12 +76,6 @@
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (!KEY_RESTRICTED_PREF.equals(preference.getKey())) {
- return false;
- }
-
- mBatteryOptimizeUtils.setAppOptimizationMode(BatteryOptimizeUtils.MODE_RESTRICTED);
- Log.d(TAG, "Set restricted");
- return true;
+ return getPreferenceKey().equals(preference.getKey());
}
}
diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
index 27b70cb..26c0ab9 100644
--- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
@@ -24,6 +24,7 @@
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
@@ -62,6 +63,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_battery;
+ }
+
+ @Override
public void updateState(Preference preference) {
super.updateState(preference);
final boolean smartBatteryOn = Settings.Global.getInt(mContext.getContentResolver(),
diff --git a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java b/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java
index 1d66c6c..40b2f8d 100644
--- a/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/UnrestrictedPreferenceController.java
@@ -74,12 +74,6 @@
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- if (!KEY_UNRESTRICTED_PREF.equals(preference.getKey())) {
- return false;
- }
-
- mBatteryOptimizeUtils.setAppOptimizationMode(BatteryOptimizeUtils.MODE_UNRESTRICTED);
- Log.d(TAG, "Set unrestricted");
- return true;
+ return getPreferenceKey().equals(preference.getKey());
}
}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index 1a7fa38..2979151 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -119,6 +119,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_battery;
+ }
+
+ @Override
public void onPowerSaveModeChanged() {
mHandler.postDelayed(() -> onPowerSaveModeChangedInternal(),
SWITCH_ANIMATION_DURATION);
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
index 6754245..ce2cbb0 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceController.java
@@ -8,6 +8,7 @@
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
@@ -59,4 +60,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_battery;
+ }
}
diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java b/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
index 95fd9f1..159f479 100644
--- a/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
+++ b/src/com/android/settings/gestures/GestureNavigationSettingsAssistController.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -50,4 +51,9 @@
return SystemNavigationPreferenceController.isGestureAvailable(mContext) ? AVAILABLE
: UNSUPPORTED_ON_DEVICE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java
index c771abd..71c3c9a 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -78,6 +78,11 @@
}
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
+
protected abstract String getVideoPrefKey();
protected boolean canHandleClicks() {
diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java
index 76964e5..d82cb10 100644
--- a/src/com/android/settings/gestures/GestureSettings.java
+++ b/src/com/android/settings/gestures/GestureSettings.java
@@ -25,10 +25,13 @@
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.SearchIndexable;
+import java.util.List;
+
@SearchIndexable
public class GestureSettings extends DashboardFragment {
private static final String TAG = "GestureSettings";
+ private static final String PREF_KEY_PREVENT_RINGING = "gesture_prevent_ringing_summary";
private AmbientDisplayConfiguration mAmbientDisplayConfig;
@@ -63,5 +66,13 @@
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider(R.xml.gestures);
+ new BaseSearchIndexProvider(R.xml.gestures) {
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ final List<String> keys = super.getNonIndexableKeys(context);
+ // de-duplicated due to another same entry in Sound page
+ keys.add(PREF_KEY_PREVENT_RINGING);
+ return keys;
+ }
+ };
}
diff --git a/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java b/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java
index 44494ee..82766db 100644
--- a/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java
+++ b/src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java
@@ -120,6 +120,11 @@
return false;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
+
private void refreshStateDisplay() {
if (mAssistSwitch != null) {
mAssistSwitch.setSummary(getSummary());
diff --git a/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java b/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java
index 2b7d7a0..3f84aba 100644
--- a/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java
+++ b/src/com/android/settings/gestures/OneHandedMainSwitchPreferenceController.java
@@ -21,6 +21,7 @@
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -92,4 +93,9 @@
mPreference.setChecked(isChecked());
}
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
index b3b39fb..5f880f7 100644
--- a/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
+++ b/src/com/android/settings/gestures/PreventRingingParentPreferenceController.java
@@ -138,6 +138,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_sound;
+ }
+
+ @Override
public void onStart() {
if (mSettingObserver != null) {
mSettingObserver.register(mContext.getContentResolver());
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index a2a6d3c..2bbc11e 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -61,9 +61,15 @@
private static final String TAG = "SettingsHomepageActivity";
+ // Additional extra of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
// Put true value to the intent when startActivity for a deep link intent from this Activity.
public static final String EXTRA_IS_FROM_SETTINGS_HOMEPAGE = "is_from_settings_homepage";
+ // Additional extra of Settings#ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK.
+ // Set & get Uri of the Intent separately to prevent failure of Intent#ParseUri.
+ public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA =
+ "settings_large_screen_deep_link_intent_data";
+
// An alias class name of SettingsHomepageActivity.
public static final String ALIAS_DEEP_LINK = "com.android.settings.DeepLinkHomepageActivity";
@@ -232,23 +238,32 @@
targetIntent.replaceExtras(intent);
targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true);
+ targetIntent.putExtra(SettingsActivity.EXTRA_IS_FROM_SLICE, false);
+ targetIntent.setData(intent.getParcelableExtra(
+ SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA));
// Set 2-pane pair rule for the deep link page.
ActivityEmbeddingRulesController.registerTwoPanePairRule(this,
- new ComponentName(Utils.SETTINGS_PACKAGE_NAME, ALIAS_DEEP_LINK),
+ getDeepLinkComponent(),
targetComponentName,
targetIntent.getAction(),
true /* finishPrimaryWithSecondary */,
- true /* finishSecondaryWithPrimary */);
+ true /* finishSecondaryWithPrimary */,
+ true /* clearTop*/);
ActivityEmbeddingRulesController.registerTwoPanePairRule(this,
new ComponentName(Settings.class.getPackageName(), Settings.class.getName()),
targetComponentName,
targetIntent.getAction(),
true /* finishPrimaryWithSecondary */,
- true /* finishSecondaryWithPrimary */);
+ true /* finishSecondaryWithPrimary */,
+ true /* clearTop*/);
startActivity(targetIntent);
}
+ protected ComponentName getDeepLinkComponent() {
+ return new ComponentName(Utils.SETTINGS_PACKAGE_NAME, ALIAS_DEEP_LINK);
+ }
+
private String getHighlightMenuKey() {
final Intent intent = getIntent();
if (intent != null && TextUtils.equals(intent.getAction(),
diff --git a/src/com/android/settings/homepage/SliceDeepLinkHomepageActivity.java b/src/com/android/settings/homepage/SliceDeepLinkHomepageActivity.java
new file mode 100644
index 0000000..2f83612
--- /dev/null
+++ b/src/com/android/settings/homepage/SliceDeepLinkHomepageActivity.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 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.settings.homepage;
+
+import android.content.ComponentName;
+
+/** Activity for Slices to launch Settings deep link page */
+public class SliceDeepLinkHomepageActivity extends SettingsHomepageActivity {
+ @Override
+ protected ComponentName getDeepLinkComponent() {
+ return new ComponentName(getApplicationContext(), getClass());
+ }
+}
diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java
index 38b2baa..d3bfa02 100644
--- a/src/com/android/settings/homepage/TopLevelSettings.java
+++ b/src/com/android/settings/homepage/TopLevelSettings.java
@@ -36,6 +36,7 @@
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
+import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.activityembedding.ActivityEmbeddingUtils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
@@ -98,6 +99,10 @@
@Override
public boolean onPreferenceTreeClick(Preference preference) {
+ // Register SplitPairRule for SubSettings.
+ ActivityEmbeddingRulesController.registerSubSettingsPairRuleIfNeeded(getContext(),
+ true /* clearTop*/);
+
setHighlightPreferenceKey(preference.getKey());
return super.onPreferenceTreeClick(preference);
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
index 94d3f69..f10a2d7 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
@@ -147,12 +147,18 @@
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
PowerUsageSummary.class.getName(), BatteryTipPreferenceController.PREF_NAME,
screenTitle,
- SettingsEnums.SLICE)
+ SettingsEnums.SLICE,
+ this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_battery;
+ }
+
+ @Override
public void onNotifyChange(Intent intent) {
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index bfdd13a..7e4730c 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -130,12 +130,18 @@
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
ConnectedDeviceDashboardFragment.class.getName(), "" /* key */,
screenTitle,
- SettingsEnums.SLICE)
+ SettingsEnums.SLICE,
+ this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(getUri());
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_connected_devices;
+ }
+
+ @Override
public void onNotifyChange(Intent intent) {
final boolean enableBluetooth = intent.getBooleanExtra(EXTRA_ENABLE_BLUETOOTH, false);
if (enableBluetooth) {
diff --git a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
index f11b0e3..2291bd7 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
@@ -117,8 +117,14 @@
final Uri contentUri = new Uri.Builder().appendPath(PREF_NAME).build();
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
ScreenTimeoutSettings.class.getName(), PREF_NAME, screenTitle.toString(),
- SettingsEnums.SLICE).setClassName(mContext.getPackageName(),
- SubSettings.class.getName()).setData(contentUri);
+ SettingsEnums.SLICE, this)
+ .setClassName(mContext.getPackageName(),
+ SubSettings.class.getName()).setData(contentUri);
+ }
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
}
private PendingIntent getPrimaryAction() {
diff --git a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
index f934d58..96924e4 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/DarkThemeSlice.java
@@ -149,6 +149,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_display;
+ }
+
+ @Override
public Class getBackgroundWorkerClass() {
return DarkThemeWorker.class;
}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
index 1b3ee10..7cf7d86 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
@@ -133,13 +133,18 @@
SecuritySettings.class.getName(),
FaceStatusPreferenceController.KEY_FACE_SETTINGS,
mContext.getText(R.string.security_settings_face_settings_enroll).toString(),
- SettingsEnums.SLICE)
+ SettingsEnums.SLICE, this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName());
} else {
return new Intent(mContext, FaceReEnrollDialog.class);
}
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_security;
+ }
+
private static RowBuilder buildRowBuilder(CharSequence title, CharSequence subTitle,
IconCompat icon, Context context, Intent intent) {
final SliceAction primarySliceAction = SliceAction.createDeeplink(
diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
index 3812534..22e3431 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
@@ -109,11 +109,17 @@
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
StorageDashboardFragment.class.getName(), "" /* key */,
screenTitle,
- SettingsEnums.SLICE)
+ SettingsEnums.SLICE,
+ this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(CustomSliceRegistry.LOW_STORAGE_SLICE_URI);
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_storage;
+ }
+
private RowBuilder buildRowBuilder(CharSequence title, String summary, IconCompat icon) {
final SliceAction primarySliceAction = SliceAction.createDeeplink(
PendingIntent.getActivity(mContext, 0, getIntent(), PendingIntent.FLAG_IMMUTABLE),
diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index 80f6680..751dac7 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -101,6 +101,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
+
+ @Override
public void onInputDeviceAdded(int deviceId) {
updateState(mPreference);
}
diff --git a/src/com/android/settings/inputmethod/OWNERS b/src/com/android/settings/inputmethod/OWNERS
index 556de5f..7c7d792 100644
--- a/src/com/android/settings/inputmethod/OWNERS
+++ b/src/com/android/settings/inputmethod/OWNERS
@@ -1,5 +1,6 @@
# Bug component: 34867
include platform/frameworks/base:/services/core/java/com/android/server/inputmethod/OWNERS
+include /OWNERS
# Settings for physical keyboard and game pad are better to be reviewed by the input team
per-file GameControllerPreferenceController.java = file: platform/frameworks/base:/services/core/java/com/android/server/input/OWNERS
diff --git a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
index 051fd8d..b491ec9 100644
--- a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
+++ b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
@@ -68,6 +68,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_location;
+ }
+
+ @Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
if (isChecked != isChecked()) {
setChecked(isChecked);
diff --git a/src/com/android/settings/location/LocationIndicatorsPreferenceController.java b/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
index d39c280..75ffb3a 100644
--- a/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
+++ b/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
@@ -20,6 +20,7 @@
import android.content.pm.PackageManager;
import android.provider.DeviceConfig;
+import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
@@ -54,4 +55,9 @@
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LOCATION)
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_location;
+ }
}
diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java
index f8add12..291e5e4 100644
--- a/src/com/android/settings/location/LocationSlice.java
+++ b/src/com/android/settings/location/LocationSlice.java
@@ -88,11 +88,16 @@
final Uri contentUri = new Uri.Builder().appendPath(KEY_LOCATION).build();
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
LocationSettings.class.getName(), KEY_LOCATION, screenTitle,
- SettingsEnums.LOCATION)
+ SettingsEnums.LOCATION, this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_location;
+ }
+
private PendingIntent getPrimaryAction() {
final Intent intent = getIntent();
return PendingIntent.getActivity(mContext, 0 /* requestCode */,
diff --git a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
index a69fdb8..546f1e1 100644
--- a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
+++ b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
@@ -69,6 +69,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_location;
+ }
+
+ @Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
if (isChecked != isChecked()) {
setChecked(isChecked);
diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index 10a8b79..e2232e7 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -93,6 +93,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_connected_devices;
+ }
+
+ @Override
public Class getBackgroundWorkerClass() {
return MediaOutputIndicatorWorker.class;
}
diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index 3d81c44..f856188 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -181,7 +181,9 @@
final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
SoundSettings.class.getName(),
id,
- mContext.getText(R.string.sound_settings).toString(), 0);
+ mContext.getText(R.string.sound_settings).toString(),
+ 0 /* sourceMetricsCategory */,
+ R.string.menu_key_sound);
intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
intent.setData(contentUri);
final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
@@ -222,6 +224,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_connected_devices;
+ }
+
+ @Override
public Class getBackgroundWorkerClass() {
return MediaDeviceUpdateWorker.class;
}
diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
index e3d779c..ea849f6 100644
--- a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
+++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
@@ -22,6 +22,7 @@
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.widget.SettingsMainSwitchPreferenceController;
/**
@@ -62,4 +63,9 @@
mWifiManager.setWifiScoringEnabled(isChecked);
return true;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
}
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 6839037..e74f3ae 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -121,6 +121,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
+ @Override
public void onStart() {
if (isAvailable()) {
mAirplaneModeEnabler.start();
diff --git a/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java b/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
index c5d8b97..26679c6 100644
--- a/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
+++ b/src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
@@ -22,6 +22,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.wifi.WifiPickerTrackerHelper;
@@ -89,6 +90,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
+ @Override
public void onWifiStateChanged() {
updateCarrierNetworkPreference();
}
diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java
index 146b11a..0aae349 100644
--- a/src/com/android/settings/network/ProviderModelSlice.java
+++ b/src/com/android/settings/network/ProviderModelSlice.java
@@ -290,7 +290,7 @@
final String screenTitle = mContext.getText(R.string.provider_internet_settings).toString();
return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
NetworkProviderSettings.class.getName(), "" /* key */, screenTitle,
- SettingsEnums.SLICE)
+ SettingsEnums.SLICE, this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(getUri());
}
diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java
index 822aa72..b1627f2 100644
--- a/src/com/android/settings/network/TetherBasePreferenceController.java
+++ b/src/com/android/settings/network/TetherBasePreferenceController.java
@@ -25,6 +25,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.datausage.DataSaverBackend;
@@ -118,6 +119,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
+ @Override
public void onTetherStateUpdated(@TetherEnabler.TetheringState int state) {
mTetheringState = state;
updateState(mPreference);
diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java
index 7ec31be..22bb581 100644
--- a/src/com/android/settings/network/telephony/MobileDataSlice.java
+++ b/src/com/android/settings/network/telephony/MobileDataSlice.java
@@ -146,6 +146,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
+ @Override
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return MobileDataWorker.class;
}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index efb5f8c..bbff57d 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -207,6 +207,7 @@
protected void runSubscriptionUpdate(Runnable onUpdateRemaining) {
SubscriptionInfo subInfo = getSubscription(mCurSubscriptionId, null);
if (subInfo == null) {
+ onUpdateRemaining.run();
tryToFinishActivity();
return;
}
diff --git a/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java b/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java
index 7fe5f1d..46f279d 100644
--- a/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java
+++ b/src/com/android/settings/network/telephony/TelephonyTogglePreferenceController.java
@@ -65,6 +65,12 @@
return false;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ // not needed since it's not sliceable
+ return 0;
+ }
+
/**
* Get carrier config based on specific subscription id.
*
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index b30e7c3f..483fead 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -27,6 +27,7 @@
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -58,7 +59,7 @@
return;
}
- mPreference = (MainSwitchPreference) screen.findPreference(getPreferenceKey());
+ mPreference = screen.findPreference(getPreferenceKey());
mPreference.addOnSwitchChangeListener(this);
mNfcEnabler = new NfcEnabler(mContext, mPreference);
}
@@ -104,6 +105,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_connected_devices;
+ }
+
+ @Override
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return NfcSliceWorker.class;
}
diff --git a/src/com/android/settings/nfc/SecureNfcPreferenceController.java b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
index 4e548d1..e1d27d0 100644
--- a/src/com/android/settings/nfc/SecureNfcPreferenceController.java
+++ b/src/com/android/settings/nfc/SecureNfcPreferenceController.java
@@ -21,6 +21,7 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -82,6 +83,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_connected_devices;
+ }
+
+ @Override
public void onResume() {
if (mSecureNfcEnabler != null) {
mSecureNfcEnabler.resume();
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index 613204b..69d95a8 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -30,6 +30,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -88,6 +89,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_notifications;
+ }
+
+ @Override
public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(),
NOTIFICATION_BADGING, ON) == ON;
diff --git a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
index 37723b1..9e35664 100644
--- a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
@@ -89,6 +89,12 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ // not needed since it's not sliceable
+ return 0;
+ }
+
+ @Override
public boolean isChecked() {
return Settings.Global.getInt(mContext.getContentResolver(),
NOTIFICATION_BUBBLES, ON) == ON;
diff --git a/src/com/android/settings/notification/NotificationAssistantPreferenceController.java b/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
index bdbc478..91031c8 100644
--- a/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationAssistantPreferenceController.java
@@ -24,6 +24,7 @@
import androidx.fragment.app.Fragment;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.google.common.annotations.VisibleForTesting;
@@ -73,6 +74,11 @@
}
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_notifications;
+ }
+
protected void setNotificationAssistantGranted(ComponentName cn) {
if (Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NAS_SETTINGS_UPDATED, 0, mUserId) == 0) {
diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
index 7885520..ad53fc3 100644
--- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
@@ -28,6 +28,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -86,6 +87,11 @@
isChecked ? ON : OFF);
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_notifications;
+ }
+
class SettingObserver extends ContentObserver {
private final Uri NOTIFICATION_LIGHT_PULSE_URI =
diff --git a/src/com/android/settings/notification/RedactNotificationPreferenceController.java b/src/com/android/settings/notification/RedactNotificationPreferenceController.java
index d0326bb..db34e5e 100644
--- a/src/com/android/settings/notification/RedactNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/RedactNotificationPreferenceController.java
@@ -32,6 +32,7 @@
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
@@ -147,6 +148,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_notifications;
+ }
+
+ @Override
public void onStart() {
mContext.getContentResolver().registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS),
diff --git a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java
index 0585382..4c4c99d 100644
--- a/src/com/android/settings/notification/SilentStatusBarPreferenceController.java
+++ b/src/com/android/settings/notification/SilentStatusBarPreferenceController.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.google.common.annotations.VisibleForTesting;
@@ -52,4 +53,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_notifications;
+ }
}
diff --git a/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java b/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java
index 03170e4..2c89f74 100644
--- a/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/SnoozeNotificationPreferenceController.java
@@ -21,10 +21,11 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.TogglePreferenceController;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
public class SnoozeNotificationPreferenceController extends TogglePreferenceController {
private static final String TAG = "SnoozeNotifPrefContr";
@@ -53,4 +54,9 @@
return Settings.Secure.putInt(mContext.getContentResolver(),
SHOW_NOTIFICATION_SNOOZE, isChecked ? ON : OFF);
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_notifications;
+ }
}
diff --git a/src/com/android/settings/notification/SpatialAudioPreferenceController.java b/src/com/android/settings/notification/SpatialAudioPreferenceController.java
index 1420076..7bca516 100644
--- a/src/com/android/settings/notification/SpatialAudioPreferenceController.java
+++ b/src/com/android/settings/notification/SpatialAudioPreferenceController.java
@@ -20,6 +20,7 @@
import android.media.AudioManager;
import android.media.Spatializer;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -53,4 +54,9 @@
mSpatializer.setEnabled(isChecked);
return isChecked == isChecked();
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_notifications;
+ }
}
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
index b32f922..d170159 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
@@ -23,6 +23,7 @@
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.notification.VolumeSeekBarPreference.Callback;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -76,6 +77,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_sound;
+ }
+
+ @Override
public int getSliderPosition() {
if (mPreference != null) {
return mPreference.getProgress();
diff --git a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
index 5ea01ea..1f553a2 100644
--- a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
@@ -120,7 +120,7 @@
final String screenTitle = context.getText(R.string.zen_mode_settings_title).toString();
return SliceBuilderUtils.buildSearchResultPageIntent(context,
ZenModeSettings.class.getName(), ZEN_MODE_SLICE_KEY, screenTitle,
- SettingsEnums.NOTIFICATION_ZEN_MODE)
+ SettingsEnums.NOTIFICATION_ZEN_MODE, R.string.menu_key_notifications)
.setClassName(context.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
}
diff --git a/src/com/android/settings/panel/NfcPanel.java b/src/com/android/settings/panel/NfcPanel.java
index c1e15e8..6b1e435 100644
--- a/src/com/android/settings/panel/NfcPanel.java
+++ b/src/com/android/settings/panel/NfcPanel.java
@@ -62,7 +62,8 @@
AdvancedConnectedDeviceDashboardFragment.class.getName(),
null /* key */,
screenTitle,
- SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY);
+ SettingsEnums.SETTINGS_CONNECTED_DEVICE_CATEGORY,
+ R.string.menu_key_connected_devices);
intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return intent;
diff --git a/src/com/android/settings/panel/WifiPanel.java b/src/com/android/settings/panel/WifiPanel.java
index 3b36a57..95ebb33 100644
--- a/src/com/android/settings/panel/WifiPanel.java
+++ b/src/com/android/settings/panel/WifiPanel.java
@@ -62,10 +62,11 @@
final String screenTitle =
mContext.getText(R.string.wifi_settings).toString();
final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
- WifiSettings.class.getName(),
- null /* key */,
- screenTitle,
- SettingsEnums.WIFI);
+ WifiSettings.class.getName(),
+ null /* key */,
+ screenTitle,
+ SettingsEnums.WIFI,
+ R.string.menu_key_network);
intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return intent;
diff --git a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
index 47610aa..3cf72b2 100644
--- a/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
+++ b/src/com/android/settings/privacy/EnableContentCapturePreferenceController.java
@@ -18,8 +18,8 @@
import android.annotation.NonNull;
import android.content.Context;
-import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.utils.ContentCaptureUtils;
@@ -46,4 +46,9 @@
&& ContentCaptureUtils.getServiceSettingsComponentName() == null;
return available ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_privacy;
+ }
}
diff --git a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
index 77aab34..c3878d5 100644
--- a/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
+++ b/src/com/android/settings/privacy/EnableContentCaptureWithServiceSettingsPreferenceController.java
@@ -28,8 +28,8 @@
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.dashboard.profileselector.UserAdapter;
import com.android.settings.utils.ContentCaptureUtils;
@@ -88,6 +88,11 @@
return available ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_privacy;
+ }
+
private static final class ProfileSelectDialog {
public static void show(Context context, Preference pref) {
final UserManager userManager = UserManager.get(context);
diff --git a/src/com/android/settings/privacy/SensorToggleController.java b/src/com/android/settings/privacy/SensorToggleController.java
index 50b023b..53b1a2f 100644
--- a/src/com/android/settings/privacy/SensorToggleController.java
+++ b/src/com/android/settings/privacy/SensorToggleController.java
@@ -22,6 +22,7 @@
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.utils.SensorPrivacyManagerHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -80,4 +81,9 @@
(sensor, blocked) -> updateState(screen.findPreference(mPreferenceKey)),
mCallbackExecutor);
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_privacy;
+ }
}
diff --git a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
index cf05ff4..ad57073 100644
--- a/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
+++ b/src/com/android/settings/privacy/ShowClipAccessNotificationPreferenceController.java
@@ -27,6 +27,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -72,6 +73,11 @@
mPreference = screen.findPreference(getPreferenceKey());
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_privacy;
+ }
+
/**
* Registers a DeviceConfig listener on start.
*/
diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java
index e930473..3414efe 100644
--- a/src/com/android/settings/search/SearchResultTrampoline.java
+++ b/src/com/android/settings/search/SearchResultTrampoline.java
@@ -25,6 +25,7 @@
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
+import com.android.settings.activityembedding.ActivityEmbeddingRulesController;
import com.android.settings.overlay.FeatureFactory;
/**
@@ -53,6 +54,11 @@
args.putInt(EXTRA_SHOW_FRAGMENT_TAB, tab);
intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
+ // Register SplirPairRule for SubSettings, set clearTop false to prevent unexpected back
+ // navigation behavior.
+ ActivityEmbeddingRulesController.registerSubSettingsPairRuleIfNeeded(this /* context */,
+ false /* clearTop*/);
+
// Reroute request to SubSetting.
intent.setClass(this /* context */, SubSettings.class)
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java
index 472101b..696854a 100644
--- a/src/com/android/settings/security/ShowPasswordPreferenceController.java
+++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java
@@ -58,5 +58,9 @@
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_security;
+ }
}
diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
index 64ca853..9e82e78 100644
--- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
+++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
@@ -28,6 +28,7 @@
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
@@ -119,6 +120,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_security;
+ }
+
+ @Override
public void onResume() {
mPreference.setVisible(isAvailable());
}
diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java
index d06ad1e..2c807c4 100644
--- a/src/com/android/settings/slices/CustomSliceable.java
+++ b/src/com/android/settings/slices/CustomSliceable.java
@@ -103,6 +103,9 @@
return true;
}
+ @Override
+ int getSliceHighlightMenuRes();
+
/**
* Build an instance of a {@link CustomSliceable} which has a {@link Context}-only constructor.
*/
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 402e044..4cefa4e 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -16,6 +16,9 @@
package com.android.settings.slices;
+import static android.provider.Settings.EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY;
+
+import static com.android.settings.SettingsActivity.EXTRA_IS_FROM_SLICE;
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY;
@@ -202,8 +205,15 @@
}
public static Intent buildSearchResultPageIntent(Context context, String className, String key,
- String screenTitle, int sourceMetricsCategory) {
+ String screenTitle, int sourceMetricsCategory, int highlightMenuRes) {
final Bundle args = new Bundle();
+ String highlightMenuKey = null;
+ if (highlightMenuRes != 0) {
+ highlightMenuKey = context.getString(highlightMenuRes);
+ if (TextUtils.isEmpty(highlightMenuKey)) {
+ Log.w(TAG, "Invalid menu key res from: " + screenTitle);
+ }
+ }
args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
final Intent searchDestination = new SubSettingLauncher(context)
.setDestination(className)
@@ -211,7 +221,10 @@
.setTitleText(screenTitle)
.setSourceMetricsCategory(sourceMetricsCategory)
.toIntent();
- searchDestination.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key)
+ searchDestination
+ .putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key)
+ .putExtra(EXTRA_IS_FROM_SLICE, true)
+ .putExtra(EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY, highlightMenuKey)
.setAction("com.android.settings.SEARCH_RESULT_TRAMPOLINE")
.setComponent(null);
searchDestination.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -219,13 +232,22 @@
return searchDestination;
}
+ /**
+ * Build a search result page intent for {@link CustomSliceable}
+ */
+ public static Intent buildSearchResultPageIntent(Context context, String className, String key,
+ String screenTitle, int sourceMetricsCategory, CustomSliceable sliceable) {
+ return buildSearchResultPageIntent(context, className, key, screenTitle,
+ sourceMetricsCategory, sliceable.getSliceHighlightMenuRes());
+ }
+
public static Intent getContentIntent(Context context, SliceData sliceData) {
final Uri contentUri = new Uri.Builder().appendPath(sliceData.getKey()).build();
final String screenTitle = TextUtils.isEmpty(sliceData.getScreenTitle()) ? null
: sliceData.getScreenTitle().toString();
final Intent intent = buildSearchResultPageIntent(context,
sliceData.getFragmentClassName(), sliceData.getKey(),
- screenTitle, 0 /* TODO */);
+ screenTitle, 0 /* TODO */, sliceData.getHighlightMenuRes());
intent.setClassName(context.getPackageName(), SubSettings.class.getName());
intent.setData(contentUri);
return intent;
diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java
index 60f5e3f..01b29b2 100644
--- a/src/com/android/settings/slices/SliceData.java
+++ b/src/com/android/settings/slices/SliceData.java
@@ -19,6 +19,7 @@
import android.annotation.IntDef;
import android.net.Uri;
import android.text.TextUtils;
+import android.util.Log;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -50,6 +51,8 @@
int SLIDER = 2;
}
+ private static final String TAG = "SliceData";
+
private final String mKey;
private final String mTitle;
@@ -68,6 +71,8 @@
private final String mPreferenceController;
+ private final int mHighlightMenuRes;
+
@SliceType
private final int mSliceType;
@@ -119,6 +124,10 @@
return mUnavailableSliceSubtitle;
}
+ public int getHighlightMenuRes() {
+ return mHighlightMenuRes;
+ }
+
public boolean isPublicSlice() {
return mIsPublicSlice;
}
@@ -136,6 +145,7 @@
mSliceType = builder.mSliceType;
mUnavailableSliceSubtitle = builder.mUnavailableSliceSubtitle;
mIsPublicSlice = builder.mIsPublicSlice;
+ mHighlightMenuRes = builder.mHighlightMenuRes;
}
@Override
@@ -175,6 +185,8 @@
private String mUnavailableSliceSubtitle;
+ private int mHighlightMenuRes;
+
private boolean mIsPublicSlice;
public Builder setKey(String key) {
@@ -233,6 +245,11 @@
return this;
}
+ public Builder setHighlightMenuRes(int highlightMenuRes) {
+ mHighlightMenuRes = highlightMenuRes;
+ return this;
+ }
+
public Builder setIsPublicSlice(boolean isPublicSlice) {
mIsPublicSlice = isPublicSlice;
return this;
@@ -255,6 +272,10 @@
throw new InvalidSliceDataException("Preference Controller cannot be empty");
}
+ if (mHighlightMenuRes == 0) {
+ Log.w(TAG, "Highlight menu key res is empty: " + mPrefControllerClassName);
+ }
+
return new SliceData(this);
}
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index 5608169..eb08c5f 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -213,6 +213,7 @@
final String unavailableSliceSubtitle = bundle.getString(
METADATA_UNAVAILABLE_SLICE_SUBTITLE);
final boolean isPublicSlice = controller.isPublicSlice();
+ final int highlightMenuRes = controller.getSliceHighlightMenuRes();
final SliceData xmlSlice = new SliceData.Builder()
.setKey(key)
@@ -226,6 +227,7 @@
.setSliceType(sliceType)
.setUnavailableSliceSubtitle(unavailableSliceSubtitle)
.setIsPublicSlice(isPublicSlice)
+ .setHighlightMenuRes(highlightMenuRes)
.build();
xmlSliceData.add(xmlSlice);
diff --git a/src/com/android/settings/slices/Sliceable.java b/src/com/android/settings/slices/Sliceable.java
index ad27b7c..31555df 100644
--- a/src/com/android/settings/slices/Sliceable.java
+++ b/src/com/android/settings/slices/Sliceable.java
@@ -50,6 +50,8 @@
* - Must be understandable as a stand-alone Setting.
* <p>
* This does not guarantee the setting is available.
+ * <p>
+ * {@link #getSliceHighlightMenuRes} should also be overridden when returning true.
*
* @return {@code true} if the controller should be used as a Slice.
*/
@@ -131,4 +133,12 @@
default Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return null;
}
+
+ /**
+ * @return a resource ID that indicates which menu entry should be highlighted in multi-pane
+ * mode.
+ */
+ default int getSliceHighlightMenuRes() {
+ return 0;
+ }
}
diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
index c0bb8de..75f0220 100644
--- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java
+++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
@@ -50,6 +50,7 @@
IndexColumns.CONTROLLER,
IndexColumns.SLICE_TYPE,
IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
+ IndexColumns.HIGHLIGHT_MENU_RESOURCE,
};
private final Context mContext;
@@ -163,6 +164,8 @@
cursor.getColumnIndex(IndexColumns.SLICE_TYPE));
final String unavailableSliceSubtitle = cursor.getString(
cursor.getColumnIndex(IndexColumns.UNAVAILABLE_SLICE_SUBTITLE));
+ final int highlightMenuRes = cursor.getInt(
+ cursor.getColumnIndex(IndexColumns.HIGHLIGHT_MENU_RESOURCE));
if (isIntentOnly) {
sliceType = SliceData.SliceType.INTENT;
@@ -180,6 +183,7 @@
.setUri(uri)
.setSliceType(sliceType)
.setUnavailableSliceSubtitle(unavailableSliceSubtitle)
+ .setHighlightMenuRes(highlightMenuRes)
.build();
}
diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java
index fe4420b..69ad702 100644
--- a/src/com/android/settings/slices/SlicesDatabaseHelper.java
+++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java
@@ -36,7 +36,7 @@
private static final String DATABASE_NAME = "slices_index.db";
private static final String SHARED_PREFS_TAG = "slices_shared_prefs";
- private static final int DATABASE_VERSION = 8;
+ private static final int DATABASE_VERSION = 9;
public interface Tables {
String TABLE_SLICES_INDEX = "slices_index";
@@ -103,39 +103,43 @@
* Whether the slice should be exposed publicly.
*/
String PUBLIC_SLICE = "public_slice";
+
+ /**
+ * Resource ID for the menu entry of the setting.
+ */
+ String HIGHLIGHT_MENU_RESOURCE = "highlight_menu";
}
private static final String CREATE_SLICES_TABLE =
- "CREATE VIRTUAL TABLE " + Tables.TABLE_SLICES_INDEX + " USING fts4" +
- "(" +
- IndexColumns.KEY +
- ", " +
- IndexColumns.SLICE_URI +
- ", " +
- IndexColumns.TITLE +
- ", " +
- IndexColumns.SUMMARY +
- ", " +
- IndexColumns.SCREENTITLE +
- ", " +
- IndexColumns.KEYWORDS +
- ", " +
- IndexColumns.ICON_RESOURCE +
- ", " +
- IndexColumns.FRAGMENT +
- ", " +
- IndexColumns.CONTROLLER +
- ", " +
- IndexColumns.SLICE_TYPE +
- ", " +
- IndexColumns.UNAVAILABLE_SLICE_SUBTITLE +
- ", "
- +
- IndexColumns.PUBLIC_SLICE
- +
- " INTEGER DEFAULT 0 "
- +
- ");";
+ "CREATE VIRTUAL TABLE " + Tables.TABLE_SLICES_INDEX + " USING fts4"
+ + "("
+ + IndexColumns.KEY
+ + ", "
+ + IndexColumns.SLICE_URI
+ + ", "
+ + IndexColumns.TITLE
+ + ", "
+ + IndexColumns.SUMMARY
+ + ", "
+ + IndexColumns.SCREENTITLE
+ + ", "
+ + IndexColumns.KEYWORDS
+ + ", "
+ + IndexColumns.ICON_RESOURCE
+ + ", "
+ + IndexColumns.FRAGMENT
+ + ", "
+ + IndexColumns.CONTROLLER
+ + ", "
+ + IndexColumns.SLICE_TYPE
+ + ", "
+ + IndexColumns.UNAVAILABLE_SLICE_SUBTITLE
+ + ", "
+ + IndexColumns.PUBLIC_SLICE
+ + ", "
+ + IndexColumns.HIGHLIGHT_MENU_RESOURCE
+ + " INTEGER DEFAULT 0 "
+ + ");";
private final Context mContext;
diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java
index e527fd6..ac30c6c 100644
--- a/src/com/android/settings/slices/SlicesIndexer.java
+++ b/src/com/android/settings/slices/SlicesIndexer.java
@@ -116,6 +116,7 @@
values.put(IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
dataRow.getUnavailableSliceSubtitle());
values.put(IndexColumns.PUBLIC_SLICE, dataRow.isPublicSlice());
+ values.put(IndexColumns.HIGHLIGHT_MENU_RESOURCE, dataRow.getHighlightMenuRes());
database.replaceOrThrow(Tables.TABLE_SLICES_INDEX, null /* nullColumnHack */,
values);
diff --git a/src/com/android/settings/sound/MediaControlsPreferenceController.java b/src/com/android/settings/sound/MediaControlsPreferenceController.java
index ad09e2a..e180b34 100644
--- a/src/com/android/settings/sound/MediaControlsPreferenceController.java
+++ b/src/com/android/settings/sound/MediaControlsPreferenceController.java
@@ -23,6 +23,7 @@
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -50,4 +51,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_sound;
+ }
}
diff --git a/src/com/android/settings/sound/MediaControlsRecommendationController.java b/src/com/android/settings/sound/MediaControlsRecommendationController.java
index 682cb5b..842a141 100644
--- a/src/com/android/settings/sound/MediaControlsRecommendationController.java
+++ b/src/com/android/settings/sound/MediaControlsRecommendationController.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.provider.Settings;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -50,4 +51,9 @@
public int getAvailabilityStatus() {
return AVAILABLE;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_sound;
+ }
}
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index f931fa4..ce5533e 100644
--- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -20,6 +20,7 @@
import androidx.preference.Preference;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -69,4 +70,9 @@
return Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ADD_USERS_WHEN_LOCKED, isChecked ? 1 : 0);
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_system;
+ }
}
diff --git a/src/com/android/settings/uwb/UwbPreferenceController.java b/src/com/android/settings/uwb/UwbPreferenceController.java
index 8b330a9..ad040ed 100644
--- a/src/com/android/settings/uwb/UwbPreferenceController.java
+++ b/src/com/android/settings/uwb/UwbPreferenceController.java
@@ -162,5 +162,10 @@
return mContext.getResources().getString(R.string.uwb_settings_summary);
}
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_connected_devices;
+ }
}
diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
index eab50a6..59ad440 100644
--- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
+++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
@@ -22,6 +22,7 @@
import android.telephony.SubscriptionManager;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -51,6 +52,11 @@
Settings.Global.NETWORK_AVOID_BAD_WIFI, isChecked ? "1" : null);
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
private boolean avoidBadWifiConfig() {
final int activeDataSubscriptionId = getActiveDataSubscriptionId();
if (activeDataSubscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
index 6455f5b..4b7506d 100644
--- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -26,6 +26,7 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -85,6 +86,11 @@
return true;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
class SettingObserver extends ContentObserver {
private final Uri NETWORKS_AVAILABLE_URI = Settings.Global.getUriFor(
Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON);
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index e9fd350..2cc7f8e 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -135,6 +135,11 @@
}
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
@VisibleForTesting
CharSequence getNoLocationSummary() {
AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo("link", null);
diff --git a/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java
index ffbb682..8226bc0 100644
--- a/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiAutoConnectPreferenceController2.java
@@ -18,6 +18,7 @@
import android.content.Context;
+import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.wifitrackerlib.WifiEntry;
@@ -54,4 +55,9 @@
mWifiEntry.setAutoJoinEnabled(isChecked);
return true;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
}
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index f6604dd..29a2bd6 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -33,6 +33,7 @@
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
import androidx.annotation.VisibleForTesting;
import androidx.core.graphics.drawable.IconCompat;
@@ -44,6 +45,8 @@
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.network.NetworkProviderSettings;
+import com.android.settings.network.WifiSwitchPreferenceController;
import com.android.settings.slices.CustomSliceable;
import com.android.settings.slices.SliceBackgroundWorker;
import com.android.settings.slices.SliceBuilderUtils;
@@ -269,15 +272,28 @@
public Intent getIntent() {
final String screenTitle = mContext.getText(R.string.wifi_settings).toString();
final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
- final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
- WifiSettings.class.getName(), KEY_WIFI, screenTitle,
- SettingsEnums.DIALOG_WIFI_AP_EDIT)
+ final String className;
+ final String key;
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+ className = NetworkProviderSettings.class.getName();
+ key = WifiSwitchPreferenceController.KEY;
+ } else {
+ className = WifiSettings.class.getName();
+ key = KEY_WIFI;
+ }
+ final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext, className,
+ key, screenTitle, SettingsEnums.DIALOG_WIFI_AP_EDIT, this)
.setClassName(mContext.getPackageName(), SubSettings.class.getName())
.setData(contentUri);
return intent;
}
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return R.string.menu_key_network;
+ }
+
private boolean isWifiEnabled() {
switch (mWifiManager.getWifiState()) {
case WifiManager.WIFI_STATE_ENABLED:
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivityTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivityTest.java
index 29e921c..4f1edba 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivityTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityScreenSizeForSetupWizardActivityTest.java
@@ -126,14 +126,14 @@
}
@Test
- public void generateHeader_displaySizePage_returnDisplaySizeTitle() {
+ public void updateHeaderLayout_displaySizePage_returnDisplaySizeTitle() {
final Intent intent = new Intent();
intent.putExtra(VISION_FRAGMENT_NO, FragmentType.SCREEN_SIZE);
intent.putExtra(EXTRA_PAGE_TRANSITION_TYPE, TransitionType.TRANSITION_FADE);
final AccessibilityScreenSizeForSetupWizardActivity activity = Robolectric.buildActivity(
AccessibilityScreenSizeForSetupWizardActivity.class, intent).get();
activity.setContentView(R.layout.accessibility_screen_size_setup_wizard);
- activity.generateHeader();
+ activity.updateHeaderLayout();
final GlifLayout layout = activity.findViewById(R.id.setup_wizard_layout);
assertThat(layout.getHeaderText()).isEqualTo(mContext.getText(R.string.screen_zoom_title));
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
index 5ac8553..0f178e0 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBackupHelperTest.java
@@ -20,6 +20,7 @@
import static com.android.settings.fuelgauge.BatteryBackupHelper.DELIMITER_MODE;
import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_RESTRICTED;
import static com.android.settings.fuelgauge.BatteryOptimizeUtils.MODE_UNRESTRICTED;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -33,7 +34,6 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
import android.app.AppOpsManager;
import android.app.backup.BackupDataInputStream;
@@ -51,9 +51,6 @@
import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
-import java.util.Arrays;
-import java.util.List;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -69,6 +66,10 @@
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {BatteryBackupHelperTest.ShadowUserHandle.class})
public final class BatteryBackupHelperTest {
@@ -305,10 +306,11 @@
PACKAGE_NAME2 + DELIMITER_MODE + invalidNumberFormat;
mBatteryBackupHelper.restoreOptimizationMode(packageModes.getBytes());
+ TimeUnit.SECONDS.sleep(1);
final InOrder inOrder = inOrder(mBatteryOptimizeUtils);
- inOrder.verify(mBatteryOptimizeUtils).setAppOptimizationMode(MODE_RESTRICTED);
- inOrder.verify(mBatteryOptimizeUtils, never()).setAppOptimizationMode(anyInt());
+ inOrder.verify(mBatteryOptimizeUtils).setAppUsageState(MODE_RESTRICTED);
+ inOrder.verify(mBatteryOptimizeUtils, never()).setAppUsageState(anyInt());
}
@Test
@@ -319,11 +321,12 @@
PACKAGE_NAME3 + DELIMITER_MODE + MODE_RESTRICTED + DELIMITER;
mBatteryBackupHelper.restoreOptimizationMode(packageModes.getBytes());
+ TimeUnit.SECONDS.sleep(1);
final InOrder inOrder = inOrder(mBatteryOptimizeUtils);
- inOrder.verify(mBatteryOptimizeUtils).setAppOptimizationMode(MODE_RESTRICTED);
- inOrder.verify(mBatteryOptimizeUtils).setAppOptimizationMode(MODE_UNRESTRICTED);
- inOrder.verify(mBatteryOptimizeUtils, never()).setAppOptimizationMode(MODE_RESTRICTED);
+ inOrder.verify(mBatteryOptimizeUtils).setAppUsageState(MODE_RESTRICTED);
+ inOrder.verify(mBatteryOptimizeUtils).setAppUsageState(MODE_UNRESTRICTED);
+ inOrder.verify(mBatteryOptimizeUtils, never()).setAppUsageState(MODE_RESTRICTED);
}
private void mockUid(int uid, String packageName) throws Exception {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
index 53101c0..c154f42 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizeUtilsTest.java
@@ -42,6 +42,8 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import java.util.concurrent.TimeUnit;
+
@RunWith(RobolectricTestRunner.class)
public class BatteryOptimizeUtilsTest {
@@ -125,12 +127,13 @@
}
@Test
- public void testSetAppOptimizationMode_Restricted_verifyAction() {
+ public void testSetAppUsageState_Restricted_verifyAction() throws Exception {
// Sets the current mode as MODE_UNRESTRICTED.
mBatteryOptimizeUtils.mAllowListed = false;
mBatteryOptimizeUtils.mMode = AppOpsManager.MODE_ALLOWED;
- mBatteryOptimizeUtils.setAppOptimizationMode(MODE_RESTRICTED);
+ mBatteryOptimizeUtils.setAppUsageState(MODE_RESTRICTED);
+ TimeUnit.SECONDS.sleep(1);
verify(mMockBatteryUtils).setForceAppStandby(UID,
PACKAGE_NAME, AppOpsManager.MODE_IGNORED);
@@ -138,8 +141,9 @@
}
@Test
- public void testSetAppOptimizationMode_Unrestricted_verifyAction() {
- mBatteryOptimizeUtils.setAppOptimizationMode(MODE_UNRESTRICTED);
+ public void testSetAppUsageState_Unrestricted_verifyAction() throws Exception {
+ mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED);
+ TimeUnit.SECONDS.sleep(1);
verify(mMockBatteryUtils).setForceAppStandby(UID,
PACKAGE_NAME, AppOpsManager.MODE_ALLOWED);
@@ -147,8 +151,9 @@
}
@Test
- public void testSetAppOptimizationMode_Optimized_verifyAction() {
- mBatteryOptimizeUtils.setAppOptimizationMode(MODE_OPTIMIZED);
+ public void testSetAppUsageState_Optimized_verifyAction() throws Exception {
+ mBatteryOptimizeUtils.setAppUsageState(MODE_OPTIMIZED);
+ TimeUnit.SECONDS.sleep(1);
verify(mMockBatteryUtils).setForceAppStandby(UID,
PACKAGE_NAME, AppOpsManager.MODE_ALLOWED);
@@ -156,12 +161,13 @@
}
@Test
- public void testSetAppOptimizationMode_sameUnrestrictedMode_verifyNoAction() {
+ public void testSetAppUsageState_sameUnrestrictedMode_verifyNoAction() throws Exception {
// Sets the current mode as MODE_UNRESTRICTED.
mBatteryOptimizeUtils.mAllowListed = true;
mBatteryOptimizeUtils.mMode = AppOpsManager.MODE_ALLOWED;
- mBatteryOptimizeUtils.setAppOptimizationMode(MODE_UNRESTRICTED);
+ mBatteryOptimizeUtils.setAppUsageState(MODE_UNRESTRICTED);
+ TimeUnit.SECONDS.sleep(1);
verifyZeroInteractions(mMockBackend);
verifyZeroInteractions(mMockBatteryUtils);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
index 9df3ac9..c0b1394 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/OptimizedPreferenceControllerTest.java
@@ -18,8 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import com.android.settingslib.widget.RadioButtonPreference;
@@ -98,14 +96,11 @@
mPreference.setKey(mController.KEY_OPTIMIZED_PREF);
mController.handlePreferenceTreeClick(mPreference);
- verify(mockBatteryOptimizeUtils).setAppOptimizationMode(
- BatteryOptimizeUtils.MODE_OPTIMIZED);
+ assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
}
@Test
public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
- mController.handlePreferenceTreeClick(mPreference);
-
- verifyZeroInteractions(mockBatteryOptimizeUtils);
+ assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java
index 0986153..d826c8d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedPreferenceControllerTest.java
@@ -18,8 +18,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import com.android.settingslib.widget.RadioButtonPreference;
@@ -106,14 +104,11 @@
mPreference.setKey(mController.KEY_RESTRICTED_PREF);
mController.handlePreferenceTreeClick(mPreference);
- verify(mockBatteryOptimizeUtils).setAppOptimizationMode(
- BatteryOptimizeUtils.MODE_RESTRICTED);
+ assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
}
@Test
public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
- mController.handlePreferenceTreeClick(mPreference);
-
- verifyZeroInteractions(mockBatteryOptimizeUtils);
+ assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
index 004e97c..b0e9184 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/UnrestrictedPreferenceControllerTest.java
@@ -19,8 +19,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import com.android.settingslib.widget.RadioButtonPreference;
@@ -106,14 +104,11 @@
mPreference.setKey(mController.KEY_UNRESTRICTED_PREF);
mController.handlePreferenceTreeClick(mPreference);
- verify(mockBatteryOptimizeUtils).setAppOptimizationMode(
- BatteryOptimizeUtils.MODE_UNRESTRICTED);
+ assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
}
@Test
public void testHandlePreferenceTreeClick_incorrectPrefKey_noAction() {
- mController.handlePreferenceTreeClick(mPreference);
-
- verifyZeroInteractions(mockBatteryOptimizeUtils);
+ assertThat(mController.handlePreferenceTreeClick(mPreference)).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index c2c67e3..c7a4b2f 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -707,6 +707,7 @@
.setIcon(SliceTestUtils.FAKE_ICON)
.setFragmentName(SliceTestUtils.FAKE_FRAGMENT_NAME)
.setPreferenceControllerClassName(SliceTestUtils.FAKE_CONTROLLER_NAME)
+ .setHighlightMenuRes(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES)
.build();
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index df3d84f..a880681 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -322,6 +322,8 @@
values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, SliceTestUtils.FAKE_FRAGMENT_NAME);
values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, controllerClass);
values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI, buildUri(key).toSafeString());
+ values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE,
+ SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
index 1c9164a..97beeb3 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceTestUtils.java
@@ -35,6 +35,7 @@
public static final int FAKE_ICON = 1234;
public static final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName();
public static final String FAKE_CONTROLLER_NAME = FakeToggleController.class.getName();
+ public static final int FAKE_HIGHLIGHT_MENU_RES = FakeToggleController.HIGHLIGHT_MENU_RES;
public static void insertSliceToDb(Context context, String key) {
@@ -75,6 +76,8 @@
values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
customizedUnavailableSliceSubtitle);
values.put(SlicesDatabaseHelper.IndexColumns.PUBLIC_SLICE, isPublicSlice);
+ values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE,
+ FAKE_HIGHLIGHT_MENU_RES);
db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
db.close();
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
index b4385d8..cacd32c 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
@@ -102,6 +102,7 @@
assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
+ assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
assertThat(data.getUnavailableSliceSubtitle()).isNull();
}
@@ -122,6 +123,7 @@
assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
+ assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
}
@Test(expected = IllegalStateException.class)
@@ -154,6 +156,7 @@
assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isEqualTo(uri);
assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
+ assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
}
@Test(expected = IllegalStateException.class)
@@ -289,6 +292,7 @@
assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
+ assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
assertThat(data.getUnavailableSliceSubtitle()).isNull();
}
@@ -309,6 +313,7 @@
assertThat(data.getFragmentClassName()).isEqualTo(SliceTestUtils.FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
assertThat(data.getPreferenceController()).isEqualTo(SliceTestUtils.FAKE_CONTROLLER_NAME);
+ assertThat(data.getHighlightMenuRes()).isEqualTo(SliceTestUtils.FAKE_HIGHLIGHT_MENU_RES);
assertThat(data.getUnavailableSliceSubtitle()).isEqualTo(subtitle);
}
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index a943ac0..f025d3d 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -43,17 +43,18 @@
@RunWith(RobolectricTestRunner.class)
public class SlicesIndexerTest {
- private final String[] KEYS = new String[]{"key1", "key2", "key3"};
- private final String[] TITLES = new String[]{"title1", "title2", "title3"};
- private final String SUMMARY = "subtitle";
- private final String SCREEN_TITLE = "screen title";
- private final String KEYWORDS = "a, b, c";
- private final String FRAGMENT_NAME = "fragment name";
- private final int ICON = 1234; // I declare a thumb war
- private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
- private final String PREF_CONTROLLER = "com.android.settings.slices.tester";
- private final int SLICE_TYPE = SliceData.SliceType.SLIDER;
- private final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice";
+ private static final String[] KEYS = new String[]{"key1", "key2", "key3"};
+ private static final String[] TITLES = new String[]{"title1", "title2", "title3"};
+ private static final String SUMMARY = "subtitle";
+ private static final String SCREEN_TITLE = "screen title";
+ private static final String KEYWORDS = "a, b, c";
+ private static final String FRAGMENT_NAME = "fragment name";
+ private static final int ICON = 1234; // I declare a thumb war
+ private static final Uri URI = Uri.parse("content://com.android.settings.slices/test");
+ private static final String PREF_CONTROLLER = "com.android.settings.slices.tester";
+ private static final int SLICE_TYPE = SliceData.SliceType.SLIDER;
+ private static final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice";
+ private static final int HIGHLIGHT_MENU_KEY = 5678; // I declare a thumb war
private Context mContext;
@@ -142,6 +143,9 @@
.isEqualTo(UNAVAILABLE_SLICE_SUBTITLE);
assertThat(cursor.getInt(
cursor.getColumnIndex(IndexColumns.PUBLIC_SLICE))).isEqualTo(0);
+ assertThat(cursor.getInt(
+ cursor.getColumnIndex(IndexColumns.HIGHLIGHT_MENU_RESOURCE)))
+ .isEqualTo(HIGHLIGHT_MENU_KEY);
cursor.moveToNext();
}
} finally {
@@ -187,6 +191,9 @@
.isEqualTo(UNAVAILABLE_SLICE_SUBTITLE);
assertThat(cursor.getInt(
cursor.getColumnIndex(IndexColumns.PUBLIC_SLICE))).isEqualTo(1);
+ assertThat(cursor.getInt(
+ cursor.getColumnIndex(IndexColumns.HIGHLIGHT_MENU_RESOURCE)))
+ .isEqualTo(HIGHLIGHT_MENU_KEY);
cursor.moveToNext();
}
} finally {
@@ -220,7 +227,8 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER)
.setSliceType(SLICE_TYPE)
- .setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE);
+ .setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE)
+ .setHighlightMenuRes(HIGHLIGHT_MENU_KEY);
if (isPublicSlice) {
builder.setIsPublicSlice(true);
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
index 6812451..4e968a2 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
@@ -27,6 +27,7 @@
public class FakeToggleController extends TogglePreferenceController {
public static final String AVAILABILITY_KEY = "fake_toggle_availability_key";
+ public static final int HIGHLIGHT_MENU_RES = 5678;
public static final IntentFilter INTENT_FILTER = new IntentFilter(
WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
@@ -71,6 +72,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return HIGHLIGHT_MENU_RES;
+ }
+
+ @Override
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return TestWorker.class;
}
diff --git a/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java
index 8817a17..13e8c13 100644
--- a/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java
@@ -120,6 +120,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return 5678;
+ }
+
+ @Override
public int getAvailabilityStatus() {
return AVAILABLE;
}
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
index 7d43230..df6a38b 100644
--- a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
@@ -302,6 +302,11 @@
public Intent getIntent() {
return new Intent();
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return 0;
+ }
}
private class MockProviderModelSliceHelper extends ProviderModelSliceHelper {
diff --git a/tests/unit/src/com/android/settings/slices/SliceTestUtils.java b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java
index 1b035cd..40a827a 100644
--- a/tests/unit/src/com/android/settings/slices/SliceTestUtils.java
+++ b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java
@@ -35,6 +35,7 @@
public static final int FAKE_ICON = 1234;
public static final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName();
public static final String FAKE_CONTROLLER_NAME = FakeToggleController.class.getName();
+ public static final int FAKE_HIGHLIGHT_MENU_RES = FakeToggleController.HIGHLIGHT_MENU_RES;
public static void insertSliceToDb(Context context, String key) {
@@ -75,6 +76,8 @@
values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
customizedUnavailableSliceSubtitle);
values.put(SlicesDatabaseHelper.IndexColumns.PUBLIC_SLICE, isPublicSlice);
+ values.put(SlicesDatabaseHelper.IndexColumns.HIGHLIGHT_MENU_RESOURCE,
+ FAKE_HIGHLIGHT_MENU_RES);
db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
db.close();
diff --git a/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
index 4fcbd15..490b7bd 100644
--- a/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
+++ b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
@@ -143,5 +143,10 @@
public Intent getIntent() {
return null;
}
+
+ @Override
+ public int getSliceHighlightMenuRes() {
+ return 0;
+ }
}
}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeToggleController.java b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
index 9eda8b6..c232479 100644
--- a/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
+++ b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
@@ -27,6 +27,7 @@
public class FakeToggleController extends TogglePreferenceController {
public static final String AVAILABILITY_KEY = "fake_toggle_availability_key";
+ public static final int HIGHLIGHT_MENU_RES = 5678;
public static final IntentFilter INTENT_FILTER = new IntentFilter(
WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
@@ -71,6 +72,11 @@
}
@Override
+ public int getSliceHighlightMenuRes() {
+ return HIGHLIGHT_MENU_RES;
+ }
+
+ @Override
public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
return TestWorker.class;
}