Merge "Add some debug logging" into pi-dev
diff --git a/res/layout/dialog_sim_status.xml b/res/layout/dialog_sim_status.xml
index 9c67f13..27d12a8 100644
--- a/res/layout/dialog_sim_status.xml
+++ b/res/layout/dialog_sim_status.xml
@@ -167,5 +167,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/device_info_not_available"/>
+
+ <TextView
+ style="@style/device_info_dialog_label"
+ android:id="@+id/ims_reg_state_label"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/ims_reg_title"/>
+ <TextView
+ style="@style/device_info_dialog_value"
+ android:id="@+id/ims_reg_state_value"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/device_info_not_available"/>
</LinearLayout>
</ScrollView>
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
index e420d5f..8cc8db4 100644
--- a/res/layout/empty_printers_list_service_enabled.xml
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="12dip"
android:src="@drawable/ic_grayedout_printer"
- android:contentDescription="@string/print_searching_for_printers">
+ android:importantForAccessibility="no">
</ImageView>
<TextView
diff --git a/res/layout/time_zone_items_list.xml b/res/layout/time_zone_items_list.xml
new file mode 100644
index 0000000..8c9dd94
--- /dev/null
+++ b/res/layout/time_zone_items_list.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 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.
+ -->
+<android.support.v7.widget.RecyclerView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/recycler_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbars="vertical"/>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 941b86a..5064abe 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Foon ledig"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Oorbereken"</string>
- <string name="power_apps" msgid="2043554781293951327">"Programme"</string>
- <string name="power_service" msgid="1599661212370831780">"Dienste"</string>
- <string name="power_system" msgid="8290455327965307383">"Stelsel"</string>
- <string name="power_user" msgid="3706143225319881667">"Ander gebruikers"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Hou wakker"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Toestelnaam"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gebruik Bluetooth terwyl jy bestuur"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Skakel Bluetooth outomaties aan terwyl jy bestuur"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Sien Android 8.0-batteryinstellings"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi-beheer"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Laat program toe om Wi-Fi te beheer"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Laat hierdie program toe om Wi-Fi aan of af te skakel, Wi-Fi-netwerke te soek en aan hulle te koppel, netwerke by te voeg en te verwyder, en om \'n slegsplaaslike warmkol te begin"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7bacbb0..fe33315 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ የፈታበት"</string>
<string name="power_unaccounted" msgid="709925017022660740">"የተለያዩ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ከመጠን በላይ የተቆጠረ"</string>
- <string name="power_apps" msgid="2043554781293951327">"መተግበሪያዎች"</string>
- <string name="power_service" msgid="1599661212370831780">"አገልግሎቶች"</string>
- <string name="power_system" msgid="8290455327965307383">"ሥርዓት"</string>
- <string name="power_user" msgid="3706143225319881667">"ሌሎች ተጠቃሚዎች"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ ብሏል"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"የመሣሪያ ስም"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"መኪና ሲነዳ ብሉቱዝ ተጠቀም"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"እየነዳሁ ሳለ ብሉቱዝን በራስ-ሰር አብራ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"የAndroid 8.0 ባትሪ ቅንብሮችን ይመልከቱ"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"የWi-Fi ቁጥጥር"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"መተግበሪያ Wi-Fiን እንዲቆጣጠር ይፍቀዱ"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"ይህ መተግበሪያ Wi-Fiን እንዲያበራ ወይም እንዲያጠፋ፣ Wi-Fiን እንዲቃኝ እና ከWi-Fi አውታረ መረቦች ጋር እንዲገናኝ፣ አውታረ መረቦችን እንዲያክል ወይም እንዲያስወግድ፣ ወይም አካባቢያዊ ብቻ የሆነ መገናኛ ነጥብ እንዲጀምር ይፍቀዱለት"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c92396c..4b50777 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2403,10 +2403,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"الهاتف خامل"</string>
<string name="power_unaccounted" msgid="709925017022660740">"متنوعة"</string>
<string name="power_overcounted" msgid="2762354976171358445">"استخدام زائد عن الحد"</string>
- <string name="power_apps" msgid="2043554781293951327">"التطبيقات"</string>
- <string name="power_service" msgid="1599661212370831780">"الخدمات"</string>
- <string name="power_system" msgid="8290455327965307383">"النظام"</string>
- <string name="power_user" msgid="3706143225319881667">"مستخدمون آخرون"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"إجمالي استخدام CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU في المقدمة"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ابق متيقظًا"</string>
@@ -4407,7 +4403,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"اسم الجهاز"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"استخدام البلوتوث أثناء القيادة"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"تفعيل البلوتوث تلقائيًا أثناء القيادة"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"الاطلاع على إعدادات بطارية Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"التحكم في شبكة Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"السماح للتطبيق بالتحكم في شبكة Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"السماح لهذا التطبيق بتفعيل شبكة Wi-Fi أو إيقافها، أو البحث عن شبكات Wi-Fi والاتصال بها، أو إضافة الشبكات أو إزالتها، أو بدء نقطة اتصال للأجهزة المحلية فقط"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0eaec22..148650d 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -2345,10 +2345,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ফ\'ন নিষ্ক্ৰিয় হৈ আছে"</string>
<string name="power_unaccounted" msgid="709925017022660740">"অন্যান্য"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ভূল তথ্য"</string>
- <string name="power_apps" msgid="2043554781293951327">"এপ্"</string>
- <string name="power_service" msgid="1599661212370831780">"সেৱাসমূহ"</string>
- <string name="power_system" msgid="8290455327965307383">"ছিষ্টেম"</string>
- <string name="power_user" msgid="3706143225319881667">"অন্য ব্যৱহাৰকাৰীসকল"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU মুঠ"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU অগ্ৰভাগ"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"জাগ্ৰত কৰি ৰাখক"</string>
@@ -4286,8 +4282,6 @@
<skip />
<!-- no translation found for bluetooth_on_while_driving_summary (3196190732516898541) -->
<skip />
- <!-- no translation found for dev_android_o_battery_settings_title (2926578228655006762) -->
- <skip />
<string name="change_wifi_state_title" msgid="3261945855372885427">"ৱাই-ফাই নিয়ন্ত্ৰণ"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"এপক ৱাই-ফাই নিয়ন্ত্ৰণ কৰিবলৈ দিয়ক"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"এই এপক ৱাই-ফাই অন বা অফ কৰিবলৈ, ৱাই-ফাই নেটৱৰ্কসমূহ স্কেন কৰি সংযোগ কৰিবলৈ, নেটৱৰ্কসমূহ যোগ কৰিবলৈ বা আঁতৰাবলৈ বা স্থানীয়-মাত্ৰ হ\'টস্প\'ট আৰম্ভ কৰিবলৈ অনুমতি দিয়ক"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 800c503..06ef1c3 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inaktivdir"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Müxtəlif"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Artıq hesablanmış"</string>
- <string name="power_apps" msgid="2043554781293951327">"Tətbiqlər"</string>
- <string name="power_service" msgid="1599661212370831780">"Xidmətlər"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Digər istifadəçilər"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU toplam"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön plan"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Oyaq saxla"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Cihaz adı"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Maşında Bluetooth\'dan istifadə edin"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Avtomobil idarə edərkən Bluetooth\'u avtomatik aktiv edin"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 versiyasında batareya ayarlarına baxın"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi nəzarəti"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Tətbiqə Wi-Fi şəbəkəsinə nəzarət etmək icazəsi verin"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Bu tətbiqə Wi-Fi şəbəkəsini aktiv və ya deaktiv etmək, Wi-Fi şəbəkəsini skan etmək və ona qoşulmaq, şəbəkə əlavə etmək və ya silmək, eyni zamanda yalnız lokal olan hotspota qoşulmaq icazəsi verin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index c072899..67491f3 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2319,10 +2319,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Prekomerno izračunata"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
- <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Ostali korisnici"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Ukupno korišćenje procesora"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor u prednjem planu"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži van stanja spavanja"</string>
@@ -4209,7 +4205,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Naziv uređaja"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Uključi Bluetooth tokom vožnje"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Uključite Bluetooth automatski kada vozite"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Pogledajte podešavanja baterije za Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Kontrola Wi-Fi veze"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Omogućite da aplikacija kontroliše Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Omogućite da ova aplikacija uključi ili isključi Wi-Fi, traži i povezuje se na Wi-Fi mreže, dodaje i uklanja mreže ili pokreće samo lokalni hotspot"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d20309e..184418b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1096,12 +1096,9 @@
<string name="color_mode_option_natural" msgid="5013837483986772758">"Натуральны"</string>
<string name="color_mode_option_boosted" msgid="8588223970257287524">"Узмоцнены"</string>
<string name="color_mode_option_saturated" msgid="4569683960058798843">"Насычаны"</string>
- <!-- no translation found for color_mode_option_automatic (8781254568140509331) -->
- <skip />
- <!-- no translation found for color_mode_summary_natural (6624188642920403099) -->
- <skip />
- <!-- no translation found for color_mode_summary_automatic (4669516973360709431) -->
- <skip />
+ <string name="color_mode_option_automatic" msgid="8781254568140509331">"Аўтаматычна"</string>
+ <string name="color_mode_summary_natural" msgid="6624188642920403099">"Толькі натуральныя колеры"</string>
+ <string name="color_mode_summary_automatic" msgid="4669516973360709431">"Сярэдняе паміж насычанымі і натуральнымі колерамі"</string>
<string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта"</string>
<string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Аўтаматычна змяняць арыентацыю экрана пры павароце тэлефона"</string>
<string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта"</string>
@@ -1664,8 +1661,7 @@
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"Увядзіце PIN-код яшчэ раз"</string>
<string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Паролі не супадаюць"</string>
<string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-коды не супадаюць"</string>
- <!-- no translation found for lockpassword_draw_your_pattern_again_header (2872194349688886781) -->
- <skip />
+ <string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"Начарціце ўзор разблакіроўкі яшчэ раз"</string>
<string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Выбар спосабу разблакіроўкі"</string>
<string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Пароль усталяваны"</string>
<string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-код усталяваны"</string>
@@ -1783,10 +1779,8 @@
<string name="unknown" msgid="1592123443519355854">"Невядома"</string>
<string name="sort_order_alpha" msgid="1410278099123670628">"Сартаваць па імені"</string>
<string name="sort_order_size" msgid="7024513286636502362">"Сартаваць па памеры"</string>
- <!-- no translation found for sort_order_recent_notification (6064103501358974282) -->
- <skip />
- <!-- no translation found for sort_order_frequent_notification (1733204081305830670) -->
- <skip />
+ <string name="sort_order_recent_notification" msgid="6064103501358974282">"Самыя апошнія"</string>
+ <string name="sort_order_frequent_notification" msgid="1733204081305830670">"Самыя частыя"</string>
<string name="show_running_services" msgid="5736278767975544570">"Паказаць запушчаныя службы"</string>
<string name="show_background_processes" msgid="2009840211972293429">"Паказаць кэшаваныя працэсы"</string>
<string name="default_emergency_app" msgid="1951760659640369980">"Дадатак для экстраных сітуацый"</string>
@@ -2354,10 +2348,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Тэлефон у рэжыме чакання"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Рознае"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Няўлічанае"</string>
- <string name="power_apps" msgid="2043554781293951327">"Праграмы"</string>
- <string name="power_service" msgid="1599661212370831780">"Сэрвісы"</string>
- <string name="power_system" msgid="8290455327965307383">"Сістэма"</string>
- <string name="power_user" msgid="3706143225319881667">"Іншыя карыстальнікі"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"ЦП – усяго"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Асноўнае выкарыстанне працэсару"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Не ўвах. у рэжым сна"</string>
@@ -2907,8 +2897,7 @@
<string name="user_add_user_item_title" msgid="8212199632466198969">"Карыстальнік"</string>
<string name="user_add_profile_item_title" msgid="8353515490730363621">"Абмежаваны профiль"</string>
<string name="user_add_user_title" msgid="2108112641783146007">"Дадаць новага карыстальніка?"</string>
- <!-- no translation found for user_add_user_message_long (6768718238082929201) -->
- <skip />
+ <string name="user_add_user_message_long" msgid="6768718238082929201">"Вы можаце адкрыць доступ да гэтай прылады іншым людзям шляхам стварэння дадатковых карыстальнікаў. Кожны карыстальнік мае свой уласны раздзел, на якім ён можа наладзіць свае праграмы, шпалеры і іншае. Карыстальнікі таксама могуць наладжваць параметры прылады, напрыклад Wi-Fi, якія ўплываюць на ўсіх.\n\nКалі вы дадаяце новага карыстальніка, ён павінен наладзіць свой раздзел.\n\nЛюбы карыстальнік можа абнаўляць праграмы для ўсіх астатніх карыстальнікаў. Спецыяльныя магчымасці наладжваюцца асабіста кожным карыстальнікам."</string>
<string name="user_add_user_message_short" msgid="1511354412249044381">"Пасля стварэння профіля яго трэба наладзіць.\n\nЛюбы карыстальнік прылады можа абнаўляць праграмы ўсіх іншых карыстальнікаў."</string>
<string name="user_setup_dialog_title" msgid="1765794166801864563">"Наладзiць карыстальнiкаў?"</string>
<string name="user_setup_dialog_message" msgid="1004068621380867148">"Пераканайцеся, што чалавек мае магчымасць узяць прыладу і наладзіць свой раздзел"</string>
@@ -3340,12 +3329,9 @@
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Надзвычайная важнасць"</string>
<string name="notification_switch_label" msgid="6843075654538931025">"Паказваць апавяшчэнні"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Памочнік па апавяшчэннях"</string>
- <!-- no translation found for notifications_sent_daily (113065754206235356) -->
- <skip />
- <!-- no translation found for notifications_sent_weekly (8348151826170109624) -->
- <skip />
- <!-- no translation found for notifications_sent_never (1001964786456700536) -->
- <skip />
+ <string name="notifications_sent_daily" msgid="113065754206235356">"~<xliff:g id="NUMBER">%1$s</xliff:g> штодзённа"</string>
+ <string name="notifications_sent_weekly" msgid="8348151826170109624">"~<xliff:g id="NUMBER">%1$s</xliff:g> штотыднёва"</string>
+ <string name="notifications_sent_never" msgid="1001964786456700536">"Ніколі"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ да апавяшчэнняў"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Доступ да апавяшчэнняў працоўнага профілю заблакіраваны"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Прыкладанні не могуць чытаць апавяшчэнні"</string>
@@ -3877,20 +3863,13 @@
<string name="condition_work_summary" msgid="7543202177571590378">"Праграмы, фонавая сінхранізацыя і іншыя функцыі, звязаныя з вашым працоўным профілем, адключаны."</string>
<!-- no translation found for condition_device_muted_action_turn_on_sound (4930240942726349213) -->
<skip />
- <!-- no translation found for condition_device_muted_title (3095044864508335783) -->
- <skip />
- <!-- no translation found for condition_device_muted_title (5818278137378379647) -->
- <skip />
- <!-- no translation found for condition_device_muted_summary (5445341185705628047) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_title (1983420639621523345) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_title (1087633233379991925) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_summary (433514444618164607) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_summary (5877034997839162763) -->
- <skip />
+ <string name="condition_device_muted_title" product="tablet" msgid="3095044864508335783">"Гук выключаны"</string>
+ <string name="condition_device_muted_title" product="default" msgid="5818278137378379647">"Гук выключаны"</string>
+ <string name="condition_device_muted_summary" msgid="5445341185705628047">"Для выклікаў і апавяшчэнняў гук выключаны"</string>
+ <string name="condition_device_vibrate_title" product="tablet" msgid="1983420639621523345">"Уключана вібрацыя"</string>
+ <string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"Уключана вібрацыя"</string>
+ <string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"Для выклікаў і апавяшчэнняў уключана вібрацыя"</string>
+ <string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"Для выклікаў і апавяшчэнняў уключана вібрацыя"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Глядзець графік \"Начной падсветкі\""</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"Аўтаматычна мяняць колер экрана ўвечары"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Начная падсветка ўключана"</string>
@@ -4294,7 +4273,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Назва прылады"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"За рулём выкарыстоўвайце Bluetooth"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Аўтаматычна ўключаць Bluetooth, калі вы за рулём"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Налады акумулятара для Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Кіраванне наладамі Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Дазволіць праграме кіраваць наладамі Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Дазволіць гэтай праграме ўключаць ці выключаць Wi-Fi, шукаць сеткі Wi-Fi і падключацца да іх, дадаваць або выдаляць сеткі ці запускаць лакальны хот-спот"</string>
@@ -4309,22 +4287,14 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Як прадоўжыць час працы акумулятара прылады"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Як прадоўжыць час працы акумулятара тэлефона"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <!-- no translation found for gesture_prevent_ringing_screen_title (7840226017975251549) -->
- <skip />
- <!-- no translation found for gesture_prevent_ringing_title (2483159069038138740) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_vibrate (7286821846542822661) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_mute (7551545579059879853) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_none (4656046650769569175) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_vibrate_summary (1065493645461576417) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_mute_summary (4235786586339197293) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_none_summary (8037313710474671901) -->
- <skip />
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Адключыць гук"</string>
+ <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Адначасова націсніце кнопкі сілкавання і павелічэння гучнасці"</string>
+ <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Вібрацыя"</string>
+ <string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Без гуку"</string>
+ <string name="prevent_ringing_option_none" msgid="4656046650769569175">"Нічога не рабіць"</string>
+ <string name="prevent_ringing_option_vibrate_summary" msgid="1065493645461576417">"Уключыць вібрацыю для ўсіх выклікаў і паведамленняў"</string>
+ <string name="prevent_ringing_option_mute_summary" msgid="4235786586339197293">"Адключыць гук для выклікаў і апавяшчэнняў"</string>
+ <string name="prevent_ringing_option_none_summary" msgid="8037313710474671901">"Нічога не рабіць"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"Інфармацыя аб сетцы"</string>
<!-- no translation found for about_phone_device_name_warning (8885670415541365348) -->
<skip />
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c87af48..7c6904e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Телефонът не се използва"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Друго"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Отчетено в повече"</string>
- <string name="power_apps" msgid="2043554781293951327">"Приложения"</string>
- <string name="power_service" msgid="1599661212370831780">"Услуги"</string>
- <string name="power_system" msgid="8290455327965307383">"Система"</string>
- <string name="power_user" msgid="3706143225319881667">"Други потребители"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Процесор, общо"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Оставяне в будно състояние"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Име на устройството"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Ползване на Bluetooth при шофиране"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Автоматично включване на Bluetooth при шофиране"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Преглед на настройките за батерията под Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Управление на Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Разрешаване на приложението да управлява Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Разрешаване на това приложение да включва и изключва Wi-Fi, да сканира за Wi-Fi мрежи и да се свързва с тях, да добавя или премахва мрежи и да стартира точки за достъп само на локално ниво"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d13ce51..7f88fff 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ফোন নিষ্ক্রিয়"</string>
<string name="power_unaccounted" msgid="709925017022660740">"বিবিধ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"নির্ধারিত থেকে বেশী"</string>
- <string name="power_apps" msgid="2043554781293951327">"অ্যাপ"</string>
- <string name="power_service" msgid="1599661212370831780">"পরিষেবাগুলি"</string>
- <string name="power_system" msgid="8290455327965307383">"সিস্টেম"</string>
- <string name="power_user" msgid="3706143225319881667">"অন্যান্য ব্যবহারকারী"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU মোট"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ফোরগ্রাউন্ড"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"জাগ্রত রাখুন"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ডিভাইসের নাম"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ড্রাইভ করার সময় ব্লুটুথ চালু রাখুন"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ড্রাইভ করার সময় নিজে থেকে ব্লুটুথ চালু হতে দিন"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 এর ব্যাটারি সেটিংস দেখুন"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"ওয়াই-ফাই নিয়ন্ত্রণ"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"অ্যাপটিকে ওয়াই-ফাই নিয়ন্ত্রণ করতে দিন"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"এই অ্যাপটিকে ওয়াই-ফাই চালু অথবা বন্ধ করতে, ওয়াই-ফাই নেটওয়ার্ক স্ক্যান করে তাতে কানেক্ট করতে, নেটওয়ার্ক যোগ করতে বা মুছে ফেলতে অথবা শুধুমাত্র স্থানীয় ব্যবহারের জন্য হটস্পট চালু করতে দিন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 23ab87e..6095119 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -2319,10 +2319,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u stanju mirovanja"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Prekoračenje izračuna"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
- <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Drugi korisnici"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU u prvom planu"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Drži aktivnim"</string>
@@ -4209,7 +4205,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Naziv uređaja"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Koristite Bluetooth za vrijeme vožnje"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatski uključite Bluetooth za vrijeme vožnje"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Pogledajte postavke baterije za Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Upravljanje Wi-Fi mrežom"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Dozvolite aplikaciji da upravlja Wi-Fi mrežom"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Dozvolite ovoj aplikaciji da uključi ili isključi Wi-Fi, skenira i konektuje se na Wi-Fi, doda ili ukloni mreže, te pokrene lokalnu pristupnu tačku"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 199c770..52c5df1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1337,7 +1337,7 @@
<string name="storage_internal_format_details" msgid="4018647158382548820">"Un cop l\'hagis formatat, podràs fer servir <xliff:g id="NAME_0">^1</xliff:g> en altres dispositius. \n\nTotes les dades que hi hagi a <xliff:g id="NAME_1">^1</xliff:g> s\'esborraran. Et recomanem que en facis una còpia de seguretat primer.\n\n"<b>"Fer una còpia de seguretat de les fotos i d\'altres fitxers multimèdia"</b>\n"Desplaça els fitxers multimèdia a un emmagatzematge alternatiu del dispositiu o transfereix-los a un ordinador mitjançant un cable USB. \n\n"<b>"Fer una còpia de seguretat de les aplicacions"</b>" \nTotes les aplicacions que hi hagi a <xliff:g id="NAME_6">^1</xliff:g> es desinstal·laran i se n\'esborraran les dades. Per conservar aquestes aplicacions, desplaça-les a un emmagatzematge alternatiu del dispositiu."</string>
<string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Si expulses <xliff:g id="NAME_0">^1</xliff:g>, les aplicacions que hi hagi instal·lades deixaran de funcionar i els fitxers multimèdia que contingui deixaran d\'estar disponibles fins que no es torni a inserir."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> està formatat per funcionar només en aquest dispositiu. No funcionarà en altres dispositius."</string>
<string name="storage_internal_forget_details" msgid="9028875424669047327">"Torna a inserir el dispositiu d\'emmagatzematge <xliff:g id="NAME">^1</xliff:g> per fer servir les aplicacions, les fotos o les dades que conté. \n\nTambé pots triar que s\'esborri el contingut emmagatzemat si el dispositiu no està disponible. \n\nSi tries aquesta darrera opció, es perdran permanentment totes les dades emmagatzemades al dispositiu. \n\nPodràs tornar a instal·lar les aplicacions més endavant, però no podràs recuperar les dades que tenies emmagatzemades al dispositiu."</string>
- <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Vols oblidar <xliff:g id="NAME">^1</xliff:g>?"</string>
+ <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Vols esborrar <xliff:g id="NAME">^1</xliff:g>?"</string>
<string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Les aplicacions, les fotos i les dades que s\'hagin desat a <xliff:g id="NAME">^1</xliff:g> es perdran per sempre."</string>
<string name="storage_detail_apps" msgid="6141154016753507490">"Aplicacions"</string>
<string name="storage_detail_images" msgid="6950678857740634769">"Imatges"</string>
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Altres"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Comptabilitzada més d\'una vegada"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplicacions"</string>
- <string name="power_service" msgid="1599661212370831780">"Serveis"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Altres usuaris"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantén actiu"</string>
@@ -2745,7 +2741,7 @@
<string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Vols desconnectar aquesta VPN?"</string>
<string name="vpn_disconnect" msgid="7426570492642111171">"Desconnecta"</string>
<string name="vpn_version" msgid="1939804054179766249">"Versió <xliff:g id="VERSION">%s</xliff:g>"</string>
- <string name="vpn_forget_long" msgid="2232239391189465752">"Oblida la VPN"</string>
+ <string name="vpn_forget_long" msgid="2232239391189465752">"Esborra la VPN"</string>
<string name="vpn_replace_vpn_title" msgid="2963898301277610248">"Vols substituir la VPN actual?"</string>
<string name="vpn_set_vpn_title" msgid="4009987321156037267">"Vols definir la VPN sempre activa?"</string>
<string name="vpn_first_always_on_vpn_message" msgid="7144543717673197102">"Quan activis aquesta opció de configuració, no tindràs connexió a Internet fins que la VPN no es connecti correctament"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nom del dispositiu"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilitza Bluetooth mentre condueixo"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activa el Bluetooth automàticament mentre condueixo"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Consulta la configuració de la bateria d\'Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Control de la Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permet que l\'aplicació controli la Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permet que aquesta aplicació activi o desactivi la Wi-Fi, cerqui xarxes Wi-Fi, s\'hi connecti, n\'afegeixi o en suprimeixi, o que iniciï un punt d\'accés Wi-Fi només local"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f32e936..2a87b58 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"V nečinnosti"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Různé"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Nadhodnoceno"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikace"</string>
- <string name="power_service" msgid="1599661212370831780">"Služby"</string>
- <string name="power_system" msgid="8290455327965307383">"Systém"</string>
- <string name="power_user" msgid="3706143225319881667">"Další uživatelé"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Doba provozu procesoru"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázat režim spánku"</string>
@@ -4275,7 +4271,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Název zařízení"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Při řízení používat Bluetooth"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Při řízení automaticky zapnout Bluetooth"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Zobrazit nastavení baterie na platformě Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Ovládání sítí Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Povolit aplikaci ovládat Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Povolte této aplikaci zapínat a vypínat Wi-Fi, vyhledávat sítě Wi-Fi a připojovat se k nim, přidávat nebo odstraňovat sítě nebo nastavit místní hotspot"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f98a4be..e6369f2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Inaktiv telefon"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Overvurderet"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Tjenester"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Andre brugere"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Lås ikke"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Enhedsnavn"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Brug Bluetooth, når du kører"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivér Bluetooth automatisk, når du kører"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Se batteriindstillingerne for Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Styring af Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Giv appen tilladelse til at styre Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Giv denne app tilladelse til at aktivere og deaktivere Wi-Fi, søge efter og oprette forbindelse til Wi-Fi-netværk, tilføje og fjerne netværk eller starte et lokalt hotspot"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 22c6812..77e75d4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Ruhezustand"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Sonstiges"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Zu hoch berechnet"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Dienste"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Andere Nutzer"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU insgesamt"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Aktiv lassen"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Gerätename"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Im Auto Bluetooth verwenden"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Beim Autofahren automatisch Bluetooth aktivieren"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Akkueinstellungen im Android 8.0-Format anzeigen"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"WLAN-Steuerung"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"App darf WLAN steuern"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Diese App darf WLAN aktivieren oder deaktivieren, nach WLANs scannen und eine Verbindung zu ihnen herstellen, Netzwerke hinzufügen oder entfernen oder einen lokal beschränkten Hotspot starten"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 680d6a6..699730c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Διάφορα"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Υπερεκτίμηση"</string>
- <string name="power_apps" msgid="2043554781293951327">"Εφαρμογές"</string>
- <string name="power_service" msgid="1599661212370831780">"Υπηρεσίες"</string>
- <string name="power_system" msgid="8290455327965307383">"Σύστημα"</string>
- <string name="power_user" msgid="3706143225319881667">"Άλλοι χρήστες"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Συνολικός χρόνος CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Διατήρηση λειτουρ."</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Όνομα συσκευής"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Χρήση Bluetooth κατά την οδήγηση"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Να ενεργοποιείται αυτόματα το Bluetooth κατά την οδήγηση"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ανατρέξτε στις ρυθμίσεις μπαταρίας του Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Έλεγχος Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Να επιτρέπεται στην εφαρμογή ο έλεγχος του Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Να επιτρέπεται σε αυτήν την εφαρμογή η ενεργοποίηση ή απενεργοποίηση του Wi-Fi, η σάρωση και η σύνδεση σε δίκτυα Wi-Fi, η προσθήκη ή κατάργηση δικτύων ή η έναρξη τοπικών σημείων πρόσβασης Wi-Fi"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 0e92ce9..79ea415 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Other users"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi control"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Allow app to control Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Allow this app to turn Wi-Fi on or off, scan and connect to Wi-Fi networks, add or remove networks, or start a local-only hotspot"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 8d50431..4acd6f0 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Other users"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi control"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Allow app to control Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Allow this app to turn Wi-Fi on or off, scan and connect to Wi-Fi networks, add or remove networks, or start a local-only hotspot"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0e92ce9..79ea415 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Other users"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi control"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Allow app to control Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Allow this app to turn Wi-Fi on or off, scan and connect to Wi-Fi networks, add or remove networks, or start a local-only hotspot"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0e92ce9..79ea415 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Other users"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi control"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Allow app to control Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Allow this app to turn Wi-Fi on or off, scan and connect to Wi-Fi networks, add or remove networks, or start a local-only hotspot"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index dbd07c1..96fe622 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -2290,10 +2290,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Other users"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
@@ -4144,7 +4140,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Device name"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Use Bluetooth when driving"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Turn on Bluetooth automatically when driving"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"See Android 8.0 battery settings"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi control"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Allow app to control Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Allow this app to turn Wi-Fi on or off, scan and connect to Wi-Fi networks, add or remove networks, or start a local-only hotspot"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ee7fa9f..d503e72 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Varios"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Servicios"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Otros usuarios"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
@@ -4141,7 +4137,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nombre del dispositivo"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth mientras conduces"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activar Bluetooth automáticamente mientras conduces"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver la configuración de la batería de Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Control de Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permitir que la app controle Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permite que esta app active o desactive la conexión Wi-Fi, busque y se conecte a redes Wi-Fi, agregue o quite redes, o inicie un hotspot de acceso local exclusivo."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 33be35d..22899a2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2256,7 +2256,7 @@
<string name="restricted_app_detail_footer" msgid="5888756210317863211">"Las aplicaciones que aparecen en esta página no funcionan correctamente y han estado usando la batería en segundo plano.\n\nEstas aplicaciones se han bloqueado para que no utilicen la batería en segundo plano. Como resultado, es posible que se retrasen las notificaciones de algunas aplicaciones."</string>
<string name="battery_auto_restriction_title" msgid="4698846356558232573">"Restringir aplicaciones automáticamente"</string>
<string name="battery_auto_restriction_summary" msgid="1816325499514435434">"Evita que las aplicaciones utilicen batería adicional en segundo plano"</string>
- <string name="battery_manager_on" msgid="5220248516776017806">"Activado/Las aplicaciones se restringen automáticamente"</string>
+ <string name="battery_manager_on" msgid="5220248516776017806">"Activado (las aplicaciones se restringen automáticamente)"</string>
<string name="battery_manager_off" msgid="5473135235710343576">"Desactivado"</string>
<plurals name="battery_manager_app_restricted" formatted="false" msgid="1026141135861471129">
<item quantity="other">%1$d aplicaciones restringidas</item>
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Varios"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplicaciones"</string>
- <string name="power_service" msgid="1599661212370831780">"Servicios"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Otros usuarios"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nombre del dispositivo"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth al conducir"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activar el Bluetooth automáticamente al conducir"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver los ajustes de la batería de Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Control de la conexión Wi‑Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permitir que la aplicación controle la conexión Wi‑Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permitir que esta aplicación active o desactive la conexión Wi‑Fi, busque redes Wi‑Fi y se conecte a ellas, añada o quite redes o inicie un punto de acceso local"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0bce4c2..5efb5e8 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon tegevuseta"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Muu"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Liigselt arvestatud"</string>
- <string name="power_apps" msgid="2043554781293951327">"Rakendused"</string>
- <string name="power_service" msgid="1599661212370831780">"Teenused"</string>
- <string name="power_system" msgid="8290455327965307383">"Süsteem"</string>
- <string name="power_user" msgid="3706143225319881667">"Teised kasutajad"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU kokku"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU esiplaanil"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Hoia ärkvel"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Seadme nimi"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetoothi kasutamine sõidu ajal"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetoothi automaatne sisselülitamine sõidu ajal"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Vaadake Android 8.0 akuseadeid"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"WiFi-seadete juhtimine"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Lubage rakendusel WiFi-seadeid juhtida"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Lubage sellel rakendusel WiFi sisse või välja lülitada, otsida WiFi-võrke ja nendega ühendus luua, võrke lisada või eemaldada või luua kohalik leviala"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 9dd9e75..783fe11 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -1238,8 +1238,8 @@
<string name="meid_multi_sim" msgid="748999971744491771">"MEID (%1$d. SIM zirrikitua)"</string>
<string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
<string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
- <string name="status_data_network_type" msgid="7570837037428932780">"Datu-konexioaren sare mota"</string>
- <string name="status_voice_network_type" msgid="5663112239742353547">"Mugikorraren ahots-deien sare mota"</string>
+ <string name="status_data_network_type" msgid="7570837037428932780">"Datuetarako sare mugikor mota"</string>
+ <string name="status_voice_network_type" msgid="5663112239742353547">"Ahots-deietarako sare mugikor mota"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operadorearen informazioa"</string>
<string name="status_data_state" msgid="5503181397066522950">"Sare mugikorraren egoera"</string>
<string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
@@ -1909,7 +1909,7 @@
<string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Bistaratu erabilgarri dauden lasterbideak"</string>
<string name="default_keyboard_layout" msgid="4172606673510531271">"Lehenetsia"</string>
<string name="pointer_speed" msgid="1221342330217861616">"Erakuslearen abiadura"</string>
- <string name="game_controller_settings_category" msgid="8794508575329923718">"Bideojoko-kontrolagailua"</string>
+ <string name="game_controller_settings_category" msgid="8794508575329923718">"Bideo-jokoen kontrolagailua"</string>
<string name="vibrate_input_devices" msgid="421936611134697943">"Birbideratu dardara"</string>
<string name="vibrate_input_devices_summary" msgid="82093256723774584">"Bidali dardara bideo-jokoen kontrolagailura hura konektatzean"</string>
<string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Aukeratu teklatuaren diseinua"</string>
@@ -2007,7 +2007,7 @@
<string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Koloreen alderantzikatzea"</string>
<string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Baliteke errendimenduan eragina izatea"</string>
<string name="accessibility_autoclick_preference_title" msgid="2434062071927416098">"Itxarote-denbora"</string>
- <string name="accessibility_autoclick_description" msgid="4908960598910896933">"Sagu bat erabiltzen ari bazara, kurtsorea konfigura dezakezu denbora-tarte jakin batean geldirik badago, ekintzaren bat gauzatzeko."</string>
+ <string name="accessibility_autoclick_description" msgid="4908960598910896933">"Sagua erabiltzen ari bazara, kurtsorea denbora tarte jakin batean geldirik egon ondoren ekintzaren bat automatikoki gauza dezan konfigura dezakezu."</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Klik egin aurretiko atzerapena"</string>
<string name="accessibility_vibration_settings_title" msgid="3453277326300320803">"Dardara"</string>
<string name="accessibility_notification_vibration_title" msgid="660829933960942244">"Dardara tonua jotzean eta jakinarazpenak daudenean"</string>
@@ -2030,7 +2030,7 @@
<!-- no translation found for show_number_hearingaid_count (3160782397139295486) -->
<string name="accessibility_summary_state_enabled" msgid="7914278500885887763">"Aktibatuta"</string>
<string name="accessibility_summary_state_disabled" msgid="2984230257590246745">"Desaktibatuta"</string>
- <string name="accessibility_summary_state_stopped" msgid="1144156815350270876">"Ez du funtzionatzen. Sakatu informazio gehiago lotzeko."</string>
+ <string name="accessibility_summary_state_stopped" msgid="1144156815350270876">"Ez du funtzionatzen. Sakatu informazio gehiago lortzeko."</string>
<string name="accessibility_description_state_stopped" msgid="6953539746047006596">"Zerbitzu hau ez dabil behar bezala."</string>
<string name="enable_quick_setting" msgid="2366999897816894536">"Erakutsi Ezarpen bizkorretan"</string>
<string name="daltonizer_type" msgid="1124178250809091080">"Zuzenketa modua"</string>
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefonoa inaktibo"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Askotarikoak"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Uste baino gutxiago erabili da"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikazioak"</string>
- <string name="power_service" msgid="1599661212370831780">"Zerbitzuak"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Beste erabiltzaileak"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"PUZaren erabilera, guztira"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUaren aurreko planoa"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantendu aktibo"</string>
@@ -4143,10 +4139,9 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Gailuaren izena"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Erabili Bluetooth konexioa gidatu bitartean"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktibatu automatikoki Bluetooth konexioa gidatu bitartean"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ikusi Android 8.0 sistema eragilearen bateriaren ezarpenak"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi konexioa kontrolatzeko aukera"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Baimendu aplikazioari Wi-Fi konexioa kontrolatzea"</string>
- <string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Baimendu aplikazio honi Wi-Fi konexioa aktibatzea edo desaktibatzea, Wi-Fi sareak bilatzea eta haietara konektatzea, sareak gehitzea edo kentzea, edota sare-publiko lokal bat sortzea"</string>
+ <string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Baimendu aplikazio honi Wi-Fi konexioa aktibatzea edo desaktibatzea, Wi-Fi sareak bilatzea eta haietara konektatzea, sareak gehitzea edo kentzea, edota sare publiko lokal bat sortzea"</string>
<string name="media_output_title" msgid="115223550977351699">"Erreproduzitu multimedia-edukia hemen:"</string>
<string name="media_output_summary" product="default" msgid="6839458453831567167">"Telefonoa"</string>
<string name="media_output_summary" product="tablet" msgid="7217221078578554515">"Tableta"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index aa43e22..1cafb43 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"حالت بلااستفاده تلفن"</string>
<string name="power_unaccounted" msgid="709925017022660740">"موارد دیگر"</string>
<string name="power_overcounted" msgid="2762354976171358445">"بیش از حد محاسبه شده"</string>
- <string name="power_apps" msgid="2043554781293951327">"برنامهها"</string>
- <string name="power_service" msgid="1599661212370831780">"سرویسها"</string>
- <string name="power_system" msgid="8290455327965307383">"سیستم"</string>
- <string name="power_user" msgid="3706143225319881667">"کاربران دیگر"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"مقدار کل CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"پیش زمینه CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار باش"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"نام دستگاه"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"استفاده از بلوتوث هنگام رانندگی"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"روشن شدن خودکار بلوتوث هنگام رانندگی"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"تنظیمات باتری Android نسخه ۸.۰ را ببینید"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"کنترل Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"اجازه دادن به برنامه برای کنترل Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"به این برنامه اجازه دهید Wi-Fi را روشن یا خاموش کند، شبکههای Wi-Fi را اسکن کند و به آنها متصل شود، شبکهها را اضافه یا حذف کند یا نقطه اتصالی فقط محلی راهاندازی کند"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5ec8f26..d9a8cea 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Muut"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Yliarvioitu"</string>
- <string name="power_apps" msgid="2043554781293951327">"Sovellukset"</string>
- <string name="power_service" msgid="1599661212370831780">"Palvelut"</string>
- <string name="power_system" msgid="8290455327965307383">"Järjestelmä"</string>
- <string name="power_user" msgid="3706143225319881667">"Muut käyttäjät"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Suorittimen käyttöaika yhteensä"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Ei virransäästötilaa"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Laitteen nimi"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Käytä Bluetoothia ajon aikana"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ota Bluetooth automaattisesti käyttöön ajon aikana"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Katso Android 8.0:n akkuasetukset"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fin hallinta"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Anna sovelluksen hallita Wi-Fiä"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Anna sovelluksen asettaa Wi-Fi päälle ja pois päältä, hakea Wi-Fi-verkkoja ja yhdistää niihin, lisätä ja poistaa verkkoja ja käynnistää paikallisen hotspotin."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index eb3029e3..89d5b9a 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2256,7 +2256,7 @@
<string name="restricted_app_detail_footer" msgid="5888756210317863211">"Les applications indiquées ici ne se comportent pas correctement et ont utilisé la pile en arrière-plan.\n\nCes applications ne pourront maintenant plus utiliser la pile en arrière-plan. En conséquence, les notifications de certaines applications pourraient être retardées."</string>
<string name="battery_auto_restriction_title" msgid="4698846356558232573">"Restreindre les applications automatiquement"</string>
<string name="battery_auto_restriction_summary" msgid="1816325499514435434">"Empêcher les applications d\'utiliser la pile en arrière-plan"</string>
- <string name="battery_manager_on" msgid="5220248516776017806">"Activé : Restreindre automatiquement les applications"</string>
+ <string name="battery_manager_on" msgid="5220248516776017806">"Activé : restreindre automatiquement les applications"</string>
<string name="battery_manager_off" msgid="5473135235710343576">"Désactivé"</string>
<plurals name="battery_manager_app_restricted" formatted="false" msgid="1026141135861471129">
<item quantity="one">%1$d application restreinte</item>
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Divers"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
- <string name="power_apps" msgid="2043554781293951327">"Applications"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"Système"</string>
- <string name="power_user" msgid="3706143225319881667">"Autres utilisateurs"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Durée d\'utilisation totale de l\'UC"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nom de l\'appareil"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utiliser le Bluetooth lors de la conduite"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activer automatiquement le Bluetooth lorsque vous conduisez"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Voir les paramètres de pile d\'Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Gestion du Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Autoriser l\'application à gérer le Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Autorisez cette application à activer ou à désactiver le Wi-Fi, à rechercher les réseaux Wi-Fi et à s\'y connecter, à ajouter et à supprimer des réseaux ou à créer un point d\'accès local uniquement"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 020e147..6d7bb6d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Autres utilisations"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
- <string name="power_apps" msgid="2043554781293951327">"Applications"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"Système"</string>
- <string name="power_user" msgid="3706143225319881667">"Autres utilisateurs"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Processeur - Durée totale"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Processeur - Premier plan"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nom de l\'appareil"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utiliser le Bluetooth en conduisant"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activer automatiquement le Bluetooth lorsque vous conduisez"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Afficher les paramètres de batterie d\'Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Contrôle Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Autoriser l\'application à contrôler le Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Autoriser cette application à activer ou désactiver le Wi-Fi, à rechercher les réseaux Wi-Fi et à s\'y connecter, à ajouter ou supprimer des réseaux ou à lancer un point d\'accès local"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index be377b3..5420be1 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Varios"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Reconto excesivo"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplicacións"</string>
- <string name="power_service" msgid="1599661212370831780">"Servizos"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Outros usuarios"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome do dispositivo"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar o Bluetooth ao conducir"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Activa automaticamente o Bluetooth mentres conduces"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver a configuración da batería de Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Control da wifi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permitir que a aplicación controle a wifi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permite que esta aplicación active ou desactive a wifi, busque redes wifi e se conecte a elas, engada ou elimine redes, ou ben inicie unha zona wifi local"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index a19cdb4..85afcd7 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -1071,12 +1071,9 @@
<string name="color_mode_option_natural" msgid="5013837483986772758">"કુદરતી"</string>
<string name="color_mode_option_boosted" msgid="8588223970257287524">"બુસ્ટ કરેલ"</string>
<string name="color_mode_option_saturated" msgid="4569683960058798843">"સંતૃપ્ત"</string>
- <!-- no translation found for color_mode_option_automatic (8781254568140509331) -->
- <skip />
- <!-- no translation found for color_mode_summary_natural (6624188642920403099) -->
- <skip />
- <!-- no translation found for color_mode_summary_automatic (4669516973360709431) -->
- <skip />
+ <string name="color_mode_option_automatic" msgid="8781254568140509331">"આપમેળે"</string>
+ <string name="color_mode_summary_natural" msgid="6624188642920403099">"માત્ર સચોટ રંગોનો જ ઉપયોગ કરો"</string>
+ <string name="color_mode_summary_automatic" msgid="4669516973360709431">"આબેહૂબ અને સચોટ રંગો વચ્ચે સમાયોજિત કરો"</string>
<string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
<string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ફોનને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
<string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો"</string>
@@ -1637,8 +1634,7 @@
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"તમારો પિન ફરી દાખલ કરો"</string>
<string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"પાસવર્ડ્સ મેળ ખાતા નથી"</string>
<string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"પિન મેળ ખાતા નથી"</string>
- <!-- no translation found for lockpassword_draw_your_pattern_again_header (2872194349688886781) -->
- <skip />
+ <string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"તમારી પૅટર્ન ફરીથી દોરો"</string>
<string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"અનલૉક પસંદગી"</string>
<string name="lockpassword_password_set_toast" msgid="4875050283108629383">"પાસવર્ડ સેટ કરવામાં આવ્યો છે"</string>
<string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"પિન સેટ કરવામાં આવ્યો છે"</string>
@@ -1754,10 +1750,8 @@
<string name="unknown" msgid="1592123443519355854">"અજાણ્યું"</string>
<string name="sort_order_alpha" msgid="1410278099123670628">"નામ દ્વારા સૉર્ટ કરો"</string>
<string name="sort_order_size" msgid="7024513286636502362">"કદ દ્વારા સૉર્ટ કરો"</string>
- <!-- no translation found for sort_order_recent_notification (6064103501358974282) -->
- <skip />
- <!-- no translation found for sort_order_frequent_notification (1733204081305830670) -->
- <skip />
+ <string name="sort_order_recent_notification" msgid="6064103501358974282">"સૌથી તાજેતરનાં"</string>
+ <string name="sort_order_frequent_notification" msgid="1733204081305830670">"વારંવાર"</string>
<string name="show_running_services" msgid="5736278767975544570">"ચાલુ સેવાઓ બતાવો"</string>
<string name="show_background_processes" msgid="2009840211972293429">"કેશ્ડ પ્રક્રિયાઓ બતાવો"</string>
<string name="default_emergency_app" msgid="1951760659640369980">"ઇમર્જન્સી ઍપ્લિકેશન"</string>
@@ -2297,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ફોન નિષ્ક્રિય"</string>
<string name="power_unaccounted" msgid="709925017022660740">"વિવિધ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"અધિક-ગણના કરેલ"</string>
- <string name="power_apps" msgid="2043554781293951327">"ઍપ્લિકેશનો"</string>
- <string name="power_service" msgid="1599661212370831780">"સેવાઓ"</string>
- <string name="power_system" msgid="8290455327965307383">"સિસ્ટમ"</string>
- <string name="power_user" msgid="3706143225319881667">"અન્ય વપરાશકર્તાઓ"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU કુલ"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU અગ્રભૂમિ"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"સક્રિય રાખો"</string>
@@ -2842,8 +2832,7 @@
<string name="user_add_user_item_title" msgid="8212199632466198969">"વપરાશકર્તા"</string>
<string name="user_add_profile_item_title" msgid="8353515490730363621">"પ્રતિબંધિત પ્રોફાઇલ"</string>
<string name="user_add_user_title" msgid="2108112641783146007">"નવા વપરાશકર્તાને ઉમેરીએ?"</string>
- <!-- no translation found for user_add_user_message_long (6768718238082929201) -->
- <skip />
+ <string name="user_add_user_message_long" msgid="6768718238082929201">"તમે વધારાના વપરાશકર્તાઓ બનાવીને અન્ય લોકો સાથે આ ઉપકરણને શેર કરી શકો છો. દરેક વપરાશકર્તા પાસે તેમનું પોતાનું સ્પેસ છે, જેને તેઓ ઍપ, વૉલપેપર, વગેરે સાથે કસ્ટમાઇઝ કરી શકે છે. વપરાશકર્તાઓ પ્રત્યેક વ્યક્તિને અસર કરતી હોય તેવી ઉપકરણ સેટિંગ જેમ કે વાઇ-ફાઇને પણ સમાયોજિત કરી શકે છે.\n\nજ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમની સ્પેસ સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા અન્ય બધા વપરાશકર્તાઓ માટે ઍપને અપડેટ કરી શકે છે. નવા વપરાશકર્તાને ઍક્સેસિબિલિટી સેટિંગ અને સેવાઓ ટ્રાન્સફર ન પણ થાય."</string>
<string name="user_add_user_message_short" msgid="1511354412249044381">"જ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા બધા અન્ય વપરાશકર્તાઓ માટે એપ્લિકેશન્સને અપડેટ કરી શકે છે."</string>
<string name="user_setup_dialog_title" msgid="1765794166801864563">"હવે વપરાશકર્તાને સેટ કરીએ?"</string>
<string name="user_setup_dialog_message" msgid="1004068621380867148">"ખાતરી કરો કે વ્યક્તિ ઉપકરણ લેવા અને તેમનું સથાન સેટ કરવા માટે ઉપલબ્ધ છે"</string>
@@ -3267,12 +3256,9 @@
<string name="notification_channel_summary_high" msgid="2085017556511003283">"તાત્કાલિક મહત્ત્વની"</string>
<string name="notification_switch_label" msgid="6843075654538931025">"નોટિફિકેશન બતાવો"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"નોટિફિકેશન સહાયક"</string>
- <!-- no translation found for notifications_sent_daily (113065754206235356) -->
- <skip />
- <!-- no translation found for notifications_sent_weekly (8348151826170109624) -->
- <skip />
- <!-- no translation found for notifications_sent_never (1001964786456700536) -->
- <skip />
+ <string name="notifications_sent_daily" msgid="113065754206235356">"દૈનિક ~<xliff:g id="NUMBER">%1$s</xliff:g> મોકલ્યા"</string>
+ <string name="notifications_sent_weekly" msgid="8348151826170109624">"અઠવાડિક ~<xliff:g id="NUMBER">%1$s</xliff:g> મોકલ્યા"</string>
+ <string name="notifications_sent_never" msgid="1001964786456700536">"ક્યારેય નહીં"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"નોટિફિકેશન ઍક્સેસ"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"કાર્યાલયની પ્રોફાઇલની સૂચનાઓનો ઍક્સેસ બ્લૉક કરવામાં આવ્યો છે"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ઍપ્લિકેશનો સૂચનાઓ વાંચી શકતી નથી"</string>
@@ -3775,20 +3761,13 @@
<string name="condition_work_summary" msgid="7543202177571590378">"તમારી કાર્ય પ્રોફાઇલને સંબંધિત ઍપ્લિકેશનો, બૅકગ્રાઉન્ડ સમન્વયન અને અન્ય સુવિધાઓ બંધ છે."</string>
<!-- no translation found for condition_device_muted_action_turn_on_sound (4930240942726349213) -->
<skip />
- <!-- no translation found for condition_device_muted_title (3095044864508335783) -->
- <skip />
- <!-- no translation found for condition_device_muted_title (5818278137378379647) -->
- <skip />
- <!-- no translation found for condition_device_muted_summary (5445341185705628047) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_title (1983420639621523345) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_title (1087633233379991925) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_summary (433514444618164607) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_summary (5877034997839162763) -->
- <skip />
+ <string name="condition_device_muted_title" product="tablet" msgid="3095044864508335783">"ઉપકરણ મ્યૂટ કરેલ છે"</string>
+ <string name="condition_device_muted_title" product="default" msgid="5818278137378379647">"ફોન મ્યૂટ કરેલ છે"</string>
+ <string name="condition_device_muted_summary" msgid="5445341185705628047">"કૉલ અને નોટિફિકેશનો મ્યૂટ કરવામાં આવશે"</string>
+ <string name="condition_device_vibrate_title" product="tablet" msgid="1983420639621523345">"ઉપકરણ વાઇબ્રેટ પર સેટ કરેલ છે"</string>
+ <string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"ફોન વાઇબ્રેટ પર સેટ કરેલ છે"</string>
+ <string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"કૉલ અને નોટિફિકેશનો ઉપકરણને વાઇબ્રેટ કરશે"</string>
+ <string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"કૉલ અને નોટિફિકેશનો ફોનને વાઇબ્રેટ કરશે"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"રાત્રિ પ્રકાશ માટે શેડ્યૂલ સેટ કરો"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"દરરોજ રાત્રે સ્ક્રીનની રંગછટા આપમેળે ઓછીવધતી કરો"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
@@ -4160,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ઉપકરણનું નામ"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ડ્રાઇવિંગ વખતે બ્લૂટૂથનો ઉપયોગ કરો"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ડ્રાઇવિંગ કરતી વખતે આપમેળે બ્લૂટૂથ ચાલુ કરો"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 બૅટરી સેટિંગ જુઓ"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"વાઇ-ફાઇ નિયંત્રણ"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"ઍપને વાઇ-ફાઇ નિયંત્રિત કરવાની મંજૂરી આપો"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"આ ઍપને વાઇ-ફાઇ ચાલુ અથવા બંધ કરવા, વાઇ-ફાઇ નેટવર્કને સ્કૅન અને કનેક્ટ કરવા, નેટવર્ક ઉમેરવા અથવા કાઢી નાખવા અથવા માત્ર-સ્થાનિક હૉટસ્પૉટ શરૂ કરવાની મંજૂરી આપો"</string>
@@ -4175,22 +4153,14 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"ઉપકરણની બૅટરી આવરદા સુધારો"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"ફોનની બૅટરી આવરદા સુધારો"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <!-- no translation found for gesture_prevent_ringing_screen_title (7840226017975251549) -->
- <skip />
- <!-- no translation found for gesture_prevent_ringing_title (2483159069038138740) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_vibrate (7286821846542822661) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_mute (7551545579059879853) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_none (4656046650769569175) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_vibrate_summary (1065493645461576417) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_mute_summary (4235786586339197293) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_none_summary (8037313710474671901) -->
- <skip />
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"રિંગ વાગતી અટકાવો"</string>
+ <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"વૉલ્યૂમ વધારો અને પાવર બન્નેને એકસાથે દબાવો"</string>
+ <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"વાઇબ્રેટ"</string>
+ <string name="prevent_ringing_option_mute" msgid="7551545579059879853">"મ્યૂટ કરો"</string>
+ <string name="prevent_ringing_option_none" msgid="4656046650769569175">"કંઈ કરતા નહીં"</string>
+ <string name="prevent_ringing_option_vibrate_summary" msgid="1065493645461576417">"બધા કૉલ અને નોટિફિકેશનો વાઇબ્રેટ કરો"</string>
+ <string name="prevent_ringing_option_mute_summary" msgid="4235786586339197293">"બધા કૉલ અને નોટિફિકેશનો મ્યૂટ કરો"</string>
+ <string name="prevent_ringing_option_none_summary" msgid="8037313710474671901">"કંઈ કરતા નહીં"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"નેટવર્કની વિગતો"</string>
<!-- no translation found for about_phone_device_name_warning (8885670415541365348) -->
<skip />
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index aa9d54e..370df59 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1071,12 +1071,9 @@
<string name="color_mode_option_natural" msgid="5013837483986772758">"बिना किसी बदलाव के"</string>
<string name="color_mode_option_boosted" msgid="8588223970257287524">"बढ़ाया गया"</string>
<string name="color_mode_option_saturated" msgid="4569683960058798843">"सैचुरेट किया गया"</string>
- <!-- no translation found for color_mode_option_automatic (8781254568140509331) -->
- <skip />
- <!-- no translation found for color_mode_summary_natural (6624188642920403099) -->
- <skip />
- <!-- no translation found for color_mode_summary_automatic (4669516973360709431) -->
- <skip />
+ <string name="color_mode_option_automatic" msgid="8781254568140509331">"अपने आप रंग चुनकर दिखाने वाला मोड"</string>
+ <string name="color_mode_summary_natural" msgid="6624188642920403099">"सिर्फ़ सटीक रंगों का इस्तेमाल करें"</string>
+ <string name="color_mode_summary_automatic" msgid="4669516973360709431">"चमकीले और सटीक रंगों के बीच मनमुताबिक बदलाव करें"</string>
<string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
<string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"फ़ोन घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
<string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें"</string>
@@ -1637,8 +1634,7 @@
<string name="lockpassword_confirm_your_pin_header" msgid="7744513791910572550">"पिन फिर से दर्ज करें"</string>
<string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"पासवर्ड मेल नहीं खाते"</string>
<string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"पिन मेल नहीं खाते"</string>
- <!-- no translation found for lockpassword_draw_your_pattern_again_header (2872194349688886781) -->
- <skip />
+ <string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"अपना पैटर्न फिर से बनाएं"</string>
<string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक करने के लिए चुनें"</string>
<string name="lockpassword_password_set_toast" msgid="4875050283108629383">"पासवर्ड सेट कर दिया गया है"</string>
<string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"पिन सेट कर दिया गया है"</string>
@@ -1754,10 +1750,8 @@
<string name="unknown" msgid="1592123443519355854">"अज्ञात"</string>
<string name="sort_order_alpha" msgid="1410278099123670628">"नाम के अनुसार क्रमित करें"</string>
<string name="sort_order_size" msgid="7024513286636502362">"आकार के अनुसार क्रमित करें"</string>
- <!-- no translation found for sort_order_recent_notification (6064103501358974282) -->
- <skip />
- <!-- no translation found for sort_order_frequent_notification (1733204081305830670) -->
- <skip />
+ <string name="sort_order_recent_notification" msgid="6064103501358974282">"नई सूचनाएं भेजने वाले ऐप्लिकेशन"</string>
+ <string name="sort_order_frequent_notification" msgid="1733204081305830670">"अक्सर"</string>
<string name="show_running_services" msgid="5736278767975544570">"चल रही सेवाएं दिखाएं"</string>
<string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
<string name="default_emergency_app" msgid="1951760659640369980">"आपातकालीन ऐप"</string>
@@ -2297,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"फ़ोन इस्तेमाल नहीं किया जा रहा"</string>
<string name="power_unaccounted" msgid="709925017022660740">"विविध"</string>
<string name="power_overcounted" msgid="2762354976171358445">"अत्यधिक"</string>
- <string name="power_apps" msgid="2043554781293951327">"ऐप"</string>
- <string name="power_service" msgid="1599661212370831780">"सेवाएं"</string>
- <string name="power_system" msgid="8290455327965307383">"सिस्टम"</string>
- <string name="power_user" msgid="3706143225319881667">"अन्य उपयोगकर्ता"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"सीपीयू (CPU) का कुल इस्तेमाल"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"सीपीयू (CPU) के आगे वाला हिस्सा"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"सचेत रखें"</string>
@@ -2842,8 +2832,7 @@
<string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
<string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
<string name="user_add_user_title" msgid="2108112641783146007">"नया उपयोगकर्ता जोड़ें?"</string>
- <!-- no translation found for user_add_user_message_long (6768718238082929201) -->
- <skip />
+ <string name="user_add_user_message_long" msgid="6768718238082929201">"आप और ज़्यादा उपयोगकर्ता बनाकर इस डिवाइस को दूसरे लोगों के साथ शेयर कर सकते हैं. हर उपयोगकर्ता के पास अपनी जगह होती है, जिसमें वह मनपसंद तरीके से ऐप्लिकेशन, वॉलपेपर और दूसरी चीज़ों में बदलाव कर सकते हैं. उपयोगकर्ता वाई-फ़ाई जैसी डिवाइस सेटिंग में भी बदलाव कर सकते हैं, जिसका असर हर किसी पर पड़ेगा.\n\nजब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उन्हें अपनी जगह सेट करनी होगी.\n\nकोई भी उपयोगकर्ता दूसरे सभी उपयोगकर्ताओं के लिए ऐप्लिकेशन अपडेट कर सकते हैं. हो सकता है कि सुलभता सेटिंग और सेवाएं नए उपयोगकर्ता को ट्रांसफ़र न हो पाएं."</string>
<string name="user_add_user_message_short" msgid="1511354412249044381">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उसे अपनी जगह सेट करनी होती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप अपडेट कर सकता है."</string>
<string name="user_setup_dialog_title" msgid="1765794166801864563">"उपयोगकर्ता को अभी सेट करें?"</string>
<string name="user_setup_dialog_message" msgid="1004068621380867148">"पक्का करें कि व्यक्ति डिवाइस का इस्तेमाल करने और अपनी जगह सेट करने के लिए मौजूद है"</string>
@@ -3267,12 +3256,9 @@
<string name="notification_channel_summary_high" msgid="2085017556511003283">"तत्काल महत्व"</string>
<string name="notification_switch_label" msgid="6843075654538931025">"सूचनाएं दिखाएं"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहायक"</string>
- <!-- no translation found for notifications_sent_daily (113065754206235356) -->
- <skip />
- <!-- no translation found for notifications_sent_weekly (8348151826170109624) -->
- <skip />
- <!-- no translation found for notifications_sent_never (1001964786456700536) -->
- <skip />
+ <string name="notifications_sent_daily" msgid="113065754206235356">"हर दिन ~<xliff:g id="NUMBER">%1$s</xliff:g> सूचनाएं भेजी जाती हैं"</string>
+ <string name="notifications_sent_weekly" msgid="8348151826170109624">"हर हफ़्ते ~<xliff:g id="NUMBER">%1$s</xliff:g> सूचनाएं भेजी जाती हैं"</string>
+ <string name="notifications_sent_never" msgid="1001964786456700536">"कभी नहीं"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना का एक्सेस"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"कार्य प्रोफ़ाइल सूचना की पहुंच रोक दी गई है"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप सूचनाएं नहीं पढ़ सकते"</string>
@@ -3775,20 +3761,13 @@
<string name="condition_work_summary" msgid="7543202177571590378">"आपकी कार्य प्रोफ़ाइल से संबंधित ऐप्स, पृष्ठभूमि समन्वयन और अन्य सुविधाएं बंद हैं."</string>
<!-- no translation found for condition_device_muted_action_turn_on_sound (4930240942726349213) -->
<skip />
- <!-- no translation found for condition_device_muted_title (3095044864508335783) -->
- <skip />
- <!-- no translation found for condition_device_muted_title (5818278137378379647) -->
- <skip />
- <!-- no translation found for condition_device_muted_summary (5445341185705628047) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_title (1983420639621523345) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_title (1087633233379991925) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_summary (433514444618164607) -->
- <skip />
- <!-- no translation found for condition_device_vibrate_summary (5877034997839162763) -->
- <skip />
+ <string name="condition_device_muted_title" product="tablet" msgid="3095044864508335783">"डिवाइस को म्यूट किया गया है"</string>
+ <string name="condition_device_muted_title" product="default" msgid="5818278137378379647">"फ़ोन को म्यूट किया गया है"</string>
+ <string name="condition_device_muted_summary" msgid="5445341185705628047">"कॉल अाैर सूचनाओं के लिए डिवाइस म्यूट रहेगा"</string>
+ <string name="condition_device_vibrate_title" product="tablet" msgid="1983420639621523345">"डिवाइस को वाइब्रेट (कंपन) मोड में सेट किया गया है"</string>
+ <string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"फ़ोन को वाइब्रेट (कंपन) मोड में सेट किया गया है"</string>
+ <string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"कॉल अाैर सूचनाएं आने पर डिवाइस वाइब्रेट (कंपन) करेगा"</string>
+ <string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"कॉल अाैर सूचनाएं आने पर फ़ोन वाइब्रेट (कंपन) करेगा"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"नाइट लाइट शेड्यूल सेट करें"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"हर रात, कमरे की रोशनी के हिसाब से स्क्रीन का रंग और चमक अपने आप बदलें"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"नाइट लाइट चालू है"</string>
@@ -4160,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"डिवाइस का नाम"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"गाड़ी चलाते समय ब्लूटूथ इस्तेमाल करें"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"गाड़ी चलाते समय अपने आप ब्लूटूथ चालू करें"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 की बैटरी सेटिंग देखें"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"वाई-फ़ाई नियंत्रण"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"ऐप्लिकेशन को वाई-फ़ाई नियंत्रित करने की मंज़ूरी दें"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"इस ऐप्लिकेशन को वाई-फ़ाई चालू या बंद करने, वाई-फ़ाई नेटवर्क ढूंढने और उससे कनेक्ट करने की अनुमति दें. साथ ही, नेटवर्क जोड़ने या हटाने या सिर्फ़ सीमित दायरे में इस्तेमाल होने वाला हॉटस्पॉट चालू करने की अनुमति दें"</string>
@@ -4175,22 +4153,14 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"डिवाइस की बैटरी लाइफ़ बेहतर बनाएं"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"फ़ोन की बैटरी लाइफ़ बेहतर बनाएं"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <!-- no translation found for gesture_prevent_ringing_screen_title (7840226017975251549) -->
- <skip />
- <!-- no translation found for gesture_prevent_ringing_title (2483159069038138740) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_vibrate (7286821846542822661) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_mute (7551545579059879853) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_none (4656046650769569175) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_vibrate_summary (1065493645461576417) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_mute_summary (4235786586339197293) -->
- <skip />
- <!-- no translation found for prevent_ringing_option_none_summary (8037313710474671901) -->
- <skip />
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"घंटी बजने से रोकें"</string>
+ <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"पावर और आवाज़ बढ़ाने वाले बटन को एक साथ दबाएं"</string>
+ <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"वाइब्रेट (कंपन)"</string>
+ <string name="prevent_ringing_option_mute" msgid="7551545579059879853">"म्यूट करें"</string>
+ <string name="prevent_ringing_option_none" msgid="4656046650769569175">"कुछ न करें"</string>
+ <string name="prevent_ringing_option_vibrate_summary" msgid="1065493645461576417">"सभी कॉल और सूचनाएं वाइब्रेट (कंपन) करें"</string>
+ <string name="prevent_ringing_option_mute_summary" msgid="4235786586339197293">"सभी कॉल और सूचनाएं म्यूट करें"</string>
+ <string name="prevent_ringing_option_none_summary" msgid="8037313710474671901">"कुछ न करें"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"नेटवर्क के बारे में जानकारी"</string>
<!-- no translation found for about_phone_device_name_warning (8885670415541365348) -->
<skip />
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1c34122..a3220a9 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2319,10 +2319,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Previše obračunato"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
- <string name="power_service" msgid="1599661212370831780">"Usluge"</string>
- <string name="power_system" msgid="8290455327965307383">"Sustav"</string>
- <string name="power_user" msgid="3706143225319881667">"Drugi korisnici"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU-a"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži u aktivnom stanju"</string>
@@ -4209,7 +4205,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Naziv uređaja"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Upotreba Bluetootha tijekom vožnje"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatsko uključivanje Bluetootha tijekom vožnje"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Pogledajte postavke za bateriju Androida 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Upravljanje Wi-Fi-jem"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Dopusti aplikaciji upravljanje Wi-Fi-jem"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Aplikaciji omogućuje da uključuje ili isključuje Wi-Fi, traži Wi-Fi mreže i povezuje se s njima, dodaje ili uklanja mreže te pokreće lokalnu žarišnu točku"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e2cdc7c..457026e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Egyéb"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Túlbecsült"</string>
- <string name="power_apps" msgid="2043554781293951327">"Alkalmazások"</string>
- <string name="power_service" msgid="1599661212370831780">"Szolgáltatások"</string>
- <string name="power_system" msgid="8290455327965307383">"Rendszer"</string>
- <string name="power_user" msgid="3706143225319881667">"Egyéb felhasználók"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string>
@@ -4145,7 +4141,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Eszköznév"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetooth használata vezetés közben"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetooth automatikus bekapcsolása vezetés közben"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Az Android 8.0 akkumulátorbeállításainak megjelenítése"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi-vezérlés"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"A Wi-Fi vezérlésének engedélyezése az alkalmazás számára"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"A Wi-Fi be- és kikapcsolásának, a Wi-Fi-hálózatok keresésének és a hozzájuk való kapcsolódásnak, hálózatok hozzáadásának és eltávolításának, illetve csak helyi hotspot indításának engedélyezése az alkalmazás számára"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 62d94dd..304e1a3 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Սպասման ռեժիմ"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Զանազան"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Գերօգտագործում"</string>
- <string name="power_apps" msgid="2043554781293951327">"Հավելվածներ"</string>
- <string name="power_service" msgid="1599661212370831780">"Ծառայություններ"</string>
- <string name="power_system" msgid="8290455327965307383">"Համակարգ"</string>
- <string name="power_user" msgid="3706143225319881667">"Այլ օգտատերեր"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU-ի ընդհանուրը"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU առաջնատեսք"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Արթուն պահել"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Սարքի անունը"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Վարելիս օգտագործել Bluetooth-ը"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Վարելիս ավտոմատ միացնել Bluetooth-ը"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 մարտկոցի կարգավորումներ"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi-ի կառավարում"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Թույլ տվեք հավելվածին կառավարել Wi-Fi-ը"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Թույլ տվեք այս հավելվածին միացնել և անջատել Wi-Fi-ը, գտնել Wi-Fi ցանցեր և միանալ դրանց, ավելացնել և հեռացնել ցանցեր, միացնել միայն տեղային թեժ կետ"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3430826..244f19b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telepon menganggur"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Lain-Lain"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Dihitung berlebih"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikasi"</string>
- <string name="power_service" msgid="1599661212370831780">"Layanan"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Pengguna lainnya"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Tetap aktif"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nama perangkat"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gunakan Bluetooth saat berkendara"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktifkan Bluetooth secara otomatis saat mengemudi"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Lihat setelan baterai Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Kontrol Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Izinkan aplikasi mengontrol Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Izinkan aplikasi ini mengaktifkan atau menonaktifkan Wi-Fi, memindai, dan menghubungkan ke jaringan Wi-Fi, menambahkan atau menghapus jaringan, atau memulai hotspot khusus lokal"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 4df48a3..134cbb6 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Sími aðgerðalaus"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Ýmislegt"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Oftalið"</string>
- <string name="power_apps" msgid="2043554781293951327">"Forrit"</string>
- <string name="power_service" msgid="1599661212370831780">"Þjónusta"</string>
- <string name="power_system" msgid="8290455327965307383">"Kerfi"</string>
- <string name="power_user" msgid="3706143225319881667">"Aðrir notendur"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Örgjörvi samtals"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Örgjörvi í forgrunni"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Halda vakandi"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Heiti tækis"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Nota Bluetooth við akstur"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Kveikja sjálfkrafa á Bluetooth við akstur"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Sjá rafhlöðustillingar Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi stjórnun"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Leyfa forriti að stjórna Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Leyfa þessu forriti að kveikja og slökkva á Wi-Fi, leita að og tengjast við Wi-Fi net, bæta við og fjarlægja net og búa til staðbundinn heitan reit"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 73b765a..7467161 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefono inattivo"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Varie"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Sovrastimato"</string>
- <string name="power_apps" msgid="2043554781293951327">"App"</string>
- <string name="power_service" msgid="1599661212370831780">"Servizi"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Altri utenti"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Totale CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantieni attivo"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome dispositivo"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilizza il Bluetooth alla guida"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Attiva il Bluetooth automaticamente durante la guida"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Accedi alle impostazioni della batteria di Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Controllo del Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Consenti all\'app di controllare il Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Consenti a questa app di attivare o disattivare il Wi-Fi, cercare e connettersi a reti Wi-Fi, aggiungere e rimuovere reti oppure avviare un hotspot solo locale."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 22d82a4..0d9c87b 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"טלפון לא פעיל"</string>
<string name="power_unaccounted" msgid="709925017022660740">"שונות"</string>
<string name="power_overcounted" msgid="2762354976171358445">"חישוב יתר"</string>
- <string name="power_apps" msgid="2043554781293951327">"אפליקציות"</string>
- <string name="power_service" msgid="1599661212370831780">"שירותים"</string>
- <string name="power_system" msgid="8290455327965307383">"מערכת"</string>
- <string name="power_user" msgid="3706143225319881667">"משתמשים אחרים"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU - סך הכל"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU בחזית"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"שמור במצב פעיל"</string>
@@ -4277,7 +4273,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"שם המכשיר"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"שימוש ב-Bluetooth במהלך נהיגה"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"להפעלה אוטומטית של Bluetooth בזמן נהיגה"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"הצגת הגדרות הסוללה של Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"שליטה ב-Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"מאפשר לאפליקציה לשלוט ב-Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"מאפשר לאפליקציה זו להפעיל ולכבות חיבור Wi-Fi, לסרוק רשתות Wi-Fi ולהתחבר אליהן, להוסיף ולהסיר רשתות או להתחיל נקודה לשיתוף אינטרנט מקומית בלבד"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 55c8464..9b1a649 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"アイドル状態"</string>
<string name="power_unaccounted" msgid="709925017022660740">"その他"</string>
<string name="power_overcounted" msgid="2762354976171358445">"過剰算出"</string>
- <string name="power_apps" msgid="2043554781293951327">"アプリ"</string>
- <string name="power_service" msgid="1599661212370831780">"サービス"</string>
- <string name="power_system" msgid="8290455327965307383">"システム"</string>
- <string name="power_user" msgid="3706143225319881667">"その他のユーザー"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU合計"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"スリープモードにしない"</string>
@@ -4147,7 +4143,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"端末名"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"運転時に Bluetooth を使用"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"運転時に自動的に Bluetooth を ON にする"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 の電池設定を確認"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi の管理"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Wi-Fi の管理をアプリに許可"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"このアプリが Wi-Fi の ON / OFF 切り替え、Wi-Fi ネットワークのスキャンと接続、ネットワークの追加と削除、ローカル専用アクセス ポイントの起動を行うことを許可します"</string>
@@ -4157,7 +4152,7 @@
<string name="media_output_summary" product="device" msgid="5677420090811068649">"端末"</string>
<string name="media_out_summary_ongoing_call_state" msgid="3533731701018680693">"通話中は利用できません"</string>
<string name="media_output_summary_unavailable" msgid="7970304720507697019">"利用できません"</string>
- <string name="take_call_on_title" msgid="6066362463436122655">"通話 ON"</string>
+ <string name="take_call_on_title" msgid="6066362463436122655">"通話するデバイス"</string>
<string name="battery_suggestion_title" product="tablet" msgid="752439050748267917">"タブレットの電池寿命の改善"</string>
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"端末の電池寿命の改善"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"スマートフォンの電池寿命の改善"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 804ab32..8a82e3a 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"მოცდის რეჟიმი"</string>
<string name="power_unaccounted" msgid="709925017022660740">"სხვადასხვა"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ზედმეტად ჩათვლილი"</string>
- <string name="power_apps" msgid="2043554781293951327">"აპები"</string>
- <string name="power_service" msgid="1599661212370831780">"სერვისები"</string>
- <string name="power_system" msgid="8290455327965307383">"სისტემა"</string>
- <string name="power_user" msgid="3706143225319881667">"სხვა მომხმარებლები"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"სულ ცენრალურ პროცესორში"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU აქტიური რეჟიმი"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"დარჩეს აქტიური"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"მოწყობილობის სახელი"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetooth-ის მანქანის მართვისას გამოყენება"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetooth-ის ავტომატურად ჩართვა ავტომობილის მართვისას"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0-ის ბატარეის პარამეტრების ნახვა"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi-ს მართვა"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"აპისთვის Wi-Fi-ს მართვის ნებართვის მინიჭება"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"მიანიჭეთ ამ აპს ნებართვა, ჩართოს ან გამორთოს Wi-Fi, მოახდინოს სკანირება Wi-Fi ქსელების აღმოსაჩენად და მათთან დასაკავშირებლად, დაამატოს ან ამოშალოს ქსელები, ან გაუშვას მხოლოდ ადგილობრივი მოხმარების უსადენო ქსელი"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index fa00d04..9d5009c 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Күту режимі"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Әр түрлі"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Артық есептелген"</string>
- <string name="power_apps" msgid="2043554781293951327">"Қолданбалар"</string>
- <string name="power_service" msgid="1599661212370831780">"Қызметтер"</string>
- <string name="power_system" msgid="8290455327965307383">"Жүйе"</string>
- <string name="power_user" msgid="3706143225319881667">"Басқа пайдаланушылар"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Барлық CPU (орталық өңдеу бірлігі)"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (орталық процессор) алғы шебі"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Ұйқы бермеу"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Құрылғы атауы"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Көлік жүргізуде Bluetooth пайдалану"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Көлік жүргізгенде Bluetooth функциясын автоматты түрде қосу"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 батарея параметрлеріне өту"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi желісін басқару"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Қолданбаға Wi-Fi желісін басқаруға рұқсат беру"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Осы қолданбаға Wi-Fi желісін қосуға не өшіруге, Wi-Fi желілерін іздеуге не оларға қосылуға, желілер қосуға не алып тастауға немесе тек жергілікті хотспотты іске қосуға рұқсат беріңіз."</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index c36dd1d..543aec8 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -1911,7 +1911,7 @@
<string name="pointer_speed" msgid="1221342330217861616">"ល្បឿនព្រួញ"</string>
<string name="game_controller_settings_category" msgid="8794508575329923718">"កម្មវិធីពិនិត្យល្បែង"</string>
<string name="vibrate_input_devices" msgid="421936611134697943">"ការញ័រពេលបញ្ជូនបន្ត"</string>
- <string name="vibrate_input_devices_summary" msgid="82093256723774584">"ផ្ញើរំញ័រទៅឧបករណ៍បញ្ជាហ្គេមនៅពេលភ្ជាប់"</string>
+ <string name="vibrate_input_devices_summary" msgid="82093256723774584">"បញ្ជូនរំញ័រទៅឧបករណ៍បញ្ជាហ្គេមនៅពេលភ្ជាប់"</string>
<string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"ជ្រើសប្លង់ក្ដារចុច"</string>
<string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"កំណត់ប្លង់ក្ដារចុច"</string>
<string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ដើម្បីប្ដូរ ចុច Control-Spacebar"</string>
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ទូរសព្ទទំនេរ"</string>
<string name="power_unaccounted" msgid="709925017022660740">"ផ្សេងៗ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"លើស"</string>
- <string name="power_apps" msgid="2043554781293951327">"កម្មវិធី"</string>
- <string name="power_service" msgid="1599661212370831780">"សេវាកម្ម"</string>
- <string name="power_system" msgid="8290455327965307383">"ប្រព័ន្ធ"</string>
- <string name="power_user" msgid="3706143225319881667">"អ្នកប្រើប្រាស់ផ្សេងទៀត"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃខាងមុខ CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"មិនដេក"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ឈ្មោះឧបករណ៍"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ប្រើប៊្លូធូសនៅពេលបើកបរ"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"បើកប៊្លូធូសដោយស្វ័យប្រវត្តិ នៅពេលបើកបរ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"មើលការកំណត់ថ្មរបស់ Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"ការគ្រប់គ្រង Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"អនុញ្ញាតឱ្យកម្មវិធីគ្រប់គ្រង Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"អនុញ្ញាតឱ្យកម្មវិធីនេះបើក ឬបិទ Wi-Fi ស្កេន និងភ្ជាប់បណ្តាញ Wi-Fi បញ្ចូល ឬលុបបណ្តាញ ឬចាប់ផ្តើមតែហតស្ប៉តមូលដ្ឋានប៉ុណ្ណោះ"</string>
@@ -4153,7 +4148,7 @@
<string name="media_output_summary" product="device" msgid="5677420090811068649">"ឧបករណ៍"</string>
<string name="media_out_summary_ongoing_call_state" msgid="3533731701018680693">"មិនអាចប្រើបានទេអំឡុងពេលហៅទូរសព្ទ"</string>
<string name="media_output_summary_unavailable" msgid="7970304720507697019">"មិនអាចប្រើបានទេ"</string>
- <string name="take_call_on_title" msgid="6066362463436122655">"បើកការទទួលការហៅទូរសព្ទ"</string>
+ <string name="take_call_on_title" msgid="6066362463436122655">"ទទួលការហៅទូរសព្ទ"</string>
<string name="battery_suggestion_title" product="tablet" msgid="752439050748267917">"កែលម្អកម្រិតថាមពលថ្មរបស់ថេប្លេត"</string>
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"កែលម្អកម្រិតថាមពលថ្មរបស់ឧបករណ៍"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"កែលម្អកម្រិតថាមពលថ្មរបស់ទូរសព្ទ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 291df1f..d957d85 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ಫೋನ್ ತಟಸ್ಥ"</string>
<string name="power_unaccounted" msgid="709925017022660740">"ಇತರೆ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ಅಧಿಕ ಗಣನೆ"</string>
- <string name="power_apps" msgid="2043554781293951327">"ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
- <string name="power_service" msgid="1599661212370831780">"ಸೇವೆಗಳು"</string>
- <string name="power_system" msgid="8290455327965307383">"ಸಿಸ್ಟಂ"</string>
- <string name="power_user" msgid="3706143225319881667">"ಇತರ ಬಳಕೆದಾರರು"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU ಮೊತ್ತ"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ಮುನ್ನೆಲೆ"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ಎಚ್ಚರವಾಗಿಡಿ"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ಸಾಧನದ ಹೆಸರು"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ಚಾಲನೆ ಮಾಡುವಾಗ ಬ್ಲೂಟೂತ್ ಬಳಸಿ"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ಚಾಲನೆ ಮಾಡುವಾಗ ಬ್ಲೂಟೂತ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 ಬ್ಯಾಟರಿ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ನೋಡಿ"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"ವೈ-ಫೈ ನಿಯಂತ್ರಣ"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"ವೈ-ಫೈ ನಿಯಂತ್ರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸಿ"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"ವೈ-ಫೈ ಅನ್ನು ಆನ್ ಅಥವಾ ಆಫ್ ಮಾಡಲು, ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಮತ್ತು ಸಂಪರ್ಕಿಸಲು, ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಸೇರಿಸಲು ಅಥವಾ ತೆಗೆದುಹಾಕಲು, ಅಥವಾ ಸ್ಥಳೀಯ-ಮಾತ್ರ ಹಾಟ್ಸ್ಪಾಟ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು ಈ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 84465ea..7c4ce22 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"휴대전화 유휴 상태"</string>
<string name="power_unaccounted" msgid="709925017022660740">"기타"</string>
<string name="power_overcounted" msgid="2762354976171358445">"과다 산정됨"</string>
- <string name="power_apps" msgid="2043554781293951327">"앱"</string>
- <string name="power_service" msgid="1599661212370831780">"서비스"</string>
- <string name="power_system" msgid="8290455327965307383">"시스템"</string>
- <string name="power_user" msgid="3706143225319881667">"다른 사용자"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"총 CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"켜진 상태로 유지"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"기기 이름"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"운전 중 블루투스 사용"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"운전 중에 블루투스를 자동으로 사용 설정"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 배터리 설정 확인하기"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi 제어"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"앱이 Wi-Fi를 제어하도록 허용"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"이 앱에서 Wi-Fi를 사용 또는 사용 중지하고, Wi-Fi 네트워크를 검색 및 연결하고, 네트워크를 추가 또는 제거하며, 로컬 전용 핫스팟을 시작하도록 허용합니다."</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 32cc800..a1b98e7 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -2290,10 +2290,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Күтүү режими"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Калган-каткандар"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Ашыкча эсептелген"</string>
- <string name="power_apps" msgid="2043554781293951327">"Колдонмолор"</string>
- <string name="power_service" msgid="1599661212370831780">"Кызматтар"</string>
- <string name="power_system" msgid="8290455327965307383">"Тутум"</string>
- <string name="power_user" msgid="3706143225319881667">"Башка колдонуучулар"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Жалпы CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Алдыңкы фондогу CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Ойгоо кармоо"</string>
@@ -4146,7 +4142,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Түзмөктүн аталышы"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Унаа айдаганда, Bluetooth колднлсун"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Унаа айдап баратканда, Bluetooth автоматтык түрдө күйгүзүлсүн"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 батареясынын жөндөөрөлүн көрүү"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi\'ды көзөмөлдөө"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Колдонмого Wi-Fi\'ды көзөмөлдөөгө уруксат берүү"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Бул колдонмого Wi-Fi\'ды өчүрүп же күйгүзүүгө, Wi-Fi тармактарын издеп, аларга туташууга, тармактарды кошуп же алып салууга же жергиликтүү туташуу түйүнүн иштетүүгө уруксат берүү"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index b85817b..6879650 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ໂທລະສັບບໍ່ເຮັດວຽກ"</string>
<string name="power_unaccounted" msgid="709925017022660740">"ອື່ນໆ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ຄິດໄລ່ເກີນ"</string>
- <string name="power_apps" msgid="2043554781293951327">"ແອັບ"</string>
- <string name="power_service" msgid="1599661212370831780">"ບໍລິການ"</string>
- <string name="power_system" msgid="8290455327965307383">"ລະບົບ"</string>
- <string name="power_user" msgid="3706143225319881667">"ຜູ້ໃຊ້ອື່ນໆ"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU ຮວມ"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ພື້ນໜ້າ"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ເຮັດວຽກຕະຫຼອດເວລາ"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ຊື່ອຸປະກອນ"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ໃຊ້ Bluetooth ໃນເວລາຂັບລົດ"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ເປີດໃຊ້ Bluetooth ໂດຍອັດຕະໂນມັດໃນເວລາຂັບລົດ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"ເບິ່ງການຕັ້ງຄ່າແບັດເຕີຣີ Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"ການຄວບຄຸມ Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"ອະນຸຍາດໃຫ້ແອັບຄວບຄຸມ Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"ອະນຸຍາດໃຫ້ແອັບນີ້ເປີດ ຫຼື ປິດ Wi-Fi, ສະແກນ ແລະ ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ Wi-Fi, ເພີ່ມ ຫຼື ລຶບເຄືອຂ່າຍ ຫຼື ເລີ່ມຮັອດສະປອດສະເພາະພື້ນທີ່"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 9923ede..4f61d9e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Įvairus"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Per daug apskaičiuota"</string>
- <string name="power_apps" msgid="2043554781293951327">"Programos"</string>
- <string name="power_service" msgid="1599661212370831780">"Paslaugos"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Kiti naudotojai"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Visas CPU laikas"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Neužmigdyti"</string>
@@ -4275,7 +4271,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Įrenginio pavadinimas"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Naudoti „Bluetooth“ vairuojant"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatiškai įjungti „Bluetooth“ vairuojant"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Žr. 8.0 vers. „Android“ akumuliatoriaus nustatymus"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"„Wi-Fi“ valdymas"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Leisti programai valdyti „Wi-Fi“"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Leiskite šiai programai įjungti arba išjungti „Wi-Fi“, nuskaityti „Wi-Fi“ tinklus ir prisijungti prie jų, pridėti ar pašalinti tinklus arba paleisti tik vietinį viešosios interneto prieigos tašką"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 941806a..fc9cb98 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2319,10 +2319,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Dažādi"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Par daudz uzskaitītais"</string>
- <string name="power_apps" msgid="2043554781293951327">"Lietotnes"</string>
- <string name="power_service" msgid="1599661212370831780">"Pakalpojumi"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistēma"</string>
- <string name="power_user" msgid="3706143225319881667">"Citi lietotāji"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU kopā"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU akt. režīms"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Neļaut pāriet miega rež."</string>
@@ -4209,7 +4205,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Ierīces nosaukums"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Izmantot Bluetooth braukšanas laikā"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automātiska Bluetooth ieslēgšana, vadot transportlīdzekli"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 akumulatora iestatījumu skatīšana"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi pārvaldība"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Atļaut lietotnei pārvaldīt savienojumu ar Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Atļaut šai lietotnei ieslēgt vai izslēgt savienojumu ar Wi-Fi, meklēt un izveidot savienojumu ar Wi-Fi tīkliem, pievienot vai noņemt tīklus vai izveidot vietējo tīklāju."</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 2a01df3..dee0380 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Телефон во мирување"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Разно"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Надминато"</string>
- <string name="power_apps" msgid="2043554781293951327">"Апликации"</string>
- <string name="power_service" msgid="1599661212370831780">"Услуги"</string>
- <string name="power_system" msgid="8290455327965307383">"Систем"</string>
- <string name="power_user" msgid="3706143225319881667">"Други корисници"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Вкупно CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Преден план на CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи активен"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Име на уред"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Користење Bluetooth при возење"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Вклучување Bluetooth автоматски при возење"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Приказ на поставките за батерија на Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Контрола на Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Дозволете апликацијата да контролира Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Дозволете апликацијава да вклучува или исклучува Wi-Fi, да скенира и да се поврзува на Wi-Fi мрежи, да додава или отстранува мрежи или да започне локална точка на пристап"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 52d5b41..856f0f8 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ഫോൺ നിഷ്ക്രിയ സമയം"</string>
<string name="power_unaccounted" msgid="709925017022660740">"പലവക"</string>
<string name="power_overcounted" msgid="2762354976171358445">"കണക്കാക്കി"</string>
- <string name="power_apps" msgid="2043554781293951327">"ആപ്സ്"</string>
- <string name="power_service" msgid="1599661212370831780">"സേവനങ്ങള്"</string>
- <string name="power_system" msgid="8290455327965307383">"സിസ്റ്റം"</string>
- <string name="power_user" msgid="3706143225319881667">"മറ്റ് ഉപയോക്താക്കൾ"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"മൊത്തം CPU ഉപയോഗം"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ഫോർഗ്രൗണ്ട്"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"സജീവമായി തുടരുക"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ഉപകരണത്തിന്റെ പേര്"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ഡ്രൈവ് ചെയ്യുമ്പോൾ Bluetooth ഉപയോഗിക്കുക"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ഡ്രൈവ് ചെയ്യുമ്പോൾ സ്വമേധയാ Bluetooth ഓണാക്കുക"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 ബാറ്ററി ക്രമീകരണം കാണുക"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"വൈഫൈ നിയന്ത്രിക്കാൻ ആപ്പിനെ അനുവദിക്കൂ"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"വൈഫൈയെ നിയന്ത്രിക്കാൻ ആപ്പിനെ അനുവദിക്കുക"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"വൈഫൈ ഓണോ ഓഫോ ആക്കാനോ വൈഫൈ നെറ്റ്വർക്കുകൾ സ്കാൻ ചെയ്യാനോ അവയിലേക്ക് കണക്റ്റ് ചെയ്യാനോ നെറ്റ്വർക്കുകൾ ചേർക്കാനോ നീക്കം ചെയ്യാനോ ഉപകരണം ഉള്ളിടത്ത് മാത്രം പ്രവർത്തിക്കുന്ന ഒരു ഹോട്ട്സ്പോട്ട് ആരംഭിക്കാനോ ഈ ആപ്പിനെ അനുവദിക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index a7f869f..9f832e4 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Утас идэвхгүй"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Бусад"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Хэтрүүлэн тооцсон"</string>
- <string name="power_apps" msgid="2043554781293951327">"Апп"</string>
- <string name="power_service" msgid="1599661212370831780">"Үйлчилгээ"</string>
- <string name="power_system" msgid="8290455327965307383">"Систем"</string>
- <string name="power_user" msgid="3706143225319881667">"Бусад хэрэглэгч"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU нийт"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ил"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Сэрүүн байлгах"</string>
@@ -4141,7 +4137,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Төхөөрөмжийн нэр"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Жолоо барих үед Bluetooth-г ашиглах"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Жолоо барих үед Bluetooth-г автоматаар асаах"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Андройд 8.0-н батерейны тохиргоог харах"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi хяналт"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Wi-Fi-г хянах зөвшөөрлийг аппад олгох"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Энэ аппад Wi-Fi-г асаах эсвэл унтраах, Wi-Fi сүлжээг хайх болон холбогдох, сүлжээ нэмэх эсвэл устгах болон зөвхөн дотоодод ашиглах сүлжээний цэгийг эхлүүлэхийг зөвшөөрнө үү"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 25d4048..f775c5d 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"फोन निष्क्रिय"</string>
<string name="power_unaccounted" msgid="709925017022660740">"संकीर्ण"</string>
<string name="power_overcounted" msgid="2762354976171358445">"जास्त प्रमाणात"</string>
- <string name="power_apps" msgid="2043554781293951327">"अॅप्स"</string>
- <string name="power_service" msgid="1599661212370831780">"सेवा"</string>
- <string name="power_system" msgid="8290455327965307383">"प्रणाली"</string>
- <string name="power_user" msgid="3706143225319881667">"इतर वापरकर्ते"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU एकूण"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रस्थान"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"सक्रिय ठेवा"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"डिव्हाइसचे नाव"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ड्राइव्ह करत असताना ब्लूटूथ वापरा"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ड्राइव्ह करत असताना ब्लूटूथ आपोआप चालू करा"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 बॅटरी सेटिंग्ज पहा"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"वाय-फाय नियंत्रण"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"अॅपला वाय-फाय नियंत्रित करू द्या"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"या अॅपला वाय-फाय चालू किंवा बंद करू द्या, वाय-फाय नेटवर्क स्कॅन करू द्या आणि त्याच्याशी कनेक्ट करू द्या, नेटवर्क जोडू किंवा काढू द्या किंवा केवळ-स्थानिक हॉटस्पॉट सुरू करू द्या"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 85ce09d..7b45983 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon melahu"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Pelbagai"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Terlebih kira"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apl"</string>
- <string name="power_service" msgid="1599661212370831780">"Perkhidmatan"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Pengguna lain"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Jumlah CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Kekal berjaga"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nama peranti"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gunakan Bluetooth apabila memandu"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Hidupkan Bluetooth secara automatik apabila memandu"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Lihat tetapan bateri Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Kawalan Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Benrakan apl mengawal Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Benarkan apl ini menghidupkan atau mematikan Wi-Fi, mengimbas dan menyambung ke rangkaian Wi-Fi, menambah atau mengalih keluar rangkaian atau memulakan tempat liputan setempat sahaja"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 3ccd6ea..122a06c 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -1239,7 +1239,7 @@
<string name="status_meid_number" msgid="1751442889111731088">"MEIDနံပါတ်"</string>
<string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
<string name="status_data_network_type" msgid="7570837037428932780">"မိုဘိုင်းဒေတာ ကွန်ရက် အမျိုးအစား"</string>
- <string name="status_voice_network_type" msgid="5663112239742353547">"မိုဘိုင်းအသံ ကွန်ရန် အမျိုးအစား"</string>
+ <string name="status_voice_network_type" msgid="5663112239742353547">"မိုဘိုင်းအသံ ကွန်ရက် အမျိုးအစား"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"ဖုန်းလိုင်းကုမ္ပဏီအကြောင်း"</string>
<string name="status_data_state" msgid="5503181397066522950">"မိုဘိုင်းကွန်ယက်အခြေအနေ"</string>
<string name="status_esim_id" msgid="6456255368300906317">"EID"</string>
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ဖုန်း မသုံးသည့်အခါ"</string>
<string name="power_unaccounted" msgid="709925017022660740">"အထွေထွေ အကြောင်းအရာများ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"အပိုရေတွက်မှု"</string>
- <string name="power_apps" msgid="2043554781293951327">"အက်ပ်များ"</string>
- <string name="power_service" msgid="1599661212370831780">"ဝန်ဆောင်မှုများ"</string>
- <string name="power_system" msgid="8290455327965307383">"စနစ်"</string>
- <string name="power_user" msgid="3706143225319881667">"အခြားအသုံးပြုသူများ"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"စုစုပေါင်းCPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUအနီးမြင်ကွင်း"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ဖွင့်လျှက်ထားရှိရန်"</string>
@@ -4143,10 +4139,9 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"စက်ပစ္စည်း အမည်"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ကားမောင်းနေစဉ် ဘလူးတုသ် သုံးခြင်း"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ကားမောင်းနေစဉ် ဘလူးတုသ် အလိုအလျောက် ဖွင့်ပါ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android ၈.၀ ဘက်ထရီဆက်တင်ကို ကြည့်ရန်"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi ထိန်းချုပ်မှု"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Wi-Fi ထိန်းချုပ်ရန် အက်ပ်ကို ခွင့်ပြုပါ"</string>
- <string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Wi-Fi ဖွင့်ရန် သို့မဟုတ် ပိတ်ရန်၊ Wi-Fi ကွန်ရက်များ ရှာဖွေရန်နှင့် ၎င်းတို့သို့ ချိတ်ဆက်ရန်၊ ကွန်ရက်များ ထည့်ရန် သို့မဟုတ် ဖယ်ရှားရန် သို့မဟုတ် ဤနေရာတွင်းသာသုံးသည့် ဟော့စပေါ့စတင်ရန် ဤအက်ပ်ကို ခွင့်ပြုပါ"</string>
+ <string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Wi-Fi ဖွင့်ရန် သို့မဟုတ် ပိတ်ရန်၊ Wi-Fi ကွန်ရက်များ ရှာဖွေရန်နှင့် ၎င်းတို့သို့ ချိတ်ဆက်ရန်၊ ကွန်ရက်များ ထည့်ရန် သို့မဟုတ် ဖယ်ရှားရန် သို့မဟုတ် စက်တွင်းသာသုံးသည့် ဟော့စပေါ့စတင်ရန် ဤအက်ပ်ကို ခွင့်ပြုပါ"</string>
<string name="media_output_title" msgid="115223550977351699">"မီဒီယာကို အောက်ပါစက်တွင် ဖွင့်ရန်"</string>
<string name="media_output_summary" product="default" msgid="6839458453831567167">"ဖုန်း"</string>
<string name="media_output_summary" product="tablet" msgid="7217221078578554515">"တက်ဘလက်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c981ca0..c62bec1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Overberegnet"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apper"</string>
- <string name="power_service" msgid="1599661212370831780">"Tjenester"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Andre brukere"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Prosessor totalt"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Behold aktiv"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Enhetsnavn"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bruk Bluetooth når du kjører"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Slå på Bluetooth automatisk når du kjører"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Se batteriinnstillinger for Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi-kontroll"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"La appen kontrollere Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Tillat at denne appen slår Wi-Fi på eller av, søker etter og kobler til Wi-Fi-nettverk, legger til eller fjerner nettverk eller starter en lokal Wi-Fi-sone"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c4d96b7..c1ef544 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"निष्क्रिय फोन"</string>
<string name="power_unaccounted" msgid="709925017022660740">"विविध"</string>
<string name="power_overcounted" msgid="2762354976171358445">"बढी गिन्ती"</string>
- <string name="power_apps" msgid="2043554781293951327">"अनुप्रयोगहरू"</string>
- <string name="power_service" msgid="1599661212370831780">"सेवाहरू"</string>
- <string name="power_system" msgid="8290455327965307383">"प्रणाली"</string>
- <string name="power_user" msgid="3706143225319881667">"अन्य प्रयोगकर्ताहरू"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU कुल"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभूमि"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"जागा रहनुहोस्"</string>
@@ -4162,7 +4158,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"यन्त्रको नाम"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"सवारी चलाउँदा ब्लुटुथ प्रयोग गर्नु…"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"सवारी चलाउँदा ब्लुटुथ स्वतः सक्रिय गर्नुहोस्"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android ८.० को ब्याट्रीसम्बन्धी सेटिङहरू हेर्नुहोस्"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi को नियन्त्रण"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"अनुप्रयोगलाई Wi-Fi नियन्त्रण गर्ने अनुमति दिनुहोस्"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"यो अनुप्रयोगलाई Wi-Fi सक्रिय गर्ने वा निष्क्रिय पार्ने अनुमति दिनुहोस्, स्क्यान गरी Wi-Fi नेटवर्कमा जडान गर्नुहोस्, नेटवर्कहरू थप्नुहोस् वा हटाउनुहोस्, वा स्थानीय रूपमा मात्र प्रयोग गर्न मिल्ने हटस्पट सुरु गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4a4a719..8b3d2e8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1238,7 +1238,7 @@
<string name="meid_multi_sim" msgid="748999971744491771">"MEID (simkaartsleuf %1$d)"</string>
<string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
<string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
- <string name="status_data_network_type" msgid="7570837037428932780">"Type mobiel datanetwerk"</string>
+ <string name="status_data_network_type" msgid="7570837037428932780">"Type mobiele-datanetwerk"</string>
<string name="status_voice_network_type" msgid="5663112239742353547">"Type mobiel telefoonnetwerk"</string>
<string name="status_latest_area_info" msgid="7222470836568238054">"Operatorinfo"</string>
<string name="status_data_state" msgid="5503181397066522950">"Status mobiel netwerk"</string>
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diversen"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Te hoog berekend"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Services"</string>
- <string name="power_system" msgid="8290455327965307383">"Systeem"</string>
- <string name="power_user" msgid="3706143225319881667">"Andere gebruikers"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Ingeschakeld houden"</string>
@@ -4143,10 +4139,9 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Apparaatnaam"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Bluetooth gebruiken tijdens rijden"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Bluetooth automatisch inschakelen tijdens het rijden"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Batterij-instellingen voor Android 8.0 weergeven"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wifi-beheer"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"App toestaan om wifi te beheren"</string>
- <string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Sta deze app toe om wifi in- of uit te schakelen, netwerken toe te voegen of te verwijderen of een hotspot \'Alleen lokaal\' te starten."</string>
+ <string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Sta deze app toe om wifi in- of uit te schakelen, wifi-netwerken te scannen en er verbinding mee te maken, netwerken toe te voegen of te verwijderen of een hotspot \'Alleen lokaal\' te starten."</string>
<string name="media_output_title" msgid="115223550977351699">"Media afspelen naar"</string>
<string name="media_output_summary" product="default" msgid="6839458453831567167">"Telefoon"</string>
<string name="media_output_summary" product="tablet" msgid="7217221078578554515">"Tablet"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 5eb59e9..653234d 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -2309,10 +2309,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ଫୋନ୍ ନିଷ୍କ୍ରିୟ"</string>
<string name="power_unaccounted" msgid="709925017022660740">"ବିବିଧ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ଆବଶ୍ୟକତାଠାରୁ ଅଧିକ"</string>
- <string name="power_apps" msgid="2043554781293951327">"ଆପ୍"</string>
- <string name="power_service" msgid="1599661212370831780">"ସେବା"</string>
- <string name="power_system" msgid="8290455327965307383">"ସିଷ୍ଟମ୍"</string>
- <string name="power_user" msgid="3706143225319881667">"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାମାନେ"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU ସମୁଦାୟ"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ଫୋର୍ଗ୍ରାଉଣ୍ଡ"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ଜାଗ୍ରତ କରି ରଖାଯାଉ"</string>
@@ -4184,7 +4180,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ଡିଭାଇସ୍ର ନାମ"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ଗାଡ଼ି ଚଳାଇବାବେଳେ ବ୍ଲୁ-ଟୁଥ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ଗାଡ଼ି ଚଳାଇବାବେଳେ ବ୍ଲୁ-ଟୁଥ୍କୁ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ କରନ୍ତୁ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0ର ବ୍ୟାଟେରୀ ସେଟିଙ୍ଗକୁ ଦେଖନ୍ତୁ"</string>
<!-- no translation found for change_wifi_state_title (3261945855372885427) -->
<skip />
<!-- no translation found for change_wifi_state_app_detail_switch (7942268646980694224) -->
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 5472202..b1eb83f 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ਫ਼ੋਨ ਨਿਸ਼ਕਿਰਿਆ"</string>
<string name="power_unaccounted" msgid="709925017022660740">"ਵਿਵਿਧ"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ਓਵਰ-ਕਾਉਂਟਿਡ"</string>
- <string name="power_apps" msgid="2043554781293951327">"ਐਪਾਂ"</string>
- <string name="power_service" msgid="1599661212370831780">"ਸੇਵਾਵਾਂ"</string>
- <string name="power_system" msgid="8290455327965307383">"ਸਿਸਟਮ"</string>
- <string name="power_user" msgid="3706143225319881667">"ਹੋਰ ਵਰਤੋਂਕਾਰ"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU ਕੁੱਲ"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ਫੋਰਗ੍ਰਾਉਂਡ"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ਸਕਿਰਿਆ ਰੱਖੋ"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ਡੀਵਾਈਸ ਦਾ ਨਾਮ"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਬਲੂਟੁੱਥ ਵਰਤੋ"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ਗੱਡੀ ਚਲਾਉਣ ਵੇਲੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 ਦੀਆਂ ਬੈਟਰੀ ਸੈਟਿੰਗਾਂ ਦੇਖੋ"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"ਵਾਈ‑ਫਾਈ ਕੰਟਰੋਲ"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"ਐਪ ਨੂੰ ਵਾਈ‑ਫਾਈ ਕੰਟਰੋਲ ਕਰਨ ਦਿਓ"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"ਇਸ ਐਪ ਨੂੰ ਵਾਈ-ਫਾਈ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰਨ ਦਿਓ, ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਸਕੈਨ ਅਤੇ ਉਹਨਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦਿਓ, ਨੈੱਟਵਰਕ ਸ਼ਾਮਲ ਕਰਨ ਜਾਂ ਹਟਾਉਣ ਦਿਓ, ਜਾਂ ਇੱਕ ਸਿਰਫ਼-ਸਥਾਨਕ ਹੌਟਸਪੌਟ ਸ਼ੁਰੂ ਕਰਨ ਦਿਓ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9ed64f9..6bf25ba 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon nieaktywny"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Inne"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Obliczone z nadmiarem"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikacje"</string>
- <string name="power_service" msgid="1599661212370831780">"Usługi"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Inni użytkownicy"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU łącznie"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (pierwszy plan)"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Utrzymanie aktywności"</string>
@@ -4275,7 +4271,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nazwa urządzenia"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Używaj Bluetootha podczas jazdy"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Włącz Bluetooth automatycznie podczas jazdy"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Zobacz ustawienia baterii w Androidzie 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Sterowanie Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Zezwól aplikacji na sterowanie Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Zezwalaj tej aplikacji na włączanie i wyłączanie Wi-Fi, wyszukiwanie sieci Wi-Fi i łączenie się z nimi, dodawanie oraz usuwanie sieci i uruchamianie lokalnego hotspotu."</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 064175d..2b29d92 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Smartphone ocioso"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Superestimado"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Serviços"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Outros usuários"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome do dispositivo"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth ao dirigir"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar Bluetooth automaticamente ao dirigir"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver configurações de bateria do Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Controle de Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permitir que o app controle o Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permitir que este app ative ou desative o Wi-Fi, verifique redes Wi-Fi e conecte-se a elas, adicione ou remova redes ou inicie um ponto de acesso somente local"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ed5beb2..7fb51f6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inativo"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Contabilizada em excesso"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplicações"</string>
- <string name="power_service" msgid="1599661212370831780">"Serviços"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Outros utilizadores"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Manter desperto"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome do dispositivo"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar o Bluetooth durante a condução"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar automaticamente o Bluetooth durante a condução"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Consultar as definições da bateria do Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Controlo do Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permitir à aplicação controlar o Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permitir a esta aplicação ativar ou desativar o Wi-Fi, procurar e estabelecer ligação a redes Wi-Fi, adicionar ou remover redes, assim como iniciar uma zona Wi-Fi apenas local."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 064175d..2b29d92 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Smartphone ocioso"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diversos"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Superestimado"</string>
- <string name="power_apps" msgid="2043554781293951327">"Apps"</string>
- <string name="power_service" msgid="1599661212370831780">"Serviços"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistema"</string>
- <string name="power_user" msgid="3706143225319881667">"Outros usuários"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Nome do dispositivo"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Usar Bluetooth ao dirigir"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Ativar Bluetooth automaticamente ao dirigir"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ver configurações de bateria do Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Controle de Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permitir que o app controle o Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permitir que este app ative ou desative o Wi-Fi, verifique redes Wi-Fi e conecte-se a elas, adicione ou remova redes ou inicie um ponto de acesso somente local"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b07a1a4..ec58b13 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2319,10 +2319,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Supraevaluat"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplicații"</string>
- <string name="power_service" msgid="1599661212370831780">"Servicii"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Alți utilizatori"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Total procesor"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Păstrare în activitate"</string>
@@ -4209,7 +4205,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Numele dispozitivului"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Utilizați Bluetooth când conduceți"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Setați ca Bluetooth să se activeze automat când conduceți"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Vedeți setările bateriei pentru Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Control Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Permiteți aplicației să controleze conexiunea Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Permiteți-i acestei aplicații să activeze sau să dezactiveze conexiunea Wi-Fi, să scaneze și să se conecteze la rețelele Wi-Fi, să adauge sau să elimine rețele sau să pornească un hotspot numai local"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c475e88..9e0cf4d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Другое"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Переучтенное"</string>
- <string name="power_apps" msgid="2043554781293951327">"Приложения"</string>
- <string name="power_service" msgid="1599661212370831780">"Службы"</string>
- <string name="power_system" msgid="8290455327965307383">"Система"</string>
- <string name="power_user" msgid="3706143225319881667">"Другие пользователи"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – акт. режим"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Акт. режим"</string>
@@ -4275,7 +4271,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Название устройства"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Включать Bluetooth в машине"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Автоматическое включение Bluetooth во время вождения."</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Настройки батареи для Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Управление сетями Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Разрешить приложению управлять сетями Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Разрешить этому приложению сканировать, добавлять и удалять сети Wi-Fi, выполнять к ним подключение, включать и отключать эту функцию, а также создавать локальные точки доступа."</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3f36470..8c020c2 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"අක්රිය දුරකථනය"</string>
<string name="power_unaccounted" msgid="709925017022660740">"විවිධාකාර"</string>
<string name="power_overcounted" msgid="2762354976171358445">"වැඩියෙන් ගණනය කළ"</string>
- <string name="power_apps" msgid="2043554781293951327">"යෙදුම්"</string>
- <string name="power_service" msgid="1599661212370831780">"සේවා"</string>
- <string name="power_system" msgid="8290455327965307383">"පද්ධතිය"</string>
- <string name="power_user" msgid="3706143225319881667">"වෙනත් පරිශීලකයින්"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU මුළු ගණන"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"පෙරබිම් CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"අවදිව සිටින්න"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"උපාංගයේ නම"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"රිය ධාවනය කරන විට බ්ලූටූත් භාවිත කරන්න"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"රිය ධාවනය කරන අතරතුර බ්ලූටූත් සහ ස්ථානය ක්රියාත්මක කරන්න"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 බැටරි සැකසීම් බලන්න"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi පාලනය"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Wi-Fi පාලනය කිරීමට යෙදුමට ඉඩ දෙන්න"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"මෙම යෙදුමට Wi-Fi ක්රියාත්මක හෝ ක්රියාවිරහිත කිරීමට, Wi-Fi ජාල වෙත සම්බන්ධ වීමට, ජාල එක් කිරීමට හෝ ඉවත් කිරීමට, හෝ ස්ථානීය-පමණි හොට්ස්පොට් එකක් ඇරඹීමට ඉඩ දෙන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5c5826b..14dac85 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Rôzne"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Nadsadená"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikácie"</string>
- <string name="power_service" msgid="1599661212370831780">"Služby"</string>
- <string name="power_system" msgid="8290455327965307383">"Systém"</string>
- <string name="power_user" msgid="3706143225319881667">"Ďalší používatelia"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Doba prevádzky procesora"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázať režim spánku"</string>
@@ -4275,7 +4271,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Názov zariadenia"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Používať Bluetooth počas jazdy"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Automatické zapnutie rozhrania Bluetooth počas jazdy"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Zobraziť nastavenia batérie v Androide 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Ovládanie Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Povoliť aplikácii ovládať Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Povoliť tejto aplikácii zapínať a vypínať Wi-Fi, hľadať siete Wi-Fi a pripájať sa k nim, pridávať a odstraňovať siete alebo vytvárať miestny hotspot"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d5ec7f8..2e91c6f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Nedejaven telefon"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Razno"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Preveč šteto"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikacije"</string>
- <string name="power_service" msgid="1599661212370831780">"Storitve"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Drugi uporabniki"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Skupni čas za CPE"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Ohrani odklenjen zaslon"</string>
@@ -4275,7 +4271,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Ime naprave"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Uporaba Bluetootha med vožnjo"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Samodejni vklop vmesnika Bluetooth med vožnjo"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Ogled nastavitev akumulatorja za Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Upravljanje povezave Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Tej aplikaciji omogočite, da upravlja povezavo Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Tej aplikacij omogočite, da vklopi ali izklopi povezavo Wi-Fi, išče omrežja Wi-Fi in se z njimi poveže, doda ali odstrani omrežja ali pa zažene lokalno dostopno točko"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index cd45b90..40d254d 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefoni në gjendje joaktive"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Të ndryshme"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Numëruar më shumë sa duhet"</string>
- <string name="power_apps" msgid="2043554781293951327">"Aplikacionet"</string>
- <string name="power_service" msgid="1599661212370831780">"Shërbimet"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistemi"</string>
- <string name="power_user" msgid="3706143225319881667">"Përdorues të tjerë"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU-ja në total"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-ja në plan të parë"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Mbaje të zgjuar"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Emri i pajisjes"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Përdor Bluetooth kur je në makinë"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivizo Bluetooth-in automatikisht gjatë drejtimit të makinës"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Shiko cilësimet e baterisë të Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Kontrolli i lidhjes Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Lejo që aplikacioni të kontrollojë lidhjen Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Lejo që ky aplikacion të aktivizojë ose të çaktivizojë Wi-Fi, të skanojë dhe të lidhet me rrjetet Wi-Fi, të shtojë ose të heqë rrjetet ose të nisë një zonë të qasje për internetin vetëm në nivel lokal"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e5dd3ba..d73a8b4 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2319,10 +2319,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Телефон у мировању"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Разно"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Прекомерно израчуната"</string>
- <string name="power_apps" msgid="2043554781293951327">"Апликације"</string>
- <string name="power_service" msgid="1599661212370831780">"Услуге"</string>
- <string name="power_system" msgid="8290455327965307383">"Систем"</string>
- <string name="power_user" msgid="3706143225319881667">"Остали корисници"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Укупно коришћење процесора"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи ван стања спавања"</string>
@@ -4209,7 +4205,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Назив уређаја"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Укључи Bluetooth током вожње"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Укључите Bluetooth аутоматски када возите"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Погледајте подешавања батерије за Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Контрола Wi-Fi везе"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Омогућите да апликација контролише Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Омогућите да ова апликација укључи или искључи Wi-Fi, тражи и повезује се на Wi-Fi мреже, додаје и уклања мреже или покреће само локални хотспот"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index bfcfeb2..ef6dffa 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diverse"</string>
<string name="power_overcounted" msgid="2762354976171358445">"För högt räknad"</string>
- <string name="power_apps" msgid="2043554781293951327">"Appar"</string>
- <string name="power_service" msgid="1599661212370831780">"Tjänster"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Andra användare"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Enhetens namn"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Använd Bluetooth när du kör"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivera Bluetooth automatiskt när du kör"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Visa batteriinställningarna för Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi-styrning"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Tillåt appen att styra Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Ge den här appen behörighet att aktivera och inaktivera Wi-Fi, söka efter och ansluta till Wi-Fi-nätverk, lägga till och ta bort nätverk samt starta en lokal surfzon"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index dc82269..27c4c08 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Wakati simu haitumiki"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Mengineyo"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Hesabu iliyopitiliza"</string>
- <string name="power_apps" msgid="2043554781293951327">"Programu"</string>
- <string name="power_service" msgid="1599661212370831780">"Huduma"</string>
- <string name="power_system" msgid="8290455327965307383">"Mfumo"</string>
- <string name="power_user" msgid="3706143225319881667">"Watumiaji wengine"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Weka chonjo"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Jina la kifaa"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Tumia Bluetooth unapoendesha gari"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Washa Bluetooth kiotomatiki wakati unaendesha gari"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Angalia mipangilio ya betri ya Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Udhibiti wa Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Ruhusu programu idhibiti Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Ruhusu programu hii iwashe au izime Wi-Fi, itafute na iunganishe kwenye mitandao ya Wi-Fi, iongeze au iondoe mitandao, au ianzishe mtandao pepe wa eneo mahususi"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index f81ad64..55f2416 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"மொபைலின் செயல்படாநிலை"</string>
<string name="power_unaccounted" msgid="709925017022660740">"இதர அமைப்பு"</string>
<string name="power_overcounted" msgid="2762354976171358445">"அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
- <string name="power_apps" msgid="2043554781293951327">"ஆப்ஸ்"</string>
- <string name="power_service" msgid="1599661212370831780">"சேவைகள்"</string>
- <string name="power_system" msgid="8290455327965307383">"சிஸ்டம்"</string>
- <string name="power_user" msgid="3706143225319881667">"பிற பயனர்கள்"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU மொத்தம்"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU முன்புறம்"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"எப்போதும் விழிப்பில்"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"சாதனத்தின் பெயர்"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"வாகனம் ஓட்டும்போது புளூடூத் உபயோகி"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"வாகனம் ஓட்டும்போது புளூடூத் தானாகவே ஆன் செய்யப்படும்"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 பேட்டரி அமைப்புகளைக் காட்டு"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"வைஃபை அணுகலைக் கட்டுப்படுத்தல்"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"வைஃபை அணுகலைக் கட்டுப்படுத்த, பயன்பாட்டை அனுமதித்தல்"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"வைஃபையை ஆன் அல்லது ஆஃப் செய்யவும், வைஃபை நெட்வொர்க்குகளை ஸ்கேன் செய்து இணைக்கவும், நெட்வொர்க்குகளைச் சேர்க்க அல்லது அகற்றவும், குறிப்பிட்ட இடம் அல்லது சாதனத்திற்குள் மட்டும் இயங்கும் ஹாட்ஸ்பாட்டைத் தொடங்கவும் இந்தப் பயன்பாட்டை அனுமதிக்கவும்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6500d7e..e6f346e 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ఫోన్ నిష్క్రియం"</string>
<string name="power_unaccounted" msgid="709925017022660740">"నానావిధమైనవి"</string>
<string name="power_overcounted" msgid="2762354976171358445">"అధిక గణన"</string>
- <string name="power_apps" msgid="2043554781293951327">"యాప్లు"</string>
- <string name="power_service" msgid="1599661212370831780">"సేవలు"</string>
- <string name="power_system" msgid="8290455327965307383">"సిస్టమ్"</string>
- <string name="power_user" msgid="3706143225319881667">"ఇతర వినియోగదారులు"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU మొత్తం"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ముందుభాగం"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"సక్రియంగా ఉంచండి"</string>
@@ -4161,7 +4157,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"పరికరం పేరు"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"డ్రైవింగ్ సమయంలో బ్లూటూత్ని ఉపయోగించు"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"డ్రైవింగ్ సమయంలో బ్లూటూత్ను స్వయంచాలకంగా ఆన్ చేస్తుంది"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 బ్యాటరీ సెట్టింగ్లను చూడండి"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi నియంత్రణ"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Wi-Fiని నియంత్రించడానికి యాప్ని అనుమతించండి"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Wi-Fiని ఆన్ లేదా ఆఫ్ చేయడానికి, Wi-Fi నెట్వర్క్లను స్కాన్ చేసి, కనెక్ట్ కావడానికి, నెట్వర్క్లను జోడించడానికి లేదా తీసివేయడానికి లేదా స్థానికం-మాత్రమే హాట్స్పాట్ని ప్రారంభించడానికి ఈ యాప్ని అనుమతించండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b06b3b9..484ca2d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</string>
<string name="power_unaccounted" msgid="709925017022660740">"เบ็ดเตล็ด"</string>
<string name="power_overcounted" msgid="2762354976171358445">"คำนวณมากเกินไป"</string>
- <string name="power_apps" msgid="2043554781293951327">"แอป"</string>
- <string name="power_service" msgid="1599661212370831780">"บริการ"</string>
- <string name="power_system" msgid="8290455327965307383">"ระบบ"</string>
- <string name="power_user" msgid="3706143225319881667">"ผู้ใช้รายอื่นๆ"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU รวม"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"ทำงานตลอดเวลา"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"ชื่ออุปกรณ์"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ใช้บลูทูธขณะขับรถ"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"เปิดบลูทูธโดยอัตโนมัติขณะขับรถ"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"ดูการตั้งค่าแบตเตอรี่ของ Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"การควบคุม Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"อนุญาตให้แอปควบคุม Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"อนุญาตให้แอปนี้เปิดหรือปิด Wi-Fi, สแกนหาและเชื่อมต่อเครือข่าย Wi-Fi, เพิ่มหรือนำเครือข่ายออก หรือเริ่มฮอตสปอตในพื้นที่เท่านั้น"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 03d63fe..56a06ff 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Idle ang telepono"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Miscellaneous"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Sobrang nakalkula"</string>
- <string name="power_apps" msgid="2043554781293951327">"Mga App"</string>
- <string name="power_service" msgid="1599661212370831780">"Mga Serbisyo"</string>
- <string name="power_system" msgid="8290455327965307383">"System"</string>
- <string name="power_user" msgid="3706143225319881667">"Iba pang user"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Kabuuan ng CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Panatilihing bukas"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Pangalan ng device"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Gumamit ng Bluetooth sa pagmamaneho"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Awtomatikong i-on ang Bluetooth kapag nagmamaneho"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Tingnan ang mga setting ng baterya ng Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Pagkontrol sa Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Payagan ang app na kontrolin ang Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Payagan ang app na ito na i-on o i-off ang Wi-Fi, mag-scan at kumonekta sa mga Wi-Fi network, magdagdag o magtanggal ng mga network, o magsimula ng lokal lang na hotspot"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index afe3b8d..42c7bd9 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefon boşta"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Çeşitli"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Fazla hesaplandı"</string>
- <string name="power_apps" msgid="2043554781293951327">"Uygulamalar"</string>
- <string name="power_service" msgid="1599661212370831780">"Hizmetler"</string>
- <string name="power_system" msgid="8290455327965307383">"Sistem"</string>
- <string name="power_user" msgid="3706143225319881667">"Diğer kullanıcılar"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyanık tut"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Cihaz adı"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Araba sürerken Bluetooth\'u kullanın"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Araba kullanırken Bluetooth\'u otomatik olarak açın"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 pil ayarlarına bakın"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi kontrolü"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Uygulamanın Kablosuz bağlantıyı kontrol etmesine izin ver"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Bu uygulamanın kablosuz bağlantıyı açmasına veya kapatmasına, kablosuz ağları taramasına, eklemesine veya kaldırmasına, kablosuz ağlara bağlanmasına ya da yalnızca yerel hotspot bağlantısı başlatmasına izin verin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c9205d3..db2ab45 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2347,10 +2347,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Режим очікування"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Інше"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Переоцінене"</string>
- <string name="power_apps" msgid="2043554781293951327">"Додатки"</string>
- <string name="power_service" msgid="1599661212370831780">"Служби"</string>
- <string name="power_system" msgid="8290455327965307383">"Система"</string>
- <string name="power_user" msgid="3706143225319881667">"Інші користувачі"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Заг. ЦП"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Залишати активним"</string>
@@ -4275,7 +4271,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Назва пристрою"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Вмикати Bluetooth за кермом"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Автоматично вмикати Bluetooth за кермом"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Переглянути налаштування акумулятора Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Керування Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Дозволити додатку керувати Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Дозволити цьому додатку вмикати чи вимикати Wi-Fi, шукати мережі Wi-Fi та підключатися до них, додавати або видаляти мережі чи запускати лише локальну точку доступу"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index bc4d188..e2dfe6d 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"فون معطل"</string>
<string name="power_unaccounted" msgid="709925017022660740">"متفرقات"</string>
<string name="power_overcounted" msgid="2762354976171358445">"ضرورت سے زیادہ"</string>
- <string name="power_apps" msgid="2043554781293951327">"ایپس"</string>
- <string name="power_service" msgid="1599661212370831780">"سروسز"</string>
- <string name="power_system" msgid="8290455327965307383">"سسٹم"</string>
- <string name="power_user" msgid="3706143225319881667">"دیگر صارفین"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU کل"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU پیش منظر"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار رکھیں"</string>
@@ -4158,7 +4154,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"آلے کا نام"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"ڈرائیونگ کرتے وقت بلوٹوتھ استعمال کریں"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"ڈرائیونگ کرتے وقت خودکار طور بلوٹوتھ آن کریں"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 کی بیٹری کی ترتیبات دیکھیں"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi کنٹرول"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"ایپ کو Wi-Fi کنٹرول کرنے کی اجازت دیں"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"اس ایپ کو Wi-Fi آن یا آف کرنے، Wi-Fi نیٹ ورکس اسکین کرنے اور ان سے منسلک کرنے، نیٹ ورکس شامل کرنے یا ہٹانے یا صرف مقامی ہاٹ اسپاٹ شروع کرنے کی اجازت دیں"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 3db41f4..70921f8 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -2299,10 +2299,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Kutish rejimi"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Boshqa"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Orttirib hisoblangan"</string>
- <string name="power_apps" msgid="2043554781293951327">"Ilovalar"</string>
- <string name="power_service" msgid="1599661212370831780">"Xizmatlar"</string>
- <string name="power_system" msgid="8290455327965307383">"Tizim"</string>
- <string name="power_user" msgid="3706143225319881667">"Boshqa foydalanuvchilar"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU umumiy"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ekrandagi sarfi"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyg‘oq turish"</string>
@@ -4159,7 +4155,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Qurilma nomi"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Avtomobilda Bluetoothni yoqish"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Avtomobilda harakatlanayotganda Bluetooth aloqasini avtomatik ravishda yoqish"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Android 8.0 batareya sozlamalari"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi boshqaruvi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Ilovaga Wi-Fi aloqasini boshqarish uchun ruxsat berish"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Bu ilovaga Wi-Fi aloqasini yoqish yoki faolsizlantirish, Wi-Fi tarmoqlarni aniqlash va ularga ulanish, tarmoqlar qo‘shish yoki olib tashlash yoki faqat mahalliy hotspot boshlash uchun ruxsat berish"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 103175c..8d7cf67 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Khác"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Vượt mức"</string>
- <string name="power_apps" msgid="2043554781293951327">"Ứng dụng"</string>
- <string name="power_service" msgid="1599661212370831780">"Dịch vụ"</string>
- <string name="power_system" msgid="8290455327965307383">"Hệ thống"</string>
- <string name="power_user" msgid="3706143225319881667">"Người dùng khác"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU tổng"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Không khóa màn hình"</string>
@@ -4143,7 +4139,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Tên thiết bị"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Sử dụng Bluetooth khi đang lái xe"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Tự động bật Bluetooth khi đang lái xe"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Xem cài đặt pin trong Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Kiểm soát Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Cho phép ứng dụng kiểm soát Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Cho phép ứng dụng này bật/tắt Wi-Fi, quét và kết nối với mạng Wi-Fi, thêm/xóa mạng hoặc bắt đầu một điểm phát sóng chỉ cục bộ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5a1895b..b10e1e3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2297,10 +2297,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"手机待机"</string>
<string name="power_unaccounted" msgid="709925017022660740">"其他"</string>
<string name="power_overcounted" msgid="2762354976171358445">"多算了的"</string>
- <string name="power_apps" msgid="2043554781293951327">"应用"</string>
- <string name="power_service" msgid="1599661212370831780">"服务"</string>
- <string name="power_system" msgid="8290455327965307383">"系统"</string>
- <string name="power_user" msgid="3706143225319881667">"其他用户"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU总使用时间"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
@@ -4160,7 +4156,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"设备名称"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"开车时使用蓝牙"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"开车时自动开启蓝牙"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"请查看 Android 8.0 电池设置"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"WLAN 控制"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"允许应用控制 WLAN"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"允许此应用开启或关闭 WLAN、扫描及连接到 WLAN 网络、添加或移除网络，或启动仅限本地的热点"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f94316e..0693919 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2292,10 +2292,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
<string name="power_unaccounted" msgid="709925017022660740">"其他"</string>
<string name="power_overcounted" msgid="2762354976171358445">"計算過高"</string>
- <string name="power_apps" msgid="2043554781293951327">"應用程式"</string>
- <string name="power_service" msgid="1599661212370831780">"服務"</string>
- <string name="power_system" msgid="8290455327965307383">"系統"</string>
- <string name="power_user" msgid="3706143225319881667">"其他使用者"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"保持啟用"</string>
@@ -4146,7 +4142,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"裝置名稱"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"駕駛時使用藍牙"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"駕駛時自動開啟藍牙"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"請查看 Android 8.0 電池設定"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi 控制"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"允許應用程式控制 Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"允許這個應用程式開啟或關閉 Wi-Fi，掃瞄和連線至 Wi-Fi 網絡、新增或移除網絡，或啟動僅限本機的熱點"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index c65c6a4..71c1878 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2291,10 +2291,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
<string name="power_unaccounted" msgid="709925017022660740">"其他"</string>
<string name="power_overcounted" msgid="2762354976171358445">"估計過高"</string>
- <string name="power_apps" msgid="2043554781293951327">"應用程式"</string>
- <string name="power_service" msgid="1599661212370831780">"服務"</string>
- <string name="power_system" msgid="8290455327965307383">"系統"</string>
- <string name="power_user" msgid="3706143225319881667">"其他使用者"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前景使用時間"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
@@ -4147,7 +4143,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"裝置名稱"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"開車時使用藍牙"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"開車時自動開啟藍牙"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"請查看 Android 8.0 電池設定"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Wi-Fi 控制"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"允許應用程式控制 Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"允許這個應用程式開啟或關閉 Wi-Fi、掃描及連上 Wi-Fi 網路、新增或移除網路，或啟動僅限本機的無線基地台"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2fbc82b..ffb1644 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2292,10 +2292,6 @@
<string name="power_idle" product="default" msgid="9055659695602194990">"Ifoni ayenzi lutho"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Okwahlukahlukene"</string>
<string name="power_overcounted" msgid="2762354976171358445">"Okubalwe ngaphezulu"</string>
- <string name="power_apps" msgid="2043554781293951327">"Izinhlelo zokusebenza"</string>
- <string name="power_service" msgid="1599661212370831780">"Amasevisi"</string>
- <string name="power_system" msgid="8290455327965307383">"Isistimu"</string>
- <string name="power_user" msgid="3706143225319881667">"Abanye abasebenzisi"</string>
<string name="usage_type_cpu" msgid="715162150698338714">"Inani le-CPU"</string>
<string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
<string name="usage_type_wake_lock" msgid="5125438890233677880">"Gcina kuphapheme"</string>
@@ -4144,7 +4140,6 @@
<string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Igama ledivayisi"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Sebenzisa i-Bluetooth uma ushayela"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Vula i-Bluetooth ngokuzenzakalelayo uma ushayela"</string>
- <string name="dev_android_o_battery_settings_title" msgid="2926578228655006762">"Bona izilungiselelo zebhethri ze-Android 8.0"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Ulawulo lwe-Wi-Fi"</string>
<string name="change_wifi_state_app_detail_switch" msgid="7942268646980694224">"Vumela uhlelo lokusebenza ukuthi lulawule i-Wi-Fi"</string>
<string name="change_wifi_state_app_detail_summary" msgid="8434262633905502679">"Vumela lolu hlelo lokusebenza ukuthi luvule noma luvale i-Wi-Fi, luskene luphinde lulawule amanethiwekhi e-Wi-Fi, lungeze noma lususe amanethiwekhi, noma luqale i-hotspot yasendaweni kuphela"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d597966..406cac2 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -295,6 +295,8 @@
<dimen name="storage_summary_padding_end">16dp</dimen>
<!-- Text size of the big number in the donut. -->
<dimen name="storage_donut_view_percent_text_size">30sp</dimen>
+ <!-- Text size of the percentage sign in the donut. -->
+ <dimen name="storage_donut_view_percent_sign_size">20sp</dimen>
<!-- Text size of the label text in the donut. -->
<dimen name="storage_donut_view_label_text_size">14sp</dimen>
<!-- Text size of the label text in the donut if the label text is long. -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2d530ee..0bb3f4a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4045,7 +4045,7 @@
<!-- [CHAR_LIMIT=NONE] Format to put together two unrelated items in a list when "and" is not an appropriate conjunction for these 2 items -->
<string name="join_two_unrelated_items"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="second_item">%2$s</xliff:g></string>
<!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
- <string name="join_many_items_last"><xliff:g id="all_but_last_item">%1$s</xliff:g> and <xliff:g id="last_item">%2$s</xliff:g></string>
+ <string name="join_many_items_last"><xliff:g id="all_but_last_item">%1$s</xliff:g>, and <xliff:g id="last_item">%2$s</xliff:g></string>
<!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
<string name="join_many_items_first"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="all_but_first_and_last_item">%2$s</xliff:g></string>
<!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
@@ -9620,7 +9620,7 @@
<string name="storage_files">Files</string>
<!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
- <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></string>
+ <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <font size="20"><xliff:g id="unit" example="KB">^2</xliff:g></font></small></string>
<!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
<string name="storage_volume_total">Used of <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
<!-- Follows the percent of storage used by a storage volume. Exposed inside of a donut graph. [CHAR LIMIT=7]-->
diff --git a/res/xml/ambient_display_settings.xml b/res/xml/ambient_display_settings.xml
index 306ead5..037421c 100644
--- a/res/xml/ambient_display_settings.xml
+++ b/res/xml/ambient_display_settings.xml
@@ -29,7 +29,8 @@
<SwitchPreference
android:key="ambient_display_always_on"
android:title="@string/doze_always_on_title"
- android:summary="@string/doze_always_on_summary" />
+ android:summary="@string/doze_always_on_summary"
+ settings:controller="com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController" />
<Preference
android:key="ambient_display_double_tap"
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 9b84a43..7428019 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -36,11 +36,27 @@
android:summary="@string/connected_device_add_device_summary"
settings:allowDividerAbove="true"
settings:userRestriction="no_config_bluetooth"
- settings:useAdminDisabledSummary="true"/>
+ settings:useAdminDisabledSummary="true"
+ settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
+
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="toggle_bluetooth_switch"
+ android:title="@string/bluetooth_settings_title"
+ android:icon="@drawable/ic_settings_bluetooth"
+ android:summary="@string/bluetooth_pref_summary"
+ settings:allowDividerAbove="true"
+ settings:controller="com.android.settings.bluetooth.BluetoothSwitchPreferenceController"
+ settings:userRestriction="no_bluetooth"
+ settings:platform_slice="true"/>
+
+ <SwitchPreference
+ android:key="toggle_nfc"
+ android:title="@string/nfc_quick_toggle_title"
+ android:icon="@drawable/ic_nfc"
+ android:summary="@string/nfc_quick_toggle_summary"/>
<Preference
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
android:key="connection_preferences"
- android:title="@string/connected_device_connections_title"
- settings:allowDividerAbove="true"/>
+ android:title="@string/connected_device_connections_title"/>
</PreferenceScreen>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 72cd237..1917df1 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -20,23 +20,6 @@
android:key="connected_devices_advanced_screen"
android:title="@string/connected_device_connections_title">
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="toggle_bluetooth_switch"
- android:title="@string/bluetooth_settings_title"
- android:icon="@drawable/ic_settings_bluetooth"
- android:summary="@string/bluetooth_pref_summary"
- android:order="-7"
- settings:controller="com.android.settings.bluetooth.BluetoothSwitchPreferenceController"
- settings:userRestriction="no_bluetooth"
- settings:platform_slice="true"/>
-
- <SwitchPreference
- android:key="toggle_nfc"
- android:title="@string/nfc_quick_toggle_title"
- android:icon="@drawable/ic_nfc"
- android:summary="@string/nfc_quick_toggle_summary"
- android:order="-5"/>
-
<com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.nfc.AndroidBeam"
android:key="android_beam_settings"
@@ -63,7 +46,7 @@
<Preference
android:key="bt_received_files"
android:icon="@drawable/ic_folder_vd_theme_24"
- android:title="@string/bluetooth_show_received_files" />
+ android:title="@string/bluetooth_show_received_files"/>
<PreferenceCategory
android:key="dashboard_tile_placeholder"
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 9110131..8aa4d06 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -60,13 +60,6 @@
settings:keywords="@string/keywords_android_version"
android:summary="@string/summary_placeholder"/>
- <!-- IMS registration -->
- <Preference
- android:key="ims_reg_state"
- android:order="33"
- android:title="@string/ims_reg_title"
- android:summary="@string/summary_placeholder"/>
-
<!--IP address -->
<Preference
android:key="wifi_ip_address"
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 619bd66..3ab941e 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -104,13 +104,6 @@
settings:keywords="@string/keywords_android_version"
android:summary="@string/summary_placeholder"/>
- <!-- IMS registration -->
- <Preference
- android:key="ims_reg_state"
- android:order="33"
- android:title="@string/ims_reg_title"
- android:summary="@string/summary_placeholder"/>
-
<!--IP address -->
<Preference
android:key="wifi_ip_address"
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 6758e7e..a28b1e6 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -37,7 +37,6 @@
android:title="@string/network_settings_title"
android:summary="@string/summary_placeholder"
android:icon="@drawable/ic_network_cell"
- android:dependency="toggle_airplane"
android:order="-15"
settings:keywords="@string/keywords_more_mobile_networks"
settings:userRestriction="no_config_mobile_networks"
diff --git a/res/xml/time_zone_prefs.xml b/res/xml/time_zone_prefs.xml
index f80de8c..598aa65 100644
--- a/res/xml/time_zone_prefs.xml
+++ b/res/xml/time_zone_prefs.xml
@@ -27,7 +27,7 @@
android:summary="@string/summary_placeholder" />
<com.android.settingslib.RestrictedPreference
android:key="region_zone"
- android:title="@string/date_time_select_zone"
+ android:title="@string/date_time_set_timezone_title"
android:summary="@string/summary_placeholder" />
<com.android.settingslib.widget.FooterPreference/>
</PreferenceCategory>
diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
index 047d38e..0997e60 100644
--- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.support.annotation.VisibleForTesting;
@@ -61,7 +62,12 @@
if (resolved == null || resolved.isEmpty()) {
return DISABLED_UNSUPPORTED;
}
- return AVAILABLE;
+ for (ResolveInfo info : resolved) {
+ if (isSystemApp(info)) {
+ return AVAILABLE;
+ }
+ }
+ return DISABLED_UNSUPPORTED;
}
@Override
@@ -72,4 +78,11 @@
pref.setIntent(mIntent);
}
}
+
+ private boolean isSystemApp(ResolveInfo info) {
+ return info != null
+ && info.activityInfo != null
+ && info.activityInfo.applicationInfo != null
+ && (info.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
+ }
}
diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
new file mode 100644
index 0000000..238b719
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2018 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.connecteddevice;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Controller to maintain the {@link android.support.v7.preference.Preference} for add
+ * device. It monitor Bluetooth's status(on/off) and decide if need to show summary or not.
+ */
+public class AddDevicePreferenceController extends BasePreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ private static final String KEY = "add_bt_devices";
+
+ private Preference mPreference;
+ private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ updateState();
+ }
+ };
+ private IntentFilter mIntentFilter;
+ private BluetoothAdapter mBluetoothAdapter;
+
+ public AddDevicePreferenceController(Context context) {
+ super(context, KEY);
+ mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
+ mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+ }
+
+ @Override
+ public void onStart() {
+ mContext.registerReceiver(mReceiver, mIntentFilter);
+ }
+
+ @Override
+ public void onStop() {
+ mContext.unregisterReceiver(mReceiver);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ if (isAvailable()) {
+ mPreference = (Preference) screen.findPreference(getPreferenceKey());
+ }
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
+ ? AVAILABLE
+ : DISABLED_UNSUPPORTED;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()
+ ? ""
+ : mContext.getString(R.string.connected_device_add_device_summary);
+ }
+
+ void updateState() {
+ updateState(mPreference);
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index f06b35a..45794c5 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -22,10 +22,8 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothFilesPreferenceController;
-import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
-import com.android.settings.bluetooth.BluetoothSwitchPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.nfc.AndroidBeamPreferenceController;
import com.android.settings.print.PrintSettingPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -70,21 +68,19 @@
private static List<AbstractPreferenceController> buildControllers(Context context,
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- final NfcPreferenceController nfcPreferenceController =
- new NfcPreferenceController(context);
- controllers.add(nfcPreferenceController);
- final BluetoothSwitchPreferenceController bluetoothPreferenceController =
- new BluetoothSwitchPreferenceController(context);
- controllers.add(bluetoothPreferenceController);
+
+ final AndroidBeamPreferenceController beamPreferenceController =
+ new AndroidBeamPreferenceController(context);
+ controllers.add(beamPreferenceController);
controllers.add(new BluetoothFilesPreferenceController(context));
controllers.add(new BluetoothOnWhileDrivingPreferenceController(context));
+
final PrintSettingPreferenceController printerController =
new PrintSettingPreferenceController(context);
if (lifecycle != null) {
+ lifecycle.addObserver(beamPreferenceController);
lifecycle.addObserver(printerController);
- lifecycle.addObserver(nfcPreferenceController);
- lifecycle.addObserver(bluetoothPreferenceController);
}
controllers.add(printerController);
@@ -109,10 +105,8 @@
final List<String> keys = super.getNonIndexableKeys(context);
PackageManager pm = context.getPackageManager();
if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
- keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
- keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
+ keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
}
- keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
return keys;
}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 4218219..ec06716 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -17,11 +17,14 @@
import android.app.Activity;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
+import com.android.settings.bluetooth.BluetoothSwitchPreferenceController;
+import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.nfc.NfcPreferenceController;
@@ -73,6 +76,19 @@
controllers.add(new ConnectedDeviceGroupController(context, dashboardFragment, lifecycle));
controllers.add(new SavedDeviceGroupController(context, dashboardFragment, lifecycle));
+ final NfcPreferenceController nfcPreferenceController =
+ new NfcPreferenceController(context);
+ controllers.add(nfcPreferenceController);
+
+ final BluetoothSwitchPreferenceController bluetoothPreferenceController =
+ new BluetoothSwitchPreferenceController(context);
+ controllers.add(bluetoothPreferenceController);
+
+ if (lifecycle != null) {
+ lifecycle.addObserver(nfcPreferenceController);
+ lifecycle.addObserver(bluetoothPreferenceController);
+ }
+
return controllers;
}
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
index 391dafc..fd17012 100644
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -72,8 +72,6 @@
protected final String mPreferenceKey;
- protected Lifecycle mLifecycle;
-
/**
* Instantiate a controller as specified controller type and user-defined key.
* <p/>
diff --git a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java b/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
index bdd92e2..bf5bc36 100644
--- a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
+++ b/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
@@ -16,6 +16,8 @@
package com.android.settings.dashboard.conditional;
+import static android.content.Context.NOTIFICATION_SERVICE;
+
import android.app.NotificationManager;
import android.graphics.drawable.Drawable;
import android.media.AudioManager;
@@ -30,14 +32,19 @@
RingerMutedCondition(ConditionManager manager) {
super(manager);
- mNotificationManager = mManager.getContext().getSystemService(NotificationManager.class);
+ mNotificationManager =
+ (NotificationManager) mManager.getContext().getSystemService(NOTIFICATION_SERVICE);
}
@Override
public void refreshState() {
- int zen = mNotificationManager.getZenMode();
- boolean zenModeEnabled = zen != Settings.Global.ZEN_MODE_OFF;
- boolean isSilent = mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_SILENT;
+ int zen = Settings.Global.ZEN_MODE_OFF;
+ if (mNotificationManager != null) {
+ zen = mNotificationManager.getZenMode();
+ }
+ final boolean zenModeEnabled = zen != Settings.Global.ZEN_MODE_OFF;
+ final boolean isSilent =
+ mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_SILENT;
setActive(isSilent && !zenModeEnabled);
}
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 4ada3af..a3fc98d 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -68,6 +68,9 @@
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
+ mSwitchBar.setSwitchBarText(
+ R.string.data_saver_switch_title,
+ R.string.data_saver_switch_title);
mSwitchBar.show();
mSwitchBar.addOnSwitchChangeListener(this);
}
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index ccfcff1..f0c2549 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -155,7 +155,7 @@
final Activity activity = getActivity();
final ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
mSummaryController =
- new DataUsageSummaryPreferenceController(context, this, activity);
+ new DataUsageSummaryPreferenceController(activity, getLifecycle(), this);
controllers.add(mSummaryController);
getLifecycle().addObserver(mSummaryController);
return controllers;
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 7fea16d..dea71fe 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -37,6 +37,7 @@
import android.util.RecurrenceRule;
import com.android.internal.util.CollectionUtils;
+import android.support.v7.widget.RecyclerView;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
@@ -63,8 +64,10 @@
private static final float RELATIVE_SIZE_LARGE = 1.25f * 1.25f; // (1/0.8)^2
private static final float RELATIVE_SIZE_SMALL = 1.0f / RELATIVE_SIZE_LARGE; // 0.8^2
- private final Fragment mFragment;
private final Activity mActivity;
+ private final EntityHeaderController mEntityHeaderController;
+ private final Lifecycle mLifecycle;
+ private final DataUsageSummary mDataUsageSummary;
private final DataUsageController mDataUsageController;
private final DataUsageInfoController mDataInfoController;
private final NetworkTemplate mDefaultTemplate;
@@ -96,27 +99,30 @@
private Intent mManageSubscriptionIntent;
- public DataUsageSummaryPreferenceController(Context context, Fragment fragment,
- Activity activity) {
- super(context, KEY);
+ public DataUsageSummaryPreferenceController(Activity activity,
+ Lifecycle lifecycle, DataUsageSummary dataUsageSummary) {
+ super(activity, KEY);
- mFragment = fragment;
mActivity = activity;
+ mEntityHeaderController = EntityHeaderController.newInstance(activity,
+ dataUsageSummary, null);
+ mLifecycle = lifecycle;
+ mDataUsageSummary = dataUsageSummary;
- final int defaultSubId = DataUsageUtils.getDefaultSubscriptionId(context);
- mDefaultTemplate = DataUsageUtils.getDefaultTemplate(context, defaultSubId);
- NetworkPolicyManager policyManager = NetworkPolicyManager.from(context);
+ final int defaultSubId = DataUsageUtils.getDefaultSubscriptionId(activity);
+ mDefaultTemplate = DataUsageUtils.getDefaultTemplate(activity, defaultSubId);
+ NetworkPolicyManager policyManager = NetworkPolicyManager.from(activity);
mPolicyEditor = new NetworkPolicyEditor(policyManager);
- mHasMobileData = DataUsageUtils.hasMobileData(context)
+ mHasMobileData = DataUsageUtils.hasMobileData(activity)
&& defaultSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
- mDataUsageController = new DataUsageController(context);
+ mDataUsageController = new DataUsageController(activity);
mDataInfoController = new DataUsageInfoController();
if (mHasMobileData) {
mDataUsageTemplate = R.string.cell_data_template;
- } else if (DataUsageUtils.hasWifiRadio(context)) {
+ } else if (DataUsageUtils.hasWifiRadio(activity)) {
mDataUsageTemplate = R.string.wifi_data_template;
} else {
mDataUsageTemplate = R.string.ethernet_data_template;
@@ -128,15 +134,18 @@
@VisibleForTesting
DataUsageSummaryPreferenceController(
- Context context,
DataUsageController dataUsageController,
DataUsageInfoController dataInfoController,
NetworkTemplate defaultTemplate,
NetworkPolicyEditor policyEditor,
int dataUsageTemplate,
boolean hasMobileData,
- SubscriptionManager subscriptionManager) {
- super(context, KEY);
+ SubscriptionManager subscriptionManager,
+ Activity activity,
+ Lifecycle lifecycle,
+ EntityHeaderController entityHeaderController,
+ DataUsageSummary dataUsageSummary) {
+ super(activity, KEY);
mDataUsageController = dataUsageController;
mDataInfoController = dataInfoController;
mDefaultTemplate = defaultTemplate;
@@ -144,13 +153,17 @@
mDataUsageTemplate = dataUsageTemplate;
mHasMobileData = hasMobileData;
mSubscriptionManager = subscriptionManager;
- mFragment = null;
- mActivity = null;
+ mActivity = activity;
+ mLifecycle = lifecycle;
+ mEntityHeaderController = entityHeaderController;
+ mDataUsageSummary = dataUsageSummary;
}
@Override
public void onStart() {
- EntityHeaderController.newInstance(mActivity, mFragment, null).styleActionBar(mActivity);
+ RecyclerView view = mDataUsageSummary.getListView();
+ mEntityHeaderController.setRecyclerView(view, mLifecycle);
+ mEntityHeaderController.styleActionBar(mActivity);
}
@VisibleForTesting
diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
index 5a614a3..f83d841 100644
--- a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
+++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
@@ -18,6 +18,7 @@
import android.icu.text.BreakIterator;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.support.annotation.WorkerThread;
import android.support.v7.widget.RecyclerView;
@@ -40,48 +41,98 @@
* {@class AdapterItem} must be provided when an instance is created.
*/
public class BaseTimeZoneAdapter<T extends BaseTimeZoneAdapter.AdapterItem>
- extends RecyclerView.Adapter<BaseTimeZoneAdapter.ItemViewHolder> {
+ extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+ @VisibleForTesting
+ static final int TYPE_HEADER = 0;
+ @VisibleForTesting
+ static final int TYPE_ITEM = 1;
private final List<T> mOriginalItems;
private final OnListItemClickListener<T> mOnListItemClickListener;
private final Locale mLocale;
private final boolean mShowItemSummary;
+ private final boolean mShowHeader;
+ private final CharSequence mHeaderText;
private List<T> mItems;
private ArrayFilter mFilter;
- public BaseTimeZoneAdapter(List<T> items, OnListItemClickListener<T>
- onListItemClickListener, Locale locale, boolean showItemSummary) {
+ /**
+ * @param headerText the text shown in the header, or null to show no header.
+ */
+ public BaseTimeZoneAdapter(List<T> items, OnListItemClickListener<T> onListItemClickListener,
+ Locale locale, boolean showItemSummary, @Nullable CharSequence headerText) {
mOriginalItems = items;
mItems = items;
mOnListItemClickListener = onListItemClickListener;
mLocale = locale;
mShowItemSummary = showItemSummary;
+ mShowHeader = headerText != null;
+ mHeaderText = headerText;
setHasStableIds(true);
}
@NonNull
@Override
- public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- final View view = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.time_zone_search_item, parent, false);
- return new ItemViewHolder(view, mOnListItemClickListener);
+ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+ switch(viewType) {
+ case TYPE_HEADER: {
+ final View view = inflater.inflate(R.layout.preference_category_material_settings,
+ parent, false);
+ return new HeaderViewHolder(view);
+ }
+ case TYPE_ITEM: {
+ final View view = inflater.inflate(R.layout.time_zone_search_item, parent, false);
+ return new ItemViewHolder(view, mOnListItemClickListener);
+ }
+ default:
+ throw new IllegalArgumentException("Unexpected viewType: " + viewType);
+ }
}
@Override
- public void onBindViewHolder(@NonNull ItemViewHolder holder, int position) {
- holder.setAdapterItem(mItems.get(position));
- holder.mSummaryFrame.setVisibility(mShowItemSummary ? View.VISIBLE : View.GONE);
+ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+ if (holder instanceof HeaderViewHolder) {
+ ((HeaderViewHolder) holder).setText(mHeaderText);
+ } else if (holder instanceof ItemViewHolder) {
+ ItemViewHolder<T> itemViewHolder = (ItemViewHolder<T>) holder;
+ itemViewHolder.setAdapterItem(getDataItem(position));
+ itemViewHolder.mSummaryFrame.setVisibility(mShowItemSummary ? View.VISIBLE : View.GONE);
+ }
}
@Override
public long getItemId(int position) {
- return getItem(position).getItemId();
+ // Data item can't have negative id
+ return isPositionHeader(position) ? -1 : getDataItem(position).getItemId();
}
@Override
public int getItemCount() {
- return mItems.size();
+ return mItems.size() + getHeaderCount();
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return isPositionHeader(position) ? TYPE_HEADER : TYPE_ITEM;
+ }
+
+ /*
+ * Avoid being overridden by making the method final, since constructor shouldn't invoke
+ * overridable method.
+ */
+ @Override
+ public final void setHasStableIds(boolean hasStableIds) {
+ super.setHasStableIds(hasStableIds);
+ }
+
+ private int getHeaderCount() {
+ return mShowHeader ? 1 : 0;
+ }
+
+ private boolean isPositionHeader(int position) {
+ return mShowHeader && position == 0;
}
public @NonNull ArrayFilter getFilter() {
@@ -91,8 +142,12 @@
return mFilter;
}
- public T getItem(int position) {
- return mItems.get(position);
+ /**
+ * @throws IndexOutOfBoundsException if the view type at the position is a header
+ */
+ @VisibleForTesting
+ public T getDataItem(int position) {
+ return mItems.get(position - getHeaderCount());
}
public interface AdapterItem {
@@ -100,10 +155,28 @@
CharSequence getSummary();
String getIconText();
String getCurrentTime();
+
+ /**
+ * @return unique non-negative number
+ */
long getItemId();
String[] getSearchKeys();
}
+ private static class HeaderViewHolder extends RecyclerView.ViewHolder {
+ private final TextView mTextView;
+
+ public HeaderViewHolder(View itemView) {
+ super(itemView);
+ mTextView = itemView.findViewById(android.R.id.title);
+ }
+
+ public void setText(CharSequence text) {
+ mTextView.setText(text);
+ }
+ }
+
+ @VisibleForTesting
public static class ItemViewHolder<T extends BaseTimeZoneAdapter.AdapterItem>
extends RecyclerView.ViewHolder implements View.OnClickListener {
diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
index d734542..4d46c5c 100644
--- a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
+++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
@@ -23,6 +23,7 @@
import android.icu.text.DateFormat;
import android.icu.text.SimpleDateFormat;
import android.icu.util.Calendar;
+import android.support.annotation.Nullable;
import com.android.settings.R;
import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -47,10 +48,17 @@
@Override
protected BaseTimeZoneAdapter createAdapter(TimeZoneData timeZoneData) {
mAdapter = new ZoneAdapter(getContext(), getAllTimeZoneInfos(timeZoneData),
- this::onListItemClick, getLocale());
+ this::onListItemClick, getLocale(), getHeaderText());
return mAdapter;
}
+ /**
+ * @return the text shown in the header, or null to show no header.
+ */
+ protected @Nullable CharSequence getHeaderText() {
+ return null;
+ }
+
private void onListItemClick(TimeZoneInfoItem item) {
final TimeZoneInfo timeZoneInfo = item.mTimeZoneInfo;
getActivity().setResult(Activity.RESULT_OK, prepareResultData(timeZoneInfo));
@@ -66,9 +74,11 @@
protected static class ZoneAdapter extends BaseTimeZoneAdapter<TimeZoneInfoItem> {
public ZoneAdapter(Context context, List<TimeZoneInfo> timeZones,
- OnListItemClickListener<TimeZoneInfoItem> onListItemClickListener, Locale locale) {
+ OnListItemClickListener<TimeZoneInfoItem> onListItemClickListener, Locale locale,
+ CharSequence headerText) {
super(createTimeZoneInfoItems(context, timeZones, locale),
- onListItemClickListener, locale, true /* showItemSummary */);
+ onListItemClickListener, locale, true /* showItemSummary */,
+ headerText /* headerText */);
}
private static List<TimeZoneInfoItem> createTimeZoneInfoItems(Context context,
diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
index 5150045..7bf8abc 100644
--- a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
+++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
@@ -44,7 +44,7 @@
* The search matches the prefix of words in the search text.
*/
public abstract class BaseTimeZonePicker extends InstrumentedFragment
- implements SearchView.OnQueryTextListener{
+ implements SearchView.OnQueryTextListener {
public static final String EXTRA_RESULT_REGION_ID =
"com.android.settings.datetime.timezone.result_region_id";
@@ -84,7 +84,7 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final View view = inflater.inflate(R.layout.recycler_view, container, false);
+ final View view = inflater.inflate(R.layout.time_zone_items_list, container, false);
mRecyclerView = view.findViewById(R.id.recycler_view);
mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext(),
LinearLayoutManager.VERTICAL, /* reverseLayout */ false));
diff --git a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
index ca4e0bc..134b6ac 100644
--- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
+++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
@@ -48,7 +48,7 @@
private TimeZoneData mTimeZoneData;
public RegionSearchPicker() {
- super(R.string.date_time_select_region, R.string.search_settings, true, true);
+ super(R.string.date_time_select_region, R.string.date_time_search_region, true, true);
}
@Override
@@ -60,7 +60,8 @@
protected BaseTimeZoneAdapter createAdapter(TimeZoneData timeZoneData) {
mTimeZoneData = timeZoneData;
mAdapter = new BaseTimeZoneAdapter<>(createAdapterItem(timeZoneData.getRegionIds()),
- this::onListItemClick, getLocale(), false);
+ this::onListItemClick, getLocale(), false /* showItemSummary */,
+ null /* headerText */);
return mAdapter;
}
diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java
index 37365a8..add50b8 100644
--- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java
+++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java
@@ -18,7 +18,10 @@
import android.content.Intent;
import android.icu.text.Collator;
+import android.icu.text.LocaleDisplayNames;
import android.icu.util.TimeZone;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
import android.util.Log;
@@ -43,8 +46,10 @@
public static final String EXTRA_REGION_ID =
"com.android.settings.datetime.timezone.region_id";
+ private @Nullable String mRegionName;
+
public RegionZonePicker() {
- super(R.string.date_time_select_zone, R.string.search_settings, true, false);
+ super(R.string.date_time_set_timezone_title, R.string.search_settings, true, false);
}
@Override
@@ -52,6 +57,21 @@
return MetricsProto.MetricsEvent.SETTINGS_ZONE_PICKER_TIME_ZONE;
}
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ final LocaleDisplayNames localeDisplayNames = LocaleDisplayNames.getInstance(getLocale());
+ final String regionId =
+ getArguments() == null ? null : getArguments().getString(EXTRA_REGION_ID);
+ mRegionName = regionId == null ? null : localeDisplayNames.regionDisplayName(regionId);
+ }
+
+ @Override
+ protected @Nullable CharSequence getHeaderText() {
+ return mRegionName;
+ }
+
/**
* Add the extra region id into the result.
*/
@@ -67,6 +87,7 @@
if (getArguments() == null) {
Log.e(TAG, "getArguments() == null");
getActivity().finish();
+ return Collections.emptyList();
}
String regionId = getArguments().getString(EXTRA_REGION_ID);
@@ -75,6 +96,7 @@
if (filteredCountryTimeZones == null) {
Log.e(TAG, "region id is not valid: " + regionId);
getActivity().finish();
+ return Collections.emptyList();
}
// It could be a timely operations if there are many time zones. A region in time zone data
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfo.java b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
index 8cb1d4e..0366390 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfo.java
@@ -167,7 +167,7 @@
public TimeZoneInfo format(TimeZone timeZone) {
final String id = timeZone.getID();
final TimeZoneNames timeZoneNames = mTimeZoneFormat.getTimeZoneNames();
- final java.util.TimeZone javaTimeZone = android.icu.impl.TimeZoneAdapter.wrap(timeZone);
+ final java.util.TimeZone javaTimeZone = java.util.TimeZone.getTimeZone(id);
final CharSequence gmtOffset = ZoneGetter.getGmtOffsetText(mTimeZoneFormat, mLocale,
javaTimeZone, mNow);
return new TimeZoneInfo.Builder(timeZone)
diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java
index 164bf8a..3f70d8b 100644
--- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java
+++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java
@@ -129,7 +129,6 @@
controllers.add(new DeviceModelPreferenceController(context, fragment));
controllers.add(new ImeiInfoPreferenceController(context, fragment));
controllers.add(new FirmwareVersionPreferenceController(context, fragment));
- controllers.add(new ImsStatusPreferenceController(context, lifecycle));
controllers.add(new IpAddressPreferenceController(context, lifecycle));
controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
index 6d0302f..1d71bea 100644
--- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
@@ -54,7 +54,9 @@
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = (ValidatedEditTextPreference) screen.findPreference(PREF_KEY);
- mPreference.setSummary(getSummary());
+ final CharSequence deviceName = getSummary();
+ mPreference.setSummary(deviceName);
+ mPreference.setText(deviceName.toString());
mPreference.setValidator(this);
}
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 9c872a4..ead941f 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -46,6 +46,7 @@
import com.android.settings.deviceinfo.storage.VolumeSizesLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
+import com.android.settings.widget.EntityHeaderController;
import com.android.settings.wrapper.UserManagerWrapper;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -106,6 +107,13 @@
super.onViewCreated(v, savedInstanceState);
initializeCacheProvider();
maybeSetLoading(isQuotaSupported());
+
+ final Activity activity = getActivity();
+ EntityHeaderController.newInstance(activity, this /*fragment*/,
+ null /* header view */)
+ .setRecyclerView(getListView(), getLifecycle())
+ .styleActionBar(activity);
+
}
@Override
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index aaa75e3..cf9d34b 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -36,6 +36,7 @@
import android.os.storage.VolumeInfo;
import android.os.storage.VolumeRecord;
import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.text.TextUtils;
@@ -71,10 +72,11 @@
private static final String TAG_VOLUME_UNMOUNTED = "volume_unmounted";
private static final String TAG_DISK_INIT = "disk_init";
+ private static final int METRICS_CATEGORY = MetricsEvent.DEVICEINFO_STORAGE;
static final int COLOR_PUBLIC = Color.parseColor("#ff9e9e9e");
- static final int[] COLOR_PRIVATE = new int[] {
+ static final int[] COLOR_PRIVATE = new int[]{
Color.parseColor("#ff26a69a"),
Color.parseColor("#ffab47bc"),
Color.parseColor("#fff2a600"),
@@ -94,7 +96,7 @@
@Override
public int getMetricsCategory() {
- return MetricsEvent.DEVICEINFO_STORAGE;
+ return METRICS_CATEGORY;
}
@Override
@@ -139,7 +141,7 @@
};
private static boolean isInteresting(VolumeInfo vol) {
- switch(vol.getType()) {
+ switch (vol.getType()) {
case VolumeInfo.TYPE_PRIVATE:
case VolumeInfo.TYPE_PUBLIC:
return true;
@@ -301,20 +303,7 @@
return true;
} else if (vol.getType() == VolumeInfo.TYPE_PUBLIC) {
- if (vol.isMountedReadable()) {
- startActivity(vol.buildBrowseIntent());
- return true;
- } else {
- final Bundle args = new Bundle();
- args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
- new SubSettingLauncher(getContext())
- .setDestination(PublicVolumeSettings.class.getCanonicalName())
- .setTitle(-1)
- .setSourceMetricsCategory(getMetricsCategory())
- .setArguments(args)
- .launch();
- return true;
- }
+ return handlePublicVolumeClick(getContext(), vol);
}
} else if (key.startsWith("disk:")) {
@@ -328,7 +317,7 @@
args.putString(VolumeRecord.EXTRA_FS_UUID, key);
new SubSettingLauncher(getContext())
.setDestination(PrivateVolumeForget.class.getCanonicalName())
- .setTitle(R.string.storage_menu_forget)
+ .setTitle(R.string.storage_menu_forget)
.setSourceMetricsCategory(getMetricsCategory())
.setArguments(args)
.launch();
@@ -338,6 +327,25 @@
return false;
}
+ @VisibleForTesting
+ static boolean handlePublicVolumeClick(Context context, VolumeInfo vol) {
+ final Intent intent = vol.buildBrowseIntent();
+ if (vol.isMountedReadable() && intent != null) {
+ context.startActivity(intent);
+ return true;
+ } else {
+ final Bundle args = new Bundle();
+ args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
+ new SubSettingLauncher(context)
+ .setDestination(PublicVolumeSettings.class.getCanonicalName())
+ .setTitle(-1)
+ .setSourceMetricsCategory(METRICS_CATEGORY)
+ .setArguments(args)
+ .launch();
+ return true;
+ }
+ }
+
public static class MountTask extends AsyncTask<Void, Void, Exception> {
private final Context mContext;
private final StorageManager mStorageManager;
@@ -440,40 +448,45 @@
builder.setPositiveButton(R.string.storage_menu_mount,
new DialogInterface.OnClickListener() {
- /**
- * Check if an {@link RestrictedLockUtils#sendShowAdminSupportDetailsIntent admin
- * details intent} should be shown for the restriction and show it.
- *
- * @param restriction The restriction to check
- * @return {@code true} iff a intent was shown.
- */
- private boolean wasAdminSupportIntentShown(@NonNull String restriction) {
- EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
- getActivity(), restriction, UserHandle.myUserId());
- boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(
- getActivity(), restriction, UserHandle.myUserId());
- if (admin != null && !hasBaseUserRestriction) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(), admin);
- return true;
- }
+ /**
+ * Check if an {@link
+ * RestrictedLockUtils#sendShowAdminSupportDetailsIntent admin
+ * details intent} should be shown for the restriction and show it.
+ *
+ * @param restriction The restriction to check
+ * @return {@code true} iff a intent was shown.
+ */
+ private boolean wasAdminSupportIntentShown(@NonNull String restriction) {
+ EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ getActivity(), restriction, UserHandle.myUserId());
+ boolean hasBaseUserRestriction =
+ RestrictedLockUtils.hasBaseUserRestriction(
+ getActivity(), restriction, UserHandle.myUserId());
+ if (admin != null && !hasBaseUserRestriction) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
+ admin);
+ return true;
+ }
- return false;
- }
+ return false;
+ }
- @Override
- public void onClick(DialogInterface dialog, int which) {
- if (wasAdminSupportIntentShown(UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA)) {
- return;
- }
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ if (wasAdminSupportIntentShown(
+ UserManager.DISALLOW_MOUNT_PHYSICAL_MEDIA)) {
+ return;
+ }
- if (vol.disk != null && vol.disk.isUsb() &&
- wasAdminSupportIntentShown(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
- return;
- }
+ if (vol.disk != null && vol.disk.isUsb() &&
+ wasAdminSupportIntentShown(
+ UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+ return;
+ }
- new MountTask(context, vol).execute();
- }
- });
+ new MountTask(context, vol).execute();
+ }
+ });
builder.setNegativeButton(R.string.cancel, null);
return builder.create();
@@ -511,13 +524,13 @@
builder.setPositiveButton(R.string.storage_menu_set_up,
new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- final Intent intent = new Intent(context, StorageWizardInit.class);
- intent.putExtra(DiskInfo.EXTRA_DISK_ID, diskId);
- startActivity(intent);
- }
- });
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ final Intent intent = new Intent(context, StorageWizardInit.class);
+ intent.putExtra(DiskInfo.EXTRA_DISK_ID, diskId);
+ startActivity(intent);
+ }
+ });
builder.setNegativeButton(R.string.cancel, null);
return builder.create();
@@ -586,7 +599,7 @@
for (VolumeInfo vol : vols) {
if (isInteresting(vol)) {
data.title = storage.getBestVolumeDescription(vol);
- data.key = "storage_settings_volume_" +vol.id;
+ data.key = "storage_settings_volume_" + vol.id;
data.screenTitle = context.getString(R.string.storage_settings);
result.add(data);
}
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 8a2d5e3..e6303dc 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -42,7 +42,6 @@
import com.android.settings.deviceinfo.DeviceNamePreferenceController;
import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;
import com.android.settings.deviceinfo.FeedbackPreferenceController;
-import com.android.settings.deviceinfo.ImsStatusPreferenceController;
import com.android.settings.deviceinfo.IpAddressPreferenceController;
import com.android.settings.deviceinfo.ManualPreferenceController;
import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
@@ -113,7 +112,6 @@
controllers.add(new DeviceModelPreferenceController(context, fragment));
controllers.add(new ImeiInfoPreferenceController(context, fragment));
controllers.add(new FirmwareVersionPreferenceController(context, fragment));
- controllers.add(new ImsStatusPreferenceController(context, lifecycle));
controllers.add(new IpAddressPreferenceController(context, lifecycle));
controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 8795e7b..bcc0895 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -26,7 +26,6 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Resources;
-import android.os.AsyncTask;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.os.UserHandle;
@@ -42,7 +41,6 @@
import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
-import android.telephony.euicc.EuiccManager;
import android.text.TextUtils;
import android.util.Log;
@@ -88,6 +86,10 @@
final static int ICCID_INFO_VALUE_ID = R.id.icc_id_value;
@VisibleForTesting
final static int EID_INFO_VALUE_ID = R.id.esim_id_value;
+ @VisibleForTesting
+ final static int IMS_REGISTRATION_STATE_LABEL_ID = R.id.ims_reg_state_label;
+ @VisibleForTesting
+ final static int IMS_REGISTRATION_STATE_VALUE_ID = R.id.ims_reg_state_value;
private final static String CB_AREA_INFO_RECEIVED_ACTION =
"com.android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
@@ -162,6 +164,7 @@
updateNetworkType();
updateRoamingStatus(serviceState);
updateIccidNumber();
+ updateImsRegistrationState();
}
@Override
@@ -386,6 +389,22 @@
mDialog.setText(EID_INFO_VALUE_ID, mEuiccManager.getEid());
}
+ private void updateImsRegistrationState() {
+ final int subscriptionId = mSubscriptionInfo.getSubscriptionId();
+ final PersistableBundle carrierConfig =
+ mCarrierConfigManager.getConfigForSubId(subscriptionId);
+ final boolean showImsRegState = carrierConfig == null ? false :
+ carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);
+ if (showImsRegState) {
+ final boolean isImsRegistered = mTelephonyManager.isImsRegistered(subscriptionId);
+ mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString(isImsRegistered ?
+ R.string.ims_reg_status_registered : R.string.ims_reg_status_not_registered));
+ } else {
+ mDialog.removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID);
+ mDialog.removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
+ }
+ }
+
private SubscriptionInfo getPhoneSubscriptionInfo(int slotId) {
final List<SubscriptionInfo> subscriptionInfoList = SubscriptionManager.from(
mContext).getActiveSubscriptionInfoList();
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 9132daa..e0efaac 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -19,59 +19,45 @@
import android.content.Intent;
import android.os.UserHandle;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.support.annotation.VisibleForTesting;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.TogglePreferenceController;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
-import com.android.settingslib.core.AbstractPreferenceController;
-public class AmbientDisplayAlwaysOnPreferenceController extends
- AbstractPreferenceController implements PreferenceControllerMixin,
- Preference.OnPreferenceChangeListener {
+public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
private final int ON = 1;
private final int OFF = 0;
- public static final String KEY_ALWAYS_ON = "ambient_display_always_on";
private static final int MY_USER = UserHandle.myUserId();
- private final AmbientDisplayConfiguration mConfig;
- private final OnPreferenceChangedCallback mCallback;
+ private AmbientDisplayConfiguration mConfig;
+ private OnPreferenceChangedCallback mCallback;
public interface OnPreferenceChangedCallback {
void onPreferenceChanged();
}
- public AmbientDisplayAlwaysOnPreferenceController(Context context,
- AmbientDisplayConfiguration config, OnPreferenceChangedCallback callback) {
- super(context);
- mConfig = config;
- mCallback = callback;
+ public AmbientDisplayAlwaysOnPreferenceController(Context context, String key) {
+ super(context, key);
}
@Override
- public String getPreferenceKey() {
- return KEY_ALWAYS_ON;
+ public int getAvailabilityStatus() {
+ return isAvailable(mConfig) ? AVAILABLE : DISABLED_UNSUPPORTED;
}
@Override
- public void updateState(Preference preference) {
- ((SwitchPreference) preference).setChecked(isAlwaysOnEnabled(mConfig));
- }
-
- public static boolean isAlwaysOnEnabled(AmbientDisplayConfiguration config) {
- return config.alwaysOnEnabled(MY_USER);
+ public boolean isChecked() {
+ return mConfig.alwaysOnEnabled(MY_USER);
}
@Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- int enabled = (boolean) newValue ? ON : OFF;
+ public boolean setChecked(boolean isChecked) {
+ int enabled = isChecked ? ON : OFF;
Settings.Secure.putInt(
mContext.getContentResolver(), Settings.Secure.DOZE_ALWAYS_ON, enabled);
if (mCallback != null) {
@@ -80,9 +66,16 @@
return true;
}
- @Override
- public boolean isAvailable() {
- return alwaysOnAvailableForUser(mConfig);
+ public void setConfig(AmbientDisplayConfiguration config) {
+ mConfig = config;
+ }
+
+ public void setCallback(OnPreferenceChangedCallback callback) {
+ mCallback = callback;
+ }
+
+ public static boolean isAlwaysOnEnabled(AmbientDisplayConfiguration config) {
+ return config.alwaysOnEnabled(MY_USER);
}
public static boolean isAvailable(AmbientDisplayConfiguration config) {
@@ -96,16 +89,11 @@
@Override
public ResultPayload getResultPayload() {
final Intent intent = DatabaseIndexingUtils.buildSearchResultPageIntent(mContext,
- AmbientDisplaySettings.class.getName(), KEY_ALWAYS_ON,
+ AmbientDisplaySettings.class.getName(), getPreferenceKey(),
mContext.getString(R.string.ambient_display_screen_title));
return new InlineSwitchPayload(Settings.Secure.DOZE_ALWAYS_ON,
ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
ON /* defaultValue */);
}
-
- @VisibleForTesting
- boolean alwaysOnAvailableForUser(AmbientDisplayConfiguration config) {
- return isAvailable(config);
- }
}
diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java
index 02db6f1..a88d2ed 100644
--- a/src/com/android/settings/display/AmbientDisplaySettings.java
+++ b/src/com/android/settings/display/AmbientDisplaySettings.java
@@ -40,23 +40,23 @@
*/
public class AmbientDisplaySettings extends DashboardFragment {
+ public static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
+
private static final String TAG = "AmbientDisplaySettings";
private static final int MY_USER_ID = UserHandle.myUserId();
- private static final String KEY_AMBIENT_DISPLAY_ALWAYS_ON = "ambient_display_always_on";
private static final String KEY_AMBIENT_DISPLAY_DOUBLE_TAP = "ambient_display_double_tap";
private static final String KEY_AMBIENT_DISPLAY_PICK_UP = "ambient_display_pick_up";
private static final String KEY_AMBIENT_DISPLAY_NOTIFICATION = "ambient_display_notification";
+ private AmbientDisplayConfiguration mConfig;
+
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, AmbientDisplayConfiguration config,
- MetricsFeatureProvider metricsFeatureProvider,
- AmbientDisplayAlwaysOnPreferenceController.OnPreferenceChangedCallback aodCallback) {
+ MetricsFeatureProvider metricsFeatureProvider) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
metricsFeatureProvider));
- controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config,
- aodCallback));
controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle, config,
MY_USER_ID, KEY_AMBIENT_DISPLAY_DOUBLE_TAP));
controllers.add(new PickupGesturePreferenceController(context, lifecycle, config,
@@ -64,6 +64,14 @@
return controllers;
}
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ final AmbientDisplayAlwaysOnPreferenceController controller = use(
+ AmbientDisplayAlwaysOnPreferenceController.class);
+ controller.setConfig(getConfig(context));
+ controller.setCallback(this::updatePreferenceStates);
+ }
@Override
protected String getLogTag() {
@@ -78,8 +86,7 @@
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(),
- new AmbientDisplayConfiguration(context), mMetricsFeatureProvider,
- this::updatePreferenceStates);
+ getConfig(context), mMetricsFeatureProvider);
}
@Override
@@ -104,7 +111,14 @@
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null,
- new AmbientDisplayConfiguration(context), null, null);
+ new AmbientDisplayConfiguration(context), null);
}
};
+
+ private AmbientDisplayConfiguration getConfig(Context context) {
+ if (mConfig != null) {
+ mConfig = new AmbientDisplayConfiguration(context);
+ }
+ return mConfig;
+ }
}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java
index bf8cd07..209723f 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java
@@ -18,10 +18,8 @@
import android.content.Context;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
-import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.TogglePreferenceController;
/**
@@ -29,14 +27,24 @@
*/
public class AutoBatterySaverPreferenceController extends TogglePreferenceController implements
Preference.OnPreferenceChangeListener {
- private final int mDefWarnLevel;
+
+ /**
+ * Default value for {@link Settings.Global#LOW_POWER_MODE_TRIGGER_LEVEL}.
+ */
+ static final int DEFAULT_TRIGGER_LEVEL = 0;
+
+ /**
+ * The default value to set to {@link Settings.Global#LOW_POWER_MODE_TRIGGER_LEVEL} when the
+ * user enables battery saver.
+ */
+ private final int mDefaultTriggerLevelForOn;
@VisibleForTesting
static final String KEY_AUTO_BATTERY_SAVER = "auto_battery_saver";
public AutoBatterySaverPreferenceController(Context context) {
super(context, KEY_AUTO_BATTERY_SAVER);
- mDefWarnLevel = mContext.getResources().getInteger(
+ mDefaultTriggerLevelForOn = mContext.getResources().getInteger(
com.android.internal.R.integer.config_lowBatteryWarningLevel);
}
@@ -48,7 +56,7 @@
@Override
public boolean isChecked() {
return Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, mDefWarnLevel) != 0;
+ Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, DEFAULT_TRIGGER_LEVEL) != 0;
}
@Override
@@ -56,7 +64,7 @@
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL,
isChecked
- ? mDefWarnLevel
+ ? mDefaultTriggerLevelForOn
: 0);
return true;
}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
index 34d354f..602d984 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
@@ -44,15 +44,12 @@
private static final String TAG = "AutoBatterySeekBarPreferenceController";
@VisibleForTesting
static final String KEY_AUTO_BATTERY_SEEK_BAR = "battery_saver_seek_bar";
- private final int mDefWarnLevel;
private SeekBarPreference mPreference;
private AutoBatterySaverSettingObserver mContentObserver;
public AutoBatterySeekBarPreferenceController(Context context, Lifecycle lifecycle) {
super(context, KEY_AUTO_BATTERY_SEEK_BAR);
mContentObserver = new AutoBatterySaverSettingObserver(new Handler(Looper.getMainLooper()));
- mDefWarnLevel = mContext.getResources().getInteger(
- com.android.internal.R.integer.config_lowBatteryWarningLevel);
if (lifecycle != null) {
lifecycle.addObserver(this);
}
@@ -118,7 +115,8 @@
// Set the current value.
final int level = Settings.Global.getInt(contentResolver,
- Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, mDefWarnLevel);
+ Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL,
+ AutoBatterySaverPreferenceController.DEFAULT_TRIGGER_LEVEL);
if (level == 0) {
preference.setVisible(false);
} else {
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index a34bb90..a12d31e 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -51,6 +51,7 @@
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
import com.android.settingslib.utils.ThreadUtils;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -126,10 +127,10 @@
bundle.getParcelable(StatsManager.EXTRA_STATS_DIMENSIONS_VALUE);
final long timeMs = bundle.getLong(AnomalyDetectionReceiver.KEY_ANOMALY_TIMESTAMP,
System.currentTimeMillis());
- final String[] cookies = bundle.getStringArray(
+ final ArrayList<String> cookies = bundle.getStringArrayList(
StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES);
final AnomalyInfo anomalyInfo = new AnomalyInfo(
- !ArrayUtils.isEmpty(cookies) ? cookies[0] : "");
+ !ArrayUtils.isEmpty(cookies) ? cookies.get(0) : "");
Log.i(TAG, "Extra stats value: " + intentDimsValue.toString());
try {
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyInfo.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyInfo.java
index a4077be..063cfec 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyInfo.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyInfo.java
@@ -17,17 +17,21 @@
package com.android.settings.fuelgauge.batterytip;
import android.util.KeyValueListParser;
+import android.util.Log;
/**
* Model class to parse and store anomaly info from westworld
*/
public class AnomalyInfo {
+ private static final String TAG = "AnomalyInfo";
+
private static final String KEY_ANOMALY_TYPE = "anomaly_type";
private static final String KEY_AUTO_RESTRICTION = "auto_restriction";
public final Integer anomalyType;
public final boolean autoRestriction;
public AnomalyInfo(String info) {
+ Log.i(TAG, "anomalyInfo: " + info);
KeyValueListParser parser = new KeyValueListParser(',');
parser.setString(info);
anomalyType = parser.getInt(KEY_ANOMALY_TYPE, -1);
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index 09f0f8b..f3129dd 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -18,8 +18,12 @@
import static android.os.UserHandle.myUserId;
import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.os.UserManager;
+import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -29,6 +33,7 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.wrapper.RestrictedLockUtilsWrapper;
+import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -47,11 +52,20 @@
@VisibleForTesting
PhoneStateListener mPhoneStateListener;
+ private BroadcastReceiver mAirplanModeChangedReceiver;
+
public MobileNetworkPreferenceController(Context context) {
super(context);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
mIsSecondaryUser = !mUserManager.isAdminUser();
+
+ mAirplanModeChangedReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ updateState(mPreference);
+ }
+ };
}
@Override
@@ -92,6 +106,10 @@
}
mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
}
+ if (mAirplanModeChangedReceiver != null) {
+ mContext.registerReceiver(mAirplanModeChangedReceiver,
+ new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED));
+ }
}
@Override
@@ -99,6 +117,21 @@
if (mPhoneStateListener != null) {
mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
}
+ if (mAirplanModeChangedReceiver != null) {
+ mContext.unregisterReceiver(mAirplanModeChangedReceiver);
+ }
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+
+ if (preference instanceof RestrictedPreference &&
+ ((RestrictedPreference) preference).isDisabledByAdmin()) {
+ return;
+ }
+ preference.setEnabled(Settings.Global.getInt(
+ mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) == 0);
}
@Override
diff --git a/src/com/android/settings/nfc/AndroidBeamEnabler.java b/src/com/android/settings/nfc/AndroidBeamEnabler.java
new file mode 100644
index 0000000..66e42b6
--- /dev/null
+++ b/src/com/android/settings/nfc/AndroidBeamEnabler.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2018 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.nfc;
+
+import android.content.Context;
+import android.nfc.NfcAdapter;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedPreference;
+
+/**
+ * AndroidBeanEnabler is a helper to manage the Android Beam preference. It turns on/off
+ * Android Beam and ensures the summary of the preference reflects the current state.
+ */
+public class AndroidBeamEnabler extends BaseNfcEnabler {
+ private final boolean mBeamDisallowedBySystem;
+ private final RestrictedPreference mPreference;
+
+ public AndroidBeamEnabler(Context context, RestrictedPreference preference) {
+ super(context);
+
+ mPreference = preference;
+
+ mBeamDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(context,
+ UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
+
+ if (!isNfcAvailable()) {
+ // NFC is not supported
+ mPreference.setEnabled(false);
+ return;
+ }
+
+ if (mBeamDisallowedBySystem) {
+ mPreference.setEnabled(false);
+ }
+ }
+
+ @Override
+ protected void handleNfcStateChanged(int newState) {
+ switch (newState) {
+ case NfcAdapter.STATE_OFF:
+ mPreference.setEnabled(false);
+ mPreference.setSummary(R.string.android_beam_disabled_summary);
+ break;
+ case NfcAdapter.STATE_ON:
+ if (mBeamDisallowedBySystem) {
+ mPreference.setDisabledByAdmin(null);
+ mPreference.setEnabled(false);
+ } else {
+ mPreference.checkRestrictionAndSetDisabled(UserManager.DISALLOW_OUTGOING_BEAM);
+ }
+ if (mNfcAdapter.isNdefPushEnabled() && mPreference.isEnabled()) {
+ mPreference.setSummary(R.string.android_beam_on_summary);
+ } else {
+ mPreference.setSummary(R.string.android_beam_off_summary);
+ }
+ break;
+ case NfcAdapter.STATE_TURNING_ON:
+ mPreference.setEnabled(false);
+ break;
+ case NfcAdapter.STATE_TURNING_OFF:
+ mPreference.setEnabled(false);
+ break;
+ }
+ }
+}
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
new file mode 100644
index 0000000..6ae7fe5
--- /dev/null
+++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2018 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.nfc;
+
+import android.content.Context;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+public class AndroidBeamPreferenceController extends BaseNfcPreferenceController {
+
+ public static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
+
+ public AndroidBeamPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ if (!isAvailable()) {
+ return;
+ }
+
+ mNfcEnabler = new AndroidBeamEnabler(mContext, (RestrictedPreference) mPreference);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY_ANDROID_BEAM_SETTINGS;
+ }
+}
diff --git a/src/com/android/settings/nfc/BaseNfcEnabler.java b/src/com/android/settings/nfc/BaseNfcEnabler.java
new file mode 100644
index 0000000..5c5f95c
--- /dev/null
+++ b/src/com/android/settings/nfc/BaseNfcEnabler.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2018 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.nfc;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.nfc.NfcAdapter;
+import android.support.v7.preference.Preference;
+
+/**
+ * BaseNfcEnabler is a abstract helper to manage the Nfc state for Nfc and Android Beam
+ * preference. It will receive intent and update state to ensure preference show correct state.
+ */
+public abstract class BaseNfcEnabler {
+ private final Context mContext;
+ protected final NfcAdapter mNfcAdapter;
+ private final IntentFilter mIntentFilter;
+
+ private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ if (NfcAdapter.ACTION_ADAPTER_STATE_CHANGED.equals(action)) {
+ handleNfcStateChanged(intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE,
+ NfcAdapter.STATE_OFF));
+ }
+ }
+ };
+
+ public BaseNfcEnabler(Context context) {
+ mContext = context;
+ mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
+
+ if (!isNfcAvailable()) {
+ // NFC is not supported
+ mIntentFilter = null;
+ return;
+ }
+ mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
+ }
+
+ public void resume() {
+ if (!isNfcAvailable()) {
+ return;
+ }
+ handleNfcStateChanged(mNfcAdapter.getAdapterState());
+ mContext.registerReceiver(mReceiver, mIntentFilter);
+ }
+
+ public void pause() {
+ if (!isNfcAvailable()) {
+ return;
+ }
+ mContext.unregisterReceiver(mReceiver);
+ }
+
+ public boolean isNfcAvailable() {
+ return mNfcAdapter != null;
+ }
+
+ protected abstract void handleNfcStateChanged(int newState);
+}
diff --git a/src/com/android/settings/nfc/BaseNfcPreferenceController.java b/src/com/android/settings/nfc/BaseNfcPreferenceController.java
new file mode 100644
index 0000000..b945738
--- /dev/null
+++ b/src/com/android/settings/nfc/BaseNfcPreferenceController.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2018 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.nfc;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
+import android.os.Handler;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+import java.util.List;
+
+public abstract class BaseNfcPreferenceController extends AbstractPreferenceController
+ implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
+
+ protected BaseNfcEnabler mNfcEnabler;
+ private NfcAdapter mNfcAdapter;
+ private int mAirplaneMode;
+ private AirplaneModeObserver mAirplaneModeObserver;
+ protected Preference mPreference;
+
+ public BaseNfcPreferenceController(Context context) {
+ super(context);
+ mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+
+ if (!isAvailable()) {
+ mNfcEnabler = null;
+ return;
+ }
+
+ mPreference = screen.findPreference(getPreferenceKey());
+
+ // Manually set dependencies for NFC when not toggleable.
+ if (!isToggleableInAirplaneMode(mContext)) {
+ mAirplaneModeObserver = new AirplaneModeObserver();
+ updateNfcPreference();
+ }
+ }
+
+ @Override
+ public void updateNonIndexableKeys(List<String> keys) {
+ if (isAvailable()) {
+ keys.add(getPreferenceKey());
+ }
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return mNfcAdapter != null;
+ }
+
+ public abstract String getPreferenceKey();
+
+ @Override
+ public void onResume() {
+ if (mAirplaneModeObserver != null) {
+ mAirplaneModeObserver.register();
+ }
+ if (mNfcEnabler != null) {
+ mNfcEnabler.resume();
+ }
+ }
+
+ @Override
+ public void onPause() {
+ if (mAirplaneModeObserver != null) {
+ mAirplaneModeObserver.unregister();
+ }
+ if (mNfcEnabler != null) {
+ mNfcEnabler.pause();
+ }
+ }
+
+ private void updateNfcPreference() {
+ final int airplaneMode = Settings.Global.getInt(
+ mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, mAirplaneMode);
+ if (airplaneMode == mAirplaneMode) {
+ return;
+ }
+ mAirplaneMode = airplaneMode;
+ boolean toggleable = mAirplaneMode != 1;
+ if (toggleable) {
+ mNfcAdapter.enable();
+ } else {
+ mNfcAdapter.disable();
+ }
+ mPreference.setEnabled(toggleable);
+ }
+
+ public static boolean isToggleableInAirplaneMode(Context context) {
+ String toggleable = Settings.Global.getString(context.getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+ return toggleable != null && toggleable.contains(Settings.Global.RADIO_NFC);
+ }
+
+ private final class AirplaneModeObserver extends ContentObserver {
+ private final Uri AIRPLANE_MODE_URI =
+ Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
+
+ private AirplaneModeObserver() {
+ super(new Handler());
+ }
+
+ public void register() {
+ mContext.getContentResolver().registerContentObserver(AIRPLANE_MODE_URI, false, this);
+ }
+
+ public void unregister() {
+ mContext.getContentResolver().unregisterContentObserver(this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ super.onChange(selfChange, uri);
+ updateNfcPreference();
+ }
+ }
+
+}
diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 14ee779..29cef99 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -16,90 +16,44 @@
package com.android.settings.nfc;
-import android.content.BroadcastReceiver;
import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
import android.nfc.NfcAdapter;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedPreference;
+import android.support.v14.preference.SwitchPreference;
/**
- * NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It is
- * turns on/off Nfc and ensures the summary of the preference reflects the
- * current state.
+ * NfcEnabler is a helper to manage the Nfc on/off checkbox preference. It turns on/off Nfc
+ * and ensures the summary of the preference reflects the current state.
*/
-public class NfcEnabler implements Preference.OnPreferenceChangeListener {
- private final Context mContext;
- private final SwitchPreference mSwitch;
- private final RestrictedPreference mAndroidBeam;
- private final NfcAdapter mNfcAdapter;
- private final IntentFilter mIntentFilter;
- private boolean mBeamDisallowedBySystem;
+public class NfcEnabler extends BaseNfcEnabler implements Preference.OnPreferenceChangeListener {
+ private final SwitchPreference mPreference;
- private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- if (NfcAdapter.ACTION_ADAPTER_STATE_CHANGED.equals(action)) {
- handleNfcStateChanged(intent.getIntExtra(NfcAdapter.EXTRA_ADAPTER_STATE,
- NfcAdapter.STATE_OFF));
- }
- }
- };
+ public NfcEnabler(Context context, SwitchPreference preference) {
+ super(context);
- public NfcEnabler(Context context, SwitchPreference switchPreference,
- RestrictedPreference androidBeam) {
- mContext = context;
- mSwitch = switchPreference;
- mAndroidBeam = androidBeam;
- mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
- mBeamDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(context,
- UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
-
- if (mNfcAdapter == null) {
- // NFC is not supported
- mSwitch.setEnabled(false);
- mAndroidBeam.setEnabled(false);
- mIntentFilter = null;
- return;
- }
- if (mBeamDisallowedBySystem) {
- mAndroidBeam.setEnabled(false);
- }
- mIntentFilter = new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED);
+ mPreference = preference;
}
public void resume() {
- if (mNfcAdapter == null) {
- return;
+ super.resume();
+ if (isNfcAvailable()) {
+ mPreference.setOnPreferenceChangeListener(this);
}
- handleNfcStateChanged(mNfcAdapter.getAdapterState());
- mContext.registerReceiver(mReceiver, mIntentFilter);
- mSwitch.setOnPreferenceChangeListener(this);
}
public void pause() {
- if (mNfcAdapter == null) {
- return;
+ super.pause();
+ if (isNfcAvailable()) {
+ mPreference.setOnPreferenceChangeListener(null);
}
- mContext.unregisterReceiver(mReceiver);
- mSwitch.setOnPreferenceChangeListener(null);
}
public boolean onPreferenceChange(Preference preference, Object value) {
// Turn NFC on/off
final boolean desiredState = (Boolean) value;
- mSwitch.setChecked(desiredState);
- mSwitch.setEnabled(false);
+ mPreference.setChecked(desiredState);
+ mPreference.setEnabled(false);
if (desiredState) {
mNfcAdapter.enable();
@@ -110,39 +64,25 @@
return false;
}
- private void handleNfcStateChanged(int newState) {
+ @Override
+ protected void handleNfcStateChanged(int newState) {
switch (newState) {
- case NfcAdapter.STATE_OFF:
- mSwitch.setChecked(false);
- mSwitch.setEnabled(true);
- mAndroidBeam.setEnabled(false);
- mAndroidBeam.setSummary(R.string.android_beam_disabled_summary);
- break;
- case NfcAdapter.STATE_ON:
- mSwitch.setChecked(true);
- mSwitch.setEnabled(true);
- if (mBeamDisallowedBySystem) {
- mAndroidBeam.setDisabledByAdmin(null);
- mAndroidBeam.setEnabled(false);
- } else {
- mAndroidBeam.checkRestrictionAndSetDisabled(UserManager.DISALLOW_OUTGOING_BEAM);
- }
- if (mNfcAdapter.isNdefPushEnabled() && mAndroidBeam.isEnabled()) {
- mAndroidBeam.setSummary(R.string.android_beam_on_summary);
- } else {
- mAndroidBeam.setSummary(R.string.android_beam_off_summary);
- }
- break;
- case NfcAdapter.STATE_TURNING_ON:
- mSwitch.setChecked(true);
- mSwitch.setEnabled(false);
- mAndroidBeam.setEnabled(false);
- break;
- case NfcAdapter.STATE_TURNING_OFF:
- mSwitch.setChecked(false);
- mSwitch.setEnabled(false);
- mAndroidBeam.setEnabled(false);
- break;
+ case NfcAdapter.STATE_OFF:
+ mPreference.setChecked(false);
+ mPreference.setEnabled(true);
+ break;
+ case NfcAdapter.STATE_ON:
+ mPreference.setChecked(true);
+ mPreference.setEnabled(true);
+ break;
+ case NfcAdapter.STATE_TURNING_ON:
+ mPreference.setChecked(true);
+ mPreference.setEnabled(false);
+ break;
+ case NfcAdapter.STATE_TURNING_OFF:
+ mPreference.setChecked(false);
+ mPreference.setEnabled(false);
+ break;
}
}
}
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index 76977d2..a0678e0 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -16,146 +16,35 @@
package com.android.settings.nfc;
import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcManager;
-import android.os.Handler;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
+import android.support.v14.preference.SwitchPreference;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import java.util.List;
-public class NfcPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
+public class NfcPreferenceController extends BaseNfcPreferenceController {
public static final String KEY_TOGGLE_NFC = "toggle_nfc";
- public static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
-
- private NfcEnabler mNfcEnabler;
- private NfcAdapter mNfcAdapter;
- private int mAirplaneMode;
- private AirplaneModeObserver mAirplaneModeObserver;
- private SwitchPreference mNfcPreference;
- private RestrictedPreference mBeamPreference;
public NfcPreferenceController(Context context) {
super(context);
- mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
}
@Override
public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
if (!isAvailable()) {
- setVisible(screen, KEY_TOGGLE_NFC, false /* visible */);
- setVisible(screen, KEY_ANDROID_BEAM_SETTINGS, false /* visible */);
- mNfcEnabler = null;
return;
}
- mNfcPreference = (SwitchPreference) screen.findPreference(KEY_TOGGLE_NFC);
- mBeamPreference = (RestrictedPreference) screen.findPreference(
- KEY_ANDROID_BEAM_SETTINGS);
- mNfcEnabler = new NfcEnabler(mContext, mNfcPreference, mBeamPreference);
- // Manually set dependencies for NFC when not toggleable.
- if (!isToggleableInAirplaneMode(mContext)) {
- mAirplaneModeObserver = new AirplaneModeObserver();
- updateNfcPreference();
- }
- }
- @Override
- public void updateNonIndexableKeys(List<String> keys) {
- final NfcManager manager = (NfcManager) mContext.getSystemService(Context.NFC_SERVICE);
- if (manager != null) {
- NfcAdapter adapter = manager.getDefaultAdapter();
- if (adapter == null) {
- keys.add(KEY_TOGGLE_NFC);
- keys.add(KEY_ANDROID_BEAM_SETTINGS);
- }
- }
- }
-
- @Override
- public boolean isAvailable() {
- return mNfcAdapter != null;
+ mNfcEnabler = new NfcEnabler(mContext, (SwitchPreference) mPreference);
}
@Override
public String getPreferenceKey() {
- return null;
+ return KEY_TOGGLE_NFC;
}
-
- public void onResume() {
- if (mAirplaneModeObserver != null) {
- mAirplaneModeObserver.register();
- }
- if (mNfcEnabler != null) {
- mNfcEnabler.resume();
- }
- }
-
- @Override
- public void onPause() {
- if (mAirplaneModeObserver != null) {
- mAirplaneModeObserver.unregister();
- }
- if (mNfcEnabler != null) {
- mNfcEnabler.pause();
- }
- }
-
- private void updateNfcPreference() {
- final int airplaneMode = Settings.Global.getInt(
- mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, mAirplaneMode);
- if (airplaneMode == mAirplaneMode) {
- return;
- }
- mAirplaneMode = airplaneMode;
- boolean toggleable = mAirplaneMode != 1;
- if (toggleable) {
- mNfcAdapter.enable();
- } else {
- mNfcAdapter.disable();
- }
- mNfcPreference.setEnabled(toggleable);
- mBeamPreference.setEnabled(toggleable);
- }
-
- public static boolean isToggleableInAirplaneMode(Context context) {
- String toggleable = Settings.Global.getString(context.getContentResolver(),
- Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
- return toggleable != null && toggleable.contains(Settings.Global.RADIO_NFC);
- }
-
- private final class AirplaneModeObserver extends ContentObserver {
- private final Uri AIRPLANE_MODE_URI =
- Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
-
- private AirplaneModeObserver() {
- super(new Handler());
- }
-
- public void register() {
- mContext.getContentResolver().registerContentObserver(AIRPLANE_MODE_URI, false, this);
- }
-
- public void unregister() {
- mContext.getContentResolver().unregisterContentObserver(this);
- }
-
- @Override
- public void onChange(boolean selfChange, Uri uri) {
- super.onChange(selfChange, uri);
- updateNfcPreference();
- }
- }
-
}
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 2718756..5b85440 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -107,7 +107,7 @@
} else if (numCategories == 3){
String secondaryText = mContext.getString(R.string.join_two_unrelated_items,
enabledCategories.get(0), enabledCategories.get(1).toLowerCase());
- return mContext.getString(R.string.join_two_items, secondaryText,
+ return mContext.getString(R.string.join_many_items_last, secondaryText,
enabledCategories.get(2).toLowerCase());
} else {
String secondaryText = mContext.getString(R.string.join_many_items_middle,
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index e5ba200..aa67b85 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -236,7 +236,8 @@
boolean managedProfileWithUnifiedLock =
UserManager.get(getActivity()).isManagedProfile(mUserId)
&& !mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId);
- if (managedProfileWithUnifiedLock
+ boolean skipConfirmation = managedProfileWithUnifiedLock && !mIsSetNewPassword;
+ if (skipConfirmation
|| !helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
getString(R.string.unlock_set_unlock_launch_picker_title), true, mUserId)) {
mPasswordConfirmed = true; // no password set, so no need to confirm
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 330249b..4fb3c5b 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -24,9 +24,16 @@
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Typeface;
+import android.icu.text.DecimalFormatSymbols;
import android.support.annotation.ColorRes;
+import android.text.Layout;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.StaticLayout;
import android.text.TextPaint;
import android.text.TextUtils;
+import android.text.style.RelativeSizeSpan;
import android.util.AttributeSet;
import android.view.View;
@@ -124,7 +131,6 @@
mBigNumberPaint.setAntiAlias(true);
mBigNumberPaint.setTextSize(
resources.getDimension(R.dimen.storage_donut_view_percent_text_size));
- mBigNumberPaint.setTextAlign(Paint.Align.CENTER);
mBigNumberPaint.setTypeface(Typeface.create(
context.getString(com.android.internal.R.string.config_headlineFontFamily),
Typeface.NORMAL));
@@ -167,11 +173,25 @@
final float centerY = getHeight() / 2;
final float totalHeight = getTextHeight(mTextPaint) + getTextHeight(mBigNumberPaint);
final float startY = centerY + totalHeight / 2;
+ final float fontProportion = getResources().getDimension(
+ R.dimen.storage_donut_view_percent_sign_size) /
+ getResources().getDimension(R.dimen.storage_donut_view_percent_text_size);
+ // Support from Android P
+ final String localizedPercentSign = new DecimalFormatSymbols().getPercentString();
+ final int startIndex = mPercentString.indexOf(localizedPercentSign);
+ final int endIndex = startIndex + localizedPercentSign.length();
- // The first line is the height of the bottom text + its descender above the bottom line.
- canvas.drawText(mPercentString, centerX,
- startY - getTextHeight(mTextPaint) - mBigNumberPaint.descent(),
- mBigNumberPaint);
+ // The first line y-coordinates start at (total height - all TextPaint height) / 2
+ canvas.save();
+ final Spannable percentStringSpan = new SpannableString(mPercentString);
+ percentStringSpan.setSpan(new RelativeSizeSpan(fontProportion),
+ startIndex, endIndex, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+ final StaticLayout percentStringLayout = new StaticLayout(percentStringSpan,
+ mBigNumberPaint, getWidth(), Layout.Alignment.ALIGN_CENTER, 1, 0, false);
+ canvas.translate(0, (getHeight() - totalHeight) / 2);
+ percentStringLayout.draw(canvas);
+ canvas.restore();
+
// The second line starts at the bottom + room for the descender.
canvas.drawText(mFullString, centerX, startY - mTextPaint.descent(), mTextPaint);
}
diff --git a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor b/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
new file mode 100644
index 0000000..bf2f29e
--- /dev/null
+++ b/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
@@ -0,0 +1,31 @@
+com.android.settings.applications.appinfo.AppActionButtonPreferenceController
+com.android.settings.applications.appinfo.AppBatteryPreferenceController
+com.android.settings.applications.appinfo.AppDataUsagePreferenceController
+com.android.settings.applications.appinfo.AppHeaderViewPreferenceController
+com.android.settings.applications.appinfo.AppInstallerInfoPreferenceController
+com.android.settings.applications.appinfo.AppMemoryPreferenceController
+com.android.settings.applications.appinfo.AppNotificationPreferenceController
+com.android.settings.applications.appinfo.AppOpenByDefaultPreferenceController
+com.android.settings.applications.appinfo.AppPermissionPreferenceController
+com.android.settings.applications.appinfo.AppStoragePreferenceController
+com.android.settings.applications.appinfo.AppVersionPreferenceController
+com.android.settings.applications.appinfo.DrawOverlayDetailPreferenceController
+com.android.settings.applications.appinfo.ExternalSourceDetailPreferenceController
+com.android.settings.applications.appinfo.InstantAppButtonsPreferenceController
+com.android.settings.applications.appinfo.InstantAppDomainsPreferenceController
+com.android.settings.applications.appinfo.PictureInPictureDetailPreferenceController
+com.android.settings.applications.appinfo.WriteSystemSettingsPreferenceController
+com.android.settings.bluetooth.BluetoothDeviceNamePreferenceController
+com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController
+com.android.settings.bluetooth.BluetoothSwitchPreferenceController
+com.android.settings.connecteddevice.ConnectedDeviceGroupController
+com.android.settings.connecteddevice.SavedDeviceGroupController
+com.android.settings.datausage.DataUsageSummaryPreferenceController
+com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController
+com.android.settings.fuelgauge.RestrictAppPreferenceController
+com.android.settings.fuelgauge.batterysaver.AutoBatterySeekBarPreferenceController
+com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController
+com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController
+com.android.settings.security.VisiblePatternProfilePreferenceController
+com.android.settings.security.screenlock.LockScreenPreferenceController
+com.android.settings.wifi.details.WifiMeteredPreferenceController
\ No newline at end of file
diff --git a/tests/robotests/src/android/app/admin/PasswordMetrics.java b/tests/robotests/src/android/app/admin/PasswordMetrics.java
deleted file mode 100644
index a461306..0000000
--- a/tests/robotests/src/android/app/admin/PasswordMetrics.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.app.admin;
-
-import android.annotation.NonNull;
-
-/**
- * Stub implementation of framework's PasswordMetrics for Robolectric tests. Otherwise Robolectric
- * is throwing ClassNotFoundError.
- *
- * TODO: Remove this class when Robolectric supports O
- */
-public class PasswordMetrics {
-
- // Maximum allowed number of repeated or ordered characters in a sequence before we'll
- // consider it a complex PIN/password.
- public static final int MAX_ALLOWED_SEQUENCE = 3;
-
- public int length = 0;
- public int letters = 0;
- public int upperCase = 0;
- public int lowerCase = 0;
- public int numeric = 0;
- public int symbols = 0;
- public int nonLetter = 0;
-
- public static int maxLengthSequence(@NonNull String string) {
- // Stub implementation
- return 1;
- }
-
- public static PasswordMetrics computeForPassword(@NonNull String password) {
- return new PasswordMetrics();
- }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java b/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
deleted file mode 100644
index ee7bdb0..0000000
--- a/tests/robotests/src/android/bluetooth/BluetoothCodecConfig.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.bluetooth;
-
-/**
- * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
- */
-public class BluetoothCodecConfig {
-
- public static final int SAMPLE_RATE_NONE = 0;
- public static final int SAMPLE_RATE_48000 = 0x1 << 1;
- public static final int SOURCE_CODEC_TYPE_INVALID = 1000 * 1000;
- public static final int SOURCE_CODEC_TYPE_AAC = 1;
- public static final int CODEC_PRIORITY_DEFAULT = 0;
- public static final int CODEC_PRIORITY_HIGHEST = 1000 * 1000;
- public static final int BITS_PER_SAMPLE_NONE = 0;
- public static final int CHANNEL_MODE_NONE = 0;
- public static final int BITS_PER_SAMPLE_24 = 0x1 << 1;
- public static final int CHANNEL_MODE_STEREO = 0x1 << 1;
-
- public int getSampleRate() {
- return 0;
- }
-
- public int getCodecType() {
- return 0;
- }
-
- public int getBitsPerSample() {
- return 0;
- }
-
- public int getChannelMode() {
- return 0;
- }
-
- public long getCodecSpecific1() {
- return 0;
- }
-}
diff --git a/tests/robotests/src/android/content/om/IOverlayManager.java b/tests/robotests/src/android/content/om/IOverlayManager.java
deleted file mode 100644
index 12f7f7f..0000000
--- a/tests/robotests/src/android/content/om/IOverlayManager.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.content.om;
-
-import android.os.IBinder;
-
-import java.util.List;
-
-public interface IOverlayManager {
-
- OverlayInfo getOverlayInfo(String packageName, int userId);
-
- List getOverlayInfosForTarget(String targetPackageName, int userId);
-
- boolean setEnabled(String packageName, boolean enabled, int userId);
-
- boolean setEnabledExclusiveInCategory(String packageName, int userId);
-
- class Stub {
- public static IOverlayManager asInterface(IBinder b) {
- return null;
- }
- }
-}
diff --git a/tests/robotests/src/android/hardware/usb/UsbManagerExtras.java b/tests/robotests/src/android/hardware/usb/UsbManagerExtras.java
deleted file mode 100644
index b9bccd2..0000000
--- a/tests/robotests/src/android/hardware/usb/UsbManagerExtras.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2010 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 android.hardware.usb;
-
-import android.annotation.SystemService;
-import android.content.Context;
-import android.hardware.usb.gadget.V1_0.GadgetFunction;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringJoiner;
-
-/**
- * Definitions that were added to UsbManager in P.
- *
- * Copied partially from frameworks/base/core/java/android/hardware/usb/UsbManager to
- * fix issues with roboelectric during test.
- */
-@SystemService(Context.USB_SERVICE)
-public class UsbManagerExtras {
- public static final long NONE = 0;
- public static final long MTP = GadgetFunction.MTP;
- public static final long PTP = GadgetFunction.PTP;
- public static final long RNDIS = GadgetFunction.RNDIS;
- public static final long MIDI = GadgetFunction.MIDI;
- public static final long ACCESSORY = GadgetFunction.ACCESSORY;
- public static final long AUDIO_SOURCE = GadgetFunction.AUDIO_SOURCE;
- public static final long ADB = GadgetFunction.ADB;
-
- private static final long SETTABLE_FUNCTIONS = MTP | PTP | RNDIS | MIDI;
-
- private static final Map<String, Long> STR_MAP = new HashMap<>();
-
- static {
- STR_MAP.put(UsbManager.USB_FUNCTION_MTP, MTP);
- STR_MAP.put(UsbManager.USB_FUNCTION_PTP, PTP);
- STR_MAP.put(UsbManager.USB_FUNCTION_RNDIS, RNDIS);
- STR_MAP.put(UsbManager.USB_FUNCTION_MIDI, MIDI);
- STR_MAP.put(UsbManager.USB_FUNCTION_ACCESSORY, ACCESSORY);
- STR_MAP.put(UsbManager.USB_FUNCTION_AUDIO_SOURCE, AUDIO_SOURCE);
- STR_MAP.put(UsbManager.USB_FUNCTION_ADB, ADB);
- }
-
- /**
- * Returns whether the given functions are valid inputs to UsbManager.
- * Currently the empty functions or any of MTP, PTP, RNDIS, MIDI are accepted.
- */
- public static boolean isSettableFunctions(long functions) {
- return (~SETTABLE_FUNCTIONS & functions) == 0;
- }
-
- /**
- * Returns the string representation of the given functions.
- */
- public static String usbFunctionsToString(long functions) {
- StringJoiner joiner = new StringJoiner(",");
- if ((functions | MTP) != 0) {
- joiner.add(UsbManager.USB_FUNCTION_MTP);
- }
- if ((functions | PTP) != 0) {
- joiner.add(UsbManager.USB_FUNCTION_PTP);
- }
- if ((functions | RNDIS) != 0) {
- joiner.add(UsbManager.USB_FUNCTION_RNDIS);
- }
- if ((functions | MIDI) != 0) {
- joiner.add(UsbManager.USB_FUNCTION_MIDI);
- }
- if ((functions | ACCESSORY) != 0) {
- joiner.add(UsbManager.USB_FUNCTION_ACCESSORY);
- }
- if ((functions | AUDIO_SOURCE) != 0) {
- joiner.add(UsbManager.USB_FUNCTION_AUDIO_SOURCE);
- }
- if ((functions | ADB) != 0) {
- joiner.add(UsbManager.USB_FUNCTION_ADB);
- }
- return joiner.toString();
- }
-
- /**
- * Parses a string of usb functions and returns a mask of the same functions.
- */
- public static long usbFunctionsFromString(String functions) {
- if (functions == null) {
- return 0;
- }
- long ret = 0;
- for (String function : functions.split(",")) {
- if (STR_MAP.containsKey(function)) {
- ret |= STR_MAP.get(function);
- }
- }
- return ret;
- }
-}
diff --git a/tests/robotests/src/android/net/NetworkScorerAppData.java b/tests/robotests/src/android/net/NetworkScorerAppData.java
deleted file mode 100644
index f7da4d1..0000000
--- a/tests/robotests/src/android/net/NetworkScorerAppData.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package android.net;
-
-import android.annotation.Nullable;
-import android.content.ComponentName;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.Objects;
-
-/**
- * Holds metadata about a discovered network scorer/recommendation application.
- *
- * TODO: delete this class once robolectric supports Android O
- */
-public final class NetworkScorerAppData implements Parcelable {
- /** UID of the scorer app. */
- public final int packageUid;
- private final ComponentName mRecommendationService;
- /** User visible label in Settings for the recommendation service. */
- private final String mRecommendationServiceLabel;
- /**
- * The {@link ComponentName} of the Activity to start before enabling the "connect to open
- * wifi networks automatically" feature.
- */
- private final ComponentName mEnableUseOpenWifiActivity;
- /**
- * The {@link android.app.NotificationChannel} ID used by {@link #mRecommendationService} to
- * post open network notifications.
- */
- private final String mNetworkAvailableNotificationChannelId;
-
- public NetworkScorerAppData(int packageUid, ComponentName recommendationServiceComp,
- String recommendationServiceLabel, ComponentName enableUseOpenWifiActivity,
- String networkAvailableNotificationChannelId) {
- this.packageUid = packageUid;
- this.mRecommendationService = recommendationServiceComp;
- this.mRecommendationServiceLabel = recommendationServiceLabel;
- this.mEnableUseOpenWifiActivity = enableUseOpenWifiActivity;
- this.mNetworkAvailableNotificationChannelId = networkAvailableNotificationChannelId;
- }
-
- protected NetworkScorerAppData(Parcel in) {
- packageUid = in.readInt();
- mRecommendationService = ComponentName.readFromParcel(in);
- mRecommendationServiceLabel = in.readString();
- mEnableUseOpenWifiActivity = ComponentName.readFromParcel(in);
- mNetworkAvailableNotificationChannelId = in.readString();
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(packageUid);
- ComponentName.writeToParcel(mRecommendationService, dest);
- dest.writeString(mRecommendationServiceLabel);
- ComponentName.writeToParcel(mEnableUseOpenWifiActivity, dest);
- dest.writeString(mNetworkAvailableNotificationChannelId);
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- public static final Creator<NetworkScorerAppData> CREATOR =
- new Creator<NetworkScorerAppData>() {
- @Override
- public NetworkScorerAppData createFromParcel(Parcel in) {
- return new NetworkScorerAppData(in);
- }
-
- @Override
- public NetworkScorerAppData[] newArray(int size) {
- return new NetworkScorerAppData[size];
- }
- };
-
- public String getRecommendationServicePackageName() {
- return mRecommendationService.getPackageName();
- }
-
- public ComponentName getRecommendationServiceComponent() {
- return mRecommendationService;
- }
-
- @Nullable
- public ComponentName getEnableUseOpenWifiActivity() {
- return mEnableUseOpenWifiActivity;
- }
-
- @Nullable
- public String getRecommendationServiceLabel() {
- return mRecommendationServiceLabel;
- }
-
- @Nullable
- public String getNetworkAvailableNotificationChannelId() {
- return mNetworkAvailableNotificationChannelId;
- }
-
- @Override
- public String toString() {
- return "NetworkScorerAppData{" +
- "packageUid=" + packageUid +
- ", mRecommendationService=" + mRecommendationService +
- ", mRecommendationServiceLabel=" + mRecommendationServiceLabel +
- ", mEnableUseOpenWifiActivity=" + mEnableUseOpenWifiActivity +
- ", mNetworkAvailableNotificationChannelId=" +
- mNetworkAvailableNotificationChannelId +
- '}';
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- NetworkScorerAppData that = (NetworkScorerAppData) o;
- return packageUid == that.packageUid &&
- Objects.equals(mRecommendationService, that.mRecommendationService) &&
- Objects.equals(mRecommendationServiceLabel, that.mRecommendationServiceLabel) &&
- Objects.equals(mEnableUseOpenWifiActivity, that.mEnableUseOpenWifiActivity) &&
- Objects.equals(mNetworkAvailableNotificationChannelId,
- that.mNetworkAvailableNotificationChannelId);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(packageUid, mRecommendationService, mRecommendationServiceLabel,
- mEnableUseOpenWifiActivity, mNetworkAvailableNotificationChannelId);
- }
-}
diff --git a/tests/robotests/src/android/os/SystemUpdateManager.java b/tests/robotests/src/android/os/SystemUpdateManager.java
deleted file mode 100644
index f81df36..0000000
--- a/tests/robotests/src/android/os/SystemUpdateManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2018 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 android.os;
-
-/**
- * Duplicate class for platform SystemUpdateManager to get around Robolectric sdk problem.
- */
-public class SystemUpdateManager {
-
- public static final String KEY_STATUS = "status";
- public static final String KEY_TITLE = "title";
-
- public static final int STATUS_UNKNOWN = 0;
- public static final int STATUS_IDLE = 1;
- public static final int STATUS_WAITING_DOWNLOAD = 2;
- public static final int STATUS_IN_PROGRESS = 3;
- public static final int STATUS_WAITING_INSTALL = 4;
- public static final int STATUS_WAITING_REBOOT = 5;
-
- public Bundle retrieveSystemUpdateInfo() {
- return null;
- }
-}
diff --git a/tests/robotests/src/android/print/PrintServicesLoader.java b/tests/robotests/src/android/print/PrintServicesLoader.java
deleted file mode 100644
index e4975ed..0000000
--- a/tests/robotests/src/android/print/PrintServicesLoader.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package android.print;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.content.Loader;
-import android.printservice.PrintServiceInfo;
-import com.android.internal.util.Preconditions;
-
-import java.util.List;
-
-/**
- * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
- */
-public class PrintServicesLoader extends Loader<List<PrintServiceInfo>> {
- public PrintServicesLoader(@NonNull PrintManager printManager, @NonNull Context context,
- int selectionFlags) {
- super(Preconditions.checkNotNull(context));
- }
-}
diff --git a/tests/robotests/src/android/service/notification/NotifyingApp.java b/tests/robotests/src/android/service/notification/NotifyingApp.java
deleted file mode 100644
index f36069b..0000000
--- a/tests/robotests/src/android/service/notification/NotifyingApp.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2018 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 android.service.notification;
-
-import android.annotation.NonNull;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.Objects;
-
-/**
- * Stub implementation of framework's NotifyingApp for Robolectric tests. Otherwise Robolectric
- * throws ClassNotFoundError.
- *
- * TODO: Remove this class when Robolectric supports P
- */
-public final class NotifyingApp implements Comparable<NotifyingApp> {
-
- private int mUid;
- private String mPkg;
- private long mLastNotified;
-
- public NotifyingApp() {}
-
- public int getUid() {
- return mUid;
- }
-
- /**
- * Sets the uid of the package that sent the notification. Returns self.
- */
- public NotifyingApp setUid(int mUid) {
- this.mUid = mUid;
- return this;
- }
-
- public String getPackage() {
- return mPkg;
- }
-
- /**
- * Sets the package that sent the notification. Returns self.
- */
- public NotifyingApp setPackage(@NonNull String mPkg) {
- this.mPkg = mPkg;
- return this;
- }
-
- public long getLastNotified() {
- return mLastNotified;
- }
-
- /**
- * Sets the time the notification was originally sent. Returns self.
- */
- public NotifyingApp setLastNotified(long mLastNotified) {
- this.mLastNotified = mLastNotified;
- return this;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- NotifyingApp that = (NotifyingApp) o;
- return getUid() == that.getUid()
- && getLastNotified() == that.getLastNotified()
- && Objects.equals(mPkg, that.mPkg);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(getUid(), mPkg, getLastNotified());
- }
-
- /**
- * Sorts notifying apps from newest last notified date to oldest.
- */
- @Override
- public int compareTo(NotifyingApp o) {
- if (getLastNotified() == o.getLastNotified()) {
- if (getUid() == o.getUid()) {
- return getPackage().compareTo(o.getPackage());
- }
- return Integer.compare(getUid(), o.getUid());
- }
-
- return -Long.compare(getLastNotified(), o.getLastNotified());
- }
-
- @Override
- public String toString() {
- return "NotifyingApp{"
- + "mUid=" + mUid
- + ", mPkg='" + mPkg + '\''
- + ", mLastNotified=" + mLastNotified
- + '}';
- }
-}
diff --git a/tests/robotests/src/android/service/oemlock/OemLockManager.java b/tests/robotests/src/android/service/oemlock/OemLockManager.java
deleted file mode 100644
index c168089..0000000
--- a/tests/robotests/src/android/service/oemlock/OemLockManager.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.service.oemlock;
-
-/**
- * Make OemLockManager available to Robolectric.
- */
-public class OemLockManager {
- public void setOemUnlockAllowedByCarrier(boolean allowed, byte[] signature) {}
-
- public boolean isOemUnlockAllowedByCarrier() {
- return true;
- }
-
- public void setOemUnlockAllowedByUser(boolean allowed) {}
-
- public boolean isOemUnlockAllowedByUser() {
- return false;
- }
-
- public boolean isOemUnlockAllowed() {
- return false;
- }
-
- public boolean isDeviceOemUnlocked() {
- return false;
- }
-}
diff --git a/tests/robotests/src/android/service/settings/suggestions/ISuggestionService.java b/tests/robotests/src/android/service/settings/suggestions/ISuggestionService.java
deleted file mode 100644
index f4f5a51..0000000
--- a/tests/robotests/src/android/service/settings/suggestions/ISuggestionService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.service.settings.suggestions;
-
-import java.util.List;
-
-public interface ISuggestionService {
- List<Suggestion> getSuggestions();
-}
diff --git a/tests/robotests/src/android/service/settings/suggestions/Suggestion.java b/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
deleted file mode 100644
index 79aeb93..0000000
--- a/tests/robotests/src/android/service/settings/suggestions/Suggestion.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.service.settings.suggestions;
-
-import android.app.PendingIntent;
-import android.graphics.drawable.Icon;
-import android.text.TextUtils;
-
-public class Suggestion {
-
- public static final int FLAG_HAS_BUTTON = 1 << 0;
-
- private final String mId;
- private final CharSequence mTitle;
- private final CharSequence mSummary;
- private final Icon mIcon;
- private final int mFlags;
- private final PendingIntent mPendingIntent;
-
- /**
- * Gets the id for the suggestion object.
- */
- public String getId() {
- return mId;
- }
-
- /**
- * Title of the suggestion that is shown to the user.
- */
- public CharSequence getTitle() {
- return mTitle;
- }
-
- /**
- * Optional summary describing what this suggestion controls.
- */
- public CharSequence getSummary() {
- return mSummary;
- }
-
- /**
- * Optional icon for this suggestion.
- */
- public Icon getIcon() {
- return mIcon;
- }
-
- public int getFlags() {
- return mFlags;
- }
-
- /**
- * The Intent to launch when the suggestion is activated.
- */
- public PendingIntent getPendingIntent() {
- return mPendingIntent;
- }
-
- private Suggestion(Builder builder) {
- mTitle = builder.mTitle;
- mSummary = builder.mSummary;
- mIcon = builder.mIcon;
- mPendingIntent = builder.mPendingIntent;
- mId = builder.mId;
- mFlags = builder.mFlags;
- }
-
- /**
- * Builder class for {@link Suggestion}.
- */
- public static class Builder {
-
- private final String mId;
- private int mFlags;
- private CharSequence mTitle;
- private CharSequence mSummary;
- private Icon mIcon;
- private PendingIntent mPendingIntent;
-
- public Builder(String id) {
- if (TextUtils.isEmpty(id)) {
- throw new IllegalArgumentException("Suggestion id cannot be empty");
- }
- mId = id;
- }
-
- /**
- * Sets suggestion title
- */
-
- public Builder setTitle(CharSequence title) {
- mTitle = title;
- return this;
- }
-
- /**
- * Sets suggestion summary
- */
- public Builder setSummary(CharSequence summary) {
- mSummary = summary;
- return this;
- }
-
- /**
- * Sets icon for the suggestion.
- */
- public Builder setIcon(Icon icon) {
- mIcon = icon;
- return this;
- }
-
- public Builder setFlags(int flags) {
- mFlags = flags;
- return this;
- }
-
- /**
- * Sets suggestion intent
- */
- public Builder setPendingIntent(PendingIntent pendingIntent) {
- mPendingIntent = pendingIntent;
- return this;
- }
-
- /**
- * Builds an immutable {@link Suggestion} object.
- */
- public Suggestion build() {
- return new Suggestion(this /* builder */);
- }
- }
-}
diff --git a/tests/robotests/src/android/util/FeatureFlagUtils.java b/tests/robotests/src/android/util/FeatureFlagUtils.java
deleted file mode 100644
index e9dc966..0000000
--- a/tests/robotests/src/android/util/FeatureFlagUtils.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.util;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.text.TextUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class is only needed to get around Robolectric issue.
- */
-public class FeatureFlagUtils {
- public static final String FFLAG_PREFIX = "sys.fflag.";
- public static final String FFLAG_OVERRIDE_PREFIX = FFLAG_PREFIX + "override.";
-
- /**
- * Whether or not a flag is enabled.
- *
- * @param feature the flag name
- * @return true if the flag is enabled (either by default in system, or override by user)
- */
- public static boolean isEnabled(Context context, String feature) {
- // Override precedence:
- // Settings.Global -> sys.fflag.override.* -> sys.fflag.*
-
- // Step 1: check if feature flag is set in Settings.Global.
- String value;
- if (context != null) {
- value = Settings.Global.getString(context.getContentResolver(), feature);
- if (!TextUtils.isEmpty(value)) {
- return Boolean.parseBoolean(value);
- }
- }
-
- // Step 2: check if feature flag has any override. Flag name: sys.fflag.override.<feature>
- value = SystemProperties.get(FFLAG_OVERRIDE_PREFIX + feature);
- if (!TextUtils.isEmpty(value)) {
- return Boolean.parseBoolean(value);
- }
- // Step 3: check if feature flag has any default value. Flag name: sys.fflag.<feature>
- value = SystemProperties.get(FFLAG_PREFIX + feature);
- return Boolean.parseBoolean(value);
- }
-
- /**
- * Override feature flag to new state.
- */
- public static void setEnabled(Context context, String feature, boolean enabled) {
- SystemProperties.set(FFLAG_OVERRIDE_PREFIX + feature, enabled ? "true" : "false");
- }
-
- public static Map<String, String> getAllFeatureFlags() {
- final Map<String, String> features = new HashMap<>();
- features.put(FFLAG_PREFIX + "abc", "false");
- features.put(FFLAG_OVERRIDE_PREFIX + "abc", "true");
- return features;
- }
-}
diff --git a/tests/robotests/src/android/util/IconDrawableFactory.java b/tests/robotests/src/android/util/IconDrawableFactory.java
deleted file mode 100644
index 9d0d7df..0000000
--- a/tests/robotests/src/android/util/IconDrawableFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.util;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageItemInfo;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-
-/**
- * This class is only needed to get around Robolectric issue.
- */
-public class IconDrawableFactory {
-
- public static IconDrawableFactory newInstance(Context context) {
- return new IconDrawableFactory();
- }
-
- public Drawable getBadgedIcon(ApplicationInfo appInfo) {
- return getBadgedIcon(appInfo, 0);
- }
-
- public Drawable getBadgedIcon(ApplicationInfo appInfo, int userId) {
- return getBadgedIcon(appInfo, appInfo, userId);
- }
-
- public Drawable getBadgedIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo, int userId) {
- return new ColorDrawable(0);
- }
-}
diff --git a/tests/robotests/src/com/android/internal/app/ColorDisplayController.java b/tests/robotests/src/com/android/internal/app/ColorDisplayController.java
deleted file mode 100644
index e31ba51..0000000
--- a/tests/robotests/src/com/android/internal/app/ColorDisplayController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2016 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.internal.app;
-
-/**
- * Fake controller to make robolectric test compile. This is necessary since
- * ColorDisplayController is not part of Android's API.
- */
-public class ColorDisplayController {
-
- public static final int AUTO_MODE_DISABLED = 0;
- public static final int AUTO_MODE_CUSTOM = 1;
- public static final int AUTO_MODE_TWILIGHT = 2;
-
- public static final int COLOR_MODE_NATURAL = 0;
- public static final int COLOR_MODE_BOOSTED = 1;
- public static final int COLOR_MODE_SATURATED = 2;
-
- private int mColorMode;
-
- public void setColorMode(int colorMode) {
- mColorMode = colorMode;
- }
-
- public int getColorMode() {
- return mColorMode;
- }
-
- public interface Callback {
- }
-}
diff --git a/tests/robotests/src/com/android/internal/app/LocalePickerWithRegion.java b/tests/robotests/src/com/android/internal/app/LocalePickerWithRegion.java
deleted file mode 100644
index 9edda45..0000000
--- a/tests/robotests/src/com/android/internal/app/LocalePickerWithRegion.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.android.internal.app;
-
-/**
- * A placeholder class to prevent ClassNotFound exceptions caused by lack of visibility.
- */
-public class LocalePickerWithRegion {
-
- public interface LocaleSelectedListener {
- void onLocaleSelected(LocaleStore.LocaleInfo locale);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
index ab3e066..0a54b82 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
@@ -22,6 +22,8 @@
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
import android.content.pm.ResolveInfo;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -81,13 +83,26 @@
}
@Test
- public void hasIntentHandler_shouldBeAvailable() {
+ public void hasIntentHandler_notSystemApp_shouldBeDisabled() {
mPackageManager.addResolveInfoForIntent(TEST_INTENT, new ResolveInfo());
mController.setPackageName(TEST_INTENT.getStringExtra(EXTRA_PACKAGE_NAME));
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
+ }
+
+ @Test
+ public void hasIntentHandler_resolvedToSystemApp_shouldBeAvailable() {
+ final ResolveInfo info = new ResolveInfo();
+ info.activityInfo = new ActivityInfo();
+ info.activityInfo.applicationInfo = new ApplicationInfo();
+ info.activityInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
+ mPackageManager.addResolveInfoForIntent(TEST_INTENT, info);
+ mController.setPackageName(TEST_INTENT.getStringExtra(EXTRA_PACKAGE_NAME));
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
mController.displayPreference(mScreen);
final Intent intent = mPreference.getIntent();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
new file mode 100644
index 0000000..5fcc50a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2018 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.connecteddevice;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplicationPackageManager;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowApplicationPackageManager.class)
+public class AddDevicePreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mScreen;
+ @Mock
+ private BluetoothAdapter mBluetoothAdapter;
+
+ private Context mContext;
+ private AddDevicePreferenceController mAddDevicePreferenceController;
+ private RestrictedPreference mAddDevicePreference;
+ private ShadowApplicationPackageManager mPackageManager;
+
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mPackageManager = (ShadowApplicationPackageManager) Shadows.shadowOf(
+ mContext.getPackageManager());
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
+
+ mAddDevicePreferenceController = new AddDevicePreferenceController(mContext);
+ ReflectionHelpers.setField(mAddDevicePreferenceController,
+ "mBluetoothAdapter", mBluetoothAdapter);
+
+ String key = mAddDevicePreferenceController.getPreferenceKey();
+ mAddDevicePreference = new RestrictedPreference(mContext);
+ mAddDevicePreference.setKey(key);
+ when(mScreen.findPreference(key)).thenReturn(mAddDevicePreference);
+ mAddDevicePreferenceController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void addDevice_bt_resume_on_then_off() {
+ when(mBluetoothAdapter.isEnabled()).thenReturn(true);
+ mAddDevicePreferenceController.updateState();
+ assertTrue(TextUtils.isEmpty(mAddDevicePreference.getSummary()));
+
+ Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+ intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
+ BroadcastReceiver receiver = ReflectionHelpers.getField(
+ mAddDevicePreferenceController, "mReceiver");
+ when(mBluetoothAdapter.isEnabled()).thenReturn(false);
+ receiver.onReceive(mContext, intent);
+ assertThat(mAddDevicePreference.getSummary()).isEqualTo(
+ mContext.getString(R.string.connected_device_add_device_summary));
+ }
+
+ @Test
+ public void addDevice_bt_resume_off_then_on() {
+ when(mBluetoothAdapter.isEnabled()).thenReturn(false);
+ mAddDevicePreferenceController.updateState();
+ assertThat(mAddDevicePreference.getSummary()).isEqualTo(
+ mContext.getString(R.string.connected_device_add_device_summary));
+
+ Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
+ intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_ON);
+ BroadcastReceiver receiver = ReflectionHelpers.getField(
+ mAddDevicePreferenceController, "mReceiver");
+ when(mBluetoothAdapter.isEnabled()).thenReturn(true);
+ receiver.onReceive(mContext, intent);
+ assertTrue(TextUtils.isEmpty(mAddDevicePreference.getSummary()));
+ }
+
+ @Test
+ public void addDevice_Availability_UnSupported() {
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
+ assertThat(mAddDevicePreferenceController.getAvailabilityStatus())
+ .isEqualTo(DISABLED_UNSUPPORTED);
+ }
+
+ @Test
+ public void addDevice_Availability_Supported() {
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
+ assertThat(mAddDevicePreferenceController.getAvailabilityStatus())
+ .isEqualTo(AVAILABLE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index 982de54..2e2dd9d 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -16,13 +16,10 @@
package com.android.settings.connecteddevice;
import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
+;
import android.provider.SearchIndexableResource;
-import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowBluetoothPan;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -59,8 +56,8 @@
@Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
- AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
- .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
+ AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
+ .getXmlResourcesToIndex(RuntimeEnvironment.application, true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
@@ -70,14 +67,4 @@
public void testGetCategoryKey_returnCategoryDevice() {
assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE);
}
-
- @Test
- public void testNonIndexableKeys_existInXmlLayout() {
- final Context context = RuntimeEnvironment.application;
- final List<String> niks =
- AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
-
- assertThat(niks).contains(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
- }
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index c68771c..443e885 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -30,6 +30,7 @@
import android.provider.SearchIndexableResource;
import com.android.settings.R;
+import com.android.settings.nfc.NfcPreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothPan;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
@@ -77,6 +78,7 @@
final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
- assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_SAVED_DEVICES);
+ assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_SAVED_DEVICES,
+ NfcPreferenceController.KEY_TOGGLE_NFC);
}
}
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
new file mode 100644
index 0000000..a9b4f5d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2018 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.core;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Context;
+
+import com.android.settings.core.codeinspection.CodeInspector;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BasePreferenceControllerSignatureInspector extends CodeInspector {
+
+ private final List<String> grandfather;
+
+ public BasePreferenceControllerSignatureInspector(List<Class<?>> classes) {
+ super(classes);
+ grandfather = new ArrayList<>();
+ initializeGrandfatherList(grandfather,
+ "grandfather_invalid_base_preference_controller_constructor");
+ }
+
+ @Override
+ public void run() {
+ StringBuilder badClasses = new StringBuilder();
+
+ for (Class c : mClasses) {
+ if (!isConcreteSettingsClass(c)) {
+ // Not a Settings class, or is abstract, don't care.
+ continue;
+ }
+ if (!BasePreferenceController.class.isAssignableFrom(c)) {
+ // Not a BasePreferenceController, don't care.
+ continue;
+ }
+ final String className = c.getName();
+ if (grandfather.remove(className)) {
+ continue;
+ }
+ final Constructor[] constructors = c.getDeclaredConstructors();
+ if (constructors == null || constructors.length == 0) {
+ badClasses.append(c.getName()).append(",");
+ }
+ for (Constructor constructor : constructors) {
+ if (!hasValidConstructorSignature(constructor)) {
+ badClasses.append(className).append(",");
+ continue;
+ }
+ }
+ }
+
+ assertWithMessage("All BasePreferenceController (and subclasses) constructor must either"
+ + "only take Context, or (Context, String). No other types are allowed")
+ .that(badClasses.toString())
+ .isEmpty();
+
+ assertWithMessage("Something in the grandfather list is no longer relevant. Please remove")
+ .that(grandfather)
+ .isEmpty();
+ }
+
+ private static boolean hasValidConstructorSignature(Constructor constructor) {
+ final Class[] parameterTypes = constructor.getParameterTypes();
+ if (parameterTypes.length == 1) {
+ return Context.class.isAssignableFrom(parameterTypes[0]);
+ } else if (parameterTypes.length == 2) {
+ return Context.class.isAssignableFrom(parameterTypes[0])
+ && String.class.isAssignableFrom(parameterTypes[1]);
+ }
+ return false;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
index 8470acb..c8ad4d6 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspectionTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
+import com.android.settings.core.BasePreferenceControllerSignatureInspector;
import com.android.settings.core.instrumentation.InstrumentableFragmentCodeInspector;
import com.android.settings.search.SearchIndexProviderCodeInspector;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,6 +50,11 @@
new InstrumentableFragmentCodeInspector(mClasses).run();
}
+ @Test
+ public void runBasePreferenceControllerConstructorSignatureInspection() {
+ new BasePreferenceControllerSignatureInspector(mClasses).run();
+ }
+
@Ignore("b/73960706")
@Test
public void runSearchIndexProviderCodeInspection() {
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java
index 13cb1c2..66ef5a0 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java
@@ -22,7 +22,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.NotificationManager;
import android.content.Context;
import android.media.AudioManager;
import android.provider.Settings;
@@ -59,7 +58,7 @@
mContext = RuntimeEnvironment.application;
mAudioManager = Shadow.extract(mContext.getSystemService(Context.AUDIO_SERVICE));
mNotificationManager = Shadow.extract(
- mContext.getSystemService(NotificationManager.class));
+ mContext.getSystemService(Context.NOTIFICATION_SERVICE));
when(mConditionManager.getContext()).thenReturn(mContext);
mCondition = spy(new RingerMutedCondition(mConditionManager));
}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index 634fe65..cd7de00 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -25,27 +25,41 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.NetworkTemplate;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
+import com.android.settings.applications.AppInfoWithHeaderTest;
+import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.NetworkPolicyEditor;
+import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.net.DataUsageController;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import java.util.concurrent.TimeUnit;
+import android.support.v7.widget.RecyclerView;
+
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowEntityHeaderController.class)
public class DataUsageSummaryPreferenceControllerTest {
private static final long UPDATE_BACKOFF_MS = TimeUnit.MINUTES.toMillis(13);
@@ -68,7 +82,15 @@
private NetworkTemplate mNetworkTemplate;
@Mock
private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private Lifecycle mLifecycle;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private EntityHeaderController mHeaderController;
+ @Mock
+ private DataUsageSummary mDataUsageSummary;
+ private FakeFeatureFactory mFactory;
+ private Activity mActivity;
private Context mContext;
private DataUsageSummaryPreferenceController mController;
@@ -79,15 +101,27 @@
doReturn("%1$s %2%s").when(mContext)
.getString(com.android.internal.R.string.fileSizeSuffix);
+
+ mActivity = Robolectric.setupActivity(Activity.class);
+ mFactory = FakeFeatureFactory.setupForTest();
+ when(mFactory.metricsFeatureProvider.getMetricsCategory(any(Object.class)))
+ .thenReturn(MetricsProto.MetricsEvent.SETTINGS_APP_NOTIF_CATEGORY);
+ ShadowEntityHeaderController.setUseMock(mHeaderController);
+
mController = new DataUsageSummaryPreferenceController(
- mContext,
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
mPolicyEditor,
R.string.cell_data_template,
true,
- null);
+ null,
+ mActivity, null, null, null);
+ }
+
+ @After
+ public void tearDown() {
+ ShadowEntityHeaderController.reset();
}
@Test
@@ -240,14 +274,14 @@
@Test
public void testMobileData_preferenceAvailable() {
mController = new DataUsageSummaryPreferenceController(
- mContext,
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
mPolicyEditor,
R.string.cell_data_template,
true,
- mSubscriptionManager);
+ mSubscriptionManager,
+ mActivity, null, null, null);
final SubscriptionInfo subInfo = new SubscriptionInfo(0, "123456", 0, "name", "carrier",
0, 0, "number", 0, null, 123, 456, "ZX");
@@ -258,19 +292,42 @@
@Test
public void testMobileData_preferenceDisabled() {
mController = new DataUsageSummaryPreferenceController(
- mContext,
mDataUsageController,
mDataInfoController,
mNetworkTemplate,
mPolicyEditor,
R.string.cell_data_template,
true,
- mSubscriptionManager);
+ mSubscriptionManager,
+ mActivity, null, null, null);
when(mSubscriptionManager.getDefaultDataSubscriptionInfo()).thenReturn(null);
assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_UNSUPPORTED);
}
+ @Test
+ public void testMobileData_entityHeaderSet() {
+ final RecyclerView recyclerView = new RecyclerView(mActivity);
+
+ mController = new DataUsageSummaryPreferenceController(
+ mDataUsageController,
+ mDataInfoController,
+ mNetworkTemplate,
+ mPolicyEditor,
+ R.string.cell_data_template,
+ true,
+ mSubscriptionManager,
+ mActivity, mLifecycle, mHeaderController, mDataUsageSummary);
+
+ when(mDataUsageSummary.getListView()).thenReturn(recyclerView);
+
+ mController.onStart();
+
+ verify(mHeaderController)
+ .setRecyclerView(any(RecyclerView.class), any(Lifecycle.class));
+ verify(mHeaderController).styleActionBar(any(Activity.class));
+ }
+
private DataUsageController.DataUsageInfo createTestDataUsageInfo(long now) {
DataUsageController.DataUsageInfo info = new DataUsageController.DataUsageInfo();
info.carrier = CARRIER_NAME;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java
index c85c598..a240646 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java
@@ -62,7 +62,7 @@
observer.await();
assertThat(adapter.getItemCount()).isEqualTo(items.length);
for (int i = 0; i < items.length; i++) {
- assertThat(adapter.getItem(i)).isEqualTo(items[i]);
+ assertThat(adapter.getDataItem(i)).isEqualTo(items[i]);
}
}
@@ -90,7 +90,8 @@
private static class TestTimeZoneAdapter extends BaseTimeZoneAdapter<TestItem> {
public TestTimeZoneAdapter(List<TestItem> items) {
- super(items, position -> {}, Locale.US, false);
+ super(items, position -> {}, Locale.US, false /* showItemSummary */,
+ null /* headerText */);
}
}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java
index 3491b03..ef80968 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java
@@ -61,13 +61,13 @@
BaseTimeZoneAdapter adapter = picker.createAdapter(mock(TimeZoneData.class));
Truth.assertThat(adapter.getItemCount()).isEqualTo(2);
- BaseTimeZoneAdapter.AdapterItem item1 = adapter.getItem(0);
+ BaseTimeZoneAdapter.AdapterItem item1 = adapter.getDataItem(0);
Truth.assertThat(item1.getTitle().toString()).isEqualTo("Los Angeles");
Truth.assertThat(item1.getSummary().toString()).isEqualTo("Pacific Time (GMT-08:00)");
Truth.assertThat(item1.getCurrentTime())
.hasLength(ShadowDataFormat.sTimeFormatString.length());
- BaseTimeZoneAdapter.AdapterItem item2 = adapter.getItem(1);
+ BaseTimeZoneAdapter.AdapterItem item2 = adapter.getDataItem(1);
Truth.assertThat(item2.getTitle().toString()).isEqualTo("New York");
Truth.assertThat(item2.getSummary().toString()).isEqualTo("Eastern Time (GMT-05:00)");
Truth.assertThat(item2.getCurrentTime())
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
index 007d3c5..9d650cc 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
@@ -65,10 +65,10 @@
TestFixedOffsetPicker picker = new TestFixedOffsetPicker();
BaseTimeZoneAdapter adapter = picker.createAdapter(new TimeZoneData(mFinder));
assertThat(adapter.getItemCount()).isEqualTo(12 + 1 + 14); // 27 GMT offsets from -12 to +14
- AdapterItem utc = adapter.getItem(0);
+ AdapterItem utc = adapter.getDataItem(0);
assertThat(utc.getTitle().toString()).isEqualTo("Coordinated Universal Time");
assertThat(utc.getSummary().toString()).isEqualTo("GMT+00:00");
- AdapterItem gmtMinus12 = adapter.getItem(1);
+ AdapterItem gmtMinus12 = adapter.getDataItem(1);
assertThat(gmtMinus12.getTitle().toString()).isEqualTo("GMT-12:00");
assertThat(gmtMinus12.getSummary().toString()).isEmpty();
}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
index 8da9cbf..02a3122 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
@@ -66,7 +66,7 @@
RegionSearchPicker picker = new RegionSearchPicker();
BaseTimeZoneAdapter adapter = picker.createAdapter(new TimeZoneData(finder));
assertEquals(1, adapter.getItemCount());
- AdapterItem item = adapter.getItem(0);
+ AdapterItem item = adapter.getDataItem(0);
assertEquals("United States", item.getTitle().toString());
assertThat(Arrays.asList(item.getSearchKeys())).contains("United States");
}
@@ -86,8 +86,8 @@
RegionSearchPicker picker = new RegionSearchPicker();
BaseTimeZoneAdapter<RegionItem> adapter = picker.createAdapter(new TimeZoneData(finder));
// Prepare and bind a new ItemViewHolder with United States
- ItemViewHolder viewHolder = adapter.onCreateViewHolder(
- new LinearLayout(RuntimeEnvironment.application), 0);
+ ItemViewHolder viewHolder = (ItemViewHolder) adapter.onCreateViewHolder(
+ new LinearLayout(RuntimeEnvironment.application), BaseTimeZoneAdapter.TYPE_ITEM);
adapter.onBindViewHolder(viewHolder, 0);
assertEquals(1, adapter.getItemCount());
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
index c6f5fe6..32975bc 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
@@ -43,4 +43,13 @@
assertThat(timeZoneInfo.getStandardName()).isEqualTo("Pacific Standard Time");
assertThat(timeZoneInfo.getDaylightName()).isEqualTo("Pacific Daylight Time");
}
+
+ @Test
+ public void getGmtOffset_zoneLordHowe_correctGmtOffset() {
+ Date date = new Date(1514764800000L); // 00:00 1/1/2018 GMT
+ Formatter formatter = new Formatter(Locale.US, date);
+
+ TimeZoneInfo timeZoneInfo = formatter.format("Australia/Lord_Howe");
+ assertThat(timeZoneInfo.getGmtOffset().toString()).isEqualTo("GMT+11:00");
+ }
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
index 5d5fb76..a4e0975 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
@@ -123,4 +123,12 @@
verify(mWifiManager).setWifiApConfiguration(captor.capture());
assertThat(captor.getValue().SSID).isEqualTo(TESTING_STRING);
}
+
+ @Test
+ public void displayPreference_defaultDeviceNameIsModelNameOnPreference() {
+ mController.displayPreference(mScreen);
+
+ assertThat(mPreference.getText()).isEqualTo(Build.MODEL);
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index 0c9f313..943bd9d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -16,14 +16,17 @@
package com.android.settings.deviceinfo;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.Activity;
import android.app.usage.StorageStatsManager;
+import android.content.Intent;
import android.icu.text.NumberFormat;
import android.os.storage.VolumeInfo;
import android.text.format.Formatter;
@@ -71,14 +74,14 @@
when(volumeInfo.isMountedReadable()).thenReturn(true);
when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
when(mStorageManagerVolumeProvider
- .getTotalBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
- .thenReturn(500L);
+ .getTotalBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
+ .thenReturn(500L);
when(mStorageManagerVolumeProvider
- .getFreeBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
- .thenReturn(0L);
+ .getFreeBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
+ .thenReturn(0L);
ReflectionHelpers
- .setField(provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
+ .setField(provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
ReflectionHelpers.setField(provider, "mContext", RuntimeEnvironment.application);
provider.setListening(true);
@@ -89,4 +92,14 @@
RuntimeEnvironment.application.getString(
R.string.storage_summary, percentage, freeSpace));
}
+
+ @Test
+ public void handlePublicVolumeClick_startsANonNullActivityWhenVolumeHasNoBrowse() {
+ VolumeInfo volumeInfo = mock(VolumeInfo.class, RETURNS_DEEP_STUBS);
+ when(volumeInfo.isMountedReadable()).thenReturn(true);
+ StorageSettings.handlePublicVolumeClick(mActivity, volumeInfo);
+
+ verify(mActivity, never()).startActivity(null);
+ verify(mActivity).startActivity(any(Intent.class));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index 4d6cab7..d9bc325 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -21,6 +21,8 @@
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_LABEL_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_VALUE_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;
@@ -33,6 +35,7 @@
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -286,4 +289,50 @@
verify(mDialog).setText(EID_INFO_VALUE_ID, eid);
}
+
+ @Test
+ public void initialize_imsRegistered_shouldSetImsRegistrationStateSummaryToRegisterd() {
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(true);
+ when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(true);
+
+ mController.initialize();
+
+ verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID,
+ mContext.getString(R.string.ims_reg_status_registered));
+ }
+
+ @Test
+ public void initialize_imsNotRegistered_shouldSetImsRegistrationStateSummaryToNotRegisterd() {
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(true);
+ when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(false);
+
+ mController.initialize();
+
+ verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID,
+ mContext.getString(R.string.ims_reg_status_not_registered));
+ }
+
+ @Test
+ public void initialize_showImsRegistration_shouldNotRemoveImsRegistrationStateSetting() {
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(true);
+
+ mController.initialize();
+
+ verify(mDialog, never()).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
+ }
+
+ @Test
+ public void initialize_doNotShowImsRegistration_shouldRemoveImsRegistrationStateSetting() {
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(false);
+
+ mController.initialize();
+
+ verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID);
+ verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 38c0d84..122a056 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -57,7 +57,6 @@
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -216,7 +215,6 @@
}
@Test
- @Ignore
public void testClickFiles() {
when(mSvp.findEmulatedForPrivate(nullable(VolumeInfo.class))).thenReturn(mVolume);
when(mVolume.buildBrowseIntent()).thenReturn(new Intent());
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index d06ea2a..e1c4b70 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -17,17 +17,14 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
+
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.search.InlinePayload;
@@ -49,8 +46,6 @@
@Mock
private AmbientDisplayConfiguration mConfig;
- @Mock
- private SwitchPreference mSwitchPreference;
private Context mContext;
@@ -64,95 +59,90 @@
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mContentResolver = mContext.getContentResolver();
- mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig,
- () -> {
- mCallbackInvoked = true;
- });
+ mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, "key");
+ mController.setConfig(mConfig);
+ mController.setCallback(() -> mCallbackInvoked = true);
}
@Test
- public void updateState_enabled() {
+ public void getAvailabilityStatus_available() {
+ when(mConfig.alwaysOnAvailableForUser(anyInt())).thenReturn(true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ AmbientDisplayAlwaysOnPreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_disabled_unsupported() {
+ when(mConfig.alwaysOnAvailableForUser(anyInt())).thenReturn(false);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ AmbientDisplayAlwaysOnPreferenceController.DISABLED_UNSUPPORTED);
+ }
+
+ @Test
+ public void isChecked_enabled() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
- mController.updateState(mSwitchPreference);
-
- verify(mSwitchPreference).setChecked(true);
+ assertThat(mController.isChecked()).isTrue();
}
@Test
- public void updateState_disabled() {
+ public void isChecked_disabled() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
- mController.updateState(mSwitchPreference);
+ assertThat(mController.isChecked()).isFalse();
+ }
- verify(mSwitchPreference).setChecked(false);
+ @Test
+ public void setChecked_enabled() {
+ mController.setChecked(true);
+
+ assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, -1))
+ .isEqualTo(1);
+ }
+
+ @Test
+ public void setChecked_disabled() {
+ mController.setChecked(false);
+
+ assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, -1))
+ .isEqualTo(0);
}
@Test
public void onPreferenceChange_callback() {
assertThat(mCallbackInvoked).isFalse();
- mController.onPreferenceChange(mSwitchPreference, true);
+ mController.setChecked(true);
assertThat(mCallbackInvoked).isTrue();
}
@Test
- public void onPreferenceChange_enable() {
- mController.onPreferenceChange(mSwitchPreference, true);
-
- assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, -1))
- .isEqualTo(1);
- }
-
- @Test
- public void onPreferenceChange_disable() {
- mController.onPreferenceChange(mSwitchPreference, false);
-
- assertThat(Settings.Secure.getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, -1))
- .isEqualTo(0);
- }
-
- @Test
- public void isAvailable_available() {
- mController = spy(mController);
- doReturn(true).when(mController).alwaysOnAvailableForUser(any());
-
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void isAvailable_unavailable() {
- mController = spy(mController);
- doReturn(false).when(mController).alwaysOnAvailableForUser(any());
-
- assertThat(mController.isAvailable()).isFalse();
- }
-
- @Test
public void testPreferenceController_ProperResultPayloadType() {
+ when(mConfig.alwaysOnAvailableForUser(anyInt())).thenReturn(false);
mController = spy(mController);
- doReturn(false).when(mController).alwaysOnAvailableForUser(any());
assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
}
@Test
public void testSetValue_updatesCorrectly() {
+ when(mConfig.alwaysOnAvailableForUser(anyInt())).thenReturn(false);
mController = spy(mController);
- doReturn(false).when(mController).alwaysOnAvailableForUser(any());
final int newValue = 1;
Settings.Secure.putInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, 0 /* value */);
((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
final int updatedValue = Settings.Secure.
- getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, 1 /* default */);
+ getInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, 1 /* default */);
assertThat(updatedValue).isEqualTo(newValue);
}
@Test
public void testGetValue_correctValueReturned() {
+ when(mConfig.alwaysOnAvailableForUser(anyInt())).thenReturn(false);
mController = spy(mController);
- doReturn(false).when(mController).alwaysOnAvailableForUser(any());
final int currentValue = 1;
Settings.Secure.putInt(mContentResolver, Settings.Secure.DOZE_ALWAYS_ON, currentValue);
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java
new file mode 100644
index 0000000..bab5d41
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 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.display;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class AmbientDisplaySettingsTest {
+
+ private TestFragment mTestFragment;
+
+ private Context mContext;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mTestFragment = spy(new TestFragment());
+ }
+
+ @Test
+ public void onAttach_shouldSetConfigAndCallback() {
+ final AmbientDisplayAlwaysOnPreferenceController controller = mock(
+ AmbientDisplayAlwaysOnPreferenceController.class);
+ doReturn(controller).when(mTestFragment).use(
+ AmbientDisplayAlwaysOnPreferenceController.class);
+
+ mTestFragment.onAttach(mContext);
+
+ verify(controller).setConfig(any());
+ verify(controller).setCallback(any());
+ }
+
+ public static class TestFragment extends AmbientDisplaySettings {
+ @Override
+ protected <T extends AbstractPreferenceController> T use(Class<T> clazz) {
+ return super.use(clazz);
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
index e95868a..763276c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
@@ -45,8 +45,6 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- SettingsShadowResources.overrideResource(
- com.android.internal.R.integer.config_lowBatteryWarningLevel, 15);
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = new AutoBatterySaverPreferenceController(mContext);
@@ -87,7 +85,7 @@
}
@Test
- public void testIsChecked_useDefaultValue_returnTrue() {
- assertThat(mController.isChecked()).isTrue();
+ public void testIsChecked_useDefaultValue_returnFalse() {
+ assertThat(mController.isChecked()).isFalse();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
index 63b9742..f696dd5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
@@ -71,11 +71,10 @@
}
@Test
- public void testPreference_defaultValue_preferenceVisible() {
+ public void testPreference_defaultValue_preferenceNotVisible() {
mController.updateState(mPreference);
- assertThat(mPreference.isVisible()).isTrue();
- assertThat(mPreference.getProgress()).isEqualTo(DEFAULT_LEVEL);
+ assertThat(mPreference.isVisible()).isFalse();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index b5d764d..efc20e9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -58,6 +58,7 @@
import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowJobScheduler;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -149,8 +150,9 @@
@Test
public void testSaveAnomalyToDatabase_normalAppWithAutoRestriction_save() {
- mBundle.putStringArray(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES,
- new String[]{SUBSCRIBER_COOKIES_AUTO_RESTRICTION});
+ final ArrayList<String> cookies = new ArrayList<>();
+ cookies.add(SUBSCRIBER_COOKIES_AUTO_RESTRICTION);
+ mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
doReturn(Process.FIRST_APPLICATION_UID).when(
@@ -173,8 +175,9 @@
@Test
public void testSaveAnomalyToDatabase_normalAppWithoutAutoRestriction_save() {
- mBundle.putStringArray(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES,
- new String[]{SUBSCRIBER_COOKIES_NOT_AUTO_RESTRICTION});
+ final ArrayList<String> cookies = new ArrayList<>();
+ cookies.add(SUBSCRIBER_COOKIES_NOT_AUTO_RESTRICTION);
+ mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
doReturn(Process.FIRST_APPLICATION_UID).when(
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index dfcd661..6b8c0f7 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -29,6 +29,8 @@
import android.content.Context;
import android.net.ConnectivityManager;
import android.os.UserManager;
+import android.provider.Settings;
+import android.provider.Settings.Global;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.telephony.PhoneStateListener;
@@ -38,6 +40,8 @@
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsWrapper;
import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -138,4 +142,36 @@
// Carrier name should be set.
verify(mPreference).setSummary(testCarrierName);
}
+
+ @Test
+ public void airplaneModeTurnedOn_shouldDisablePreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Global.AIRPLANE_MODE_ON, 1);
+ mController = spy(new MobileNetworkPreferenceController(mContext));
+ final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void airplaneModeTurnedOffAndNoUserRestriction_shouldEnablePreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Global.AIRPLANE_MODE_ON, 0);
+ mController = spy(new MobileNetworkPreferenceController(mContext));
+ final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+ mPreference.setDisabledByAdmin(null);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void airplaneModeTurnedOffAndHasUserRestriction_shouldDisablePreference() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Global.AIRPLANE_MODE_ON, 0);
+ mController = spy(new MobileNetworkPreferenceController(mContext));
+ final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+ mPreference.setDisabledByAdmin(EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN);
+ mController.updateState(mPreference);
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
new file mode 100644
index 0000000..cb18b5a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2018 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.nfc;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class AndroidBeamPreferenceControllerTest {
+
+ Context mContext;
+ @Mock
+ private NfcAdapter mNfcAdapter;
+ @Mock
+ NfcManager mManager;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private PreferenceScreen mScreen;
+
+ private RestrictedPreference mAndroidBeamPreference;
+ private AndroidBeamPreferenceController mAndroidBeamController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+ when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mManager);
+ when(RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(false);
+ when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
+
+ mAndroidBeamController = new AndroidBeamPreferenceController(mContext);
+ mAndroidBeamPreference = new RestrictedPreference(RuntimeEnvironment.application);
+ when(mScreen.findPreference(mAndroidBeamController.getPreferenceKey())).thenReturn(
+ mAndroidBeamPreference);
+
+ Settings.Global.putString(mContext.getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
+ Settings.Global.RADIO_NFC);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON,
+ 0);
+ mAndroidBeamController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void isAvailable_hasNfc_shouldReturnTrue() {
+ when(mNfcAdapter.isEnabled()).thenReturn(true);
+ assertThat(mAndroidBeamController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_noNfcAdapter_shouldReturnFalse() {
+ ReflectionHelpers.setField(mAndroidBeamController, "mNfcAdapter", null);
+ assertThat(mAndroidBeamController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isBeamEnable_disAllowBeam_shouldReturnFalse() {
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+
+ when(RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(true);
+ mAndroidBeamController.displayPreference(mScreen);
+
+ assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void isBeamEnable_nfcStateOn_shouldReturnTrue() {
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_ON);
+ try {
+ mAndroidBeamController.onResume();
+ } catch (NullPointerException e) {
+ // skip because it's just test
+ // it will meet NullPointerException in checkRestrictionAndSetDisabled
+ }
+ assertThat(mAndroidBeamPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void isBeamEnable_nfcStateNotOn_shouldReturnFalse() {
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+ mAndroidBeamController.onResume();
+ assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
+
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_ON);
+ mAndroidBeamController.onResume();
+ assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
+
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_OFF);
+ mAndroidBeamController.onResume();
+ assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
new file mode 100644
index 0000000..cd90820
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2018 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.nfc;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.nfc.NfcAdapter;
+import android.nfc.NfcManager;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class NfcPreferenceControllerTest {
+
+ Context mContext;
+ @Mock
+ private NfcAdapter mNfcAdapter;
+ @Mock
+ NfcManager mManager;
+ @Mock
+ private UserManager mUserManager;
+ @Mock
+ private PreferenceScreen mScreen;
+
+ private SwitchPreference mNfcPreference;
+ private NfcPreferenceController mNfcController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+
+ when(mContext.getApplicationContext()).thenReturn(mContext);
+ when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mManager);
+ when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
+
+ mNfcController = new NfcPreferenceController(mContext);
+ mNfcPreference = new SwitchPreference(RuntimeEnvironment.application);
+ when(mScreen.findPreference(mNfcController.getPreferenceKey())).thenReturn(mNfcPreference);
+
+ Settings.Global.putString(mContext.getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
+ Settings.Global.RADIO_NFC);
+
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.AIRPLANE_MODE_ON,
+ 0);
+ mNfcController.displayPreference(mScreen);
+ }
+
+ @Test
+ public void isAvailable_hasNfc_shouldReturnTrue() {
+ when(mNfcAdapter.isEnabled()).thenReturn(true);
+ assertThat(mNfcController.isAvailable()).isTrue();
+ }
+
+ @Test
+ public void isAvailable_noNfcAdapter_shouldReturnFalse() {
+ ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);
+ assertThat(mNfcController.isAvailable()).isFalse();
+ }
+
+ @Test
+ public void isNfcEnable_nfcStateNotTurning_shouldReturnTrue() {
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_ON);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isEnabled()).isTrue();
+
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void isNfcEnable_nfcStateTurning_shouldReturnFalse() {
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_ON);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isEnabled()).isFalse();
+
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_OFF);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void isNfcChecked_nfcStateOn_shouldReturnTrue() {
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_ON);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isChecked()).isTrue();
+
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_ON);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void isNfcChecked_nfcStateOff_shouldReturnFalse() {
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isChecked()).isFalse();
+
+ when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_OFF);
+ mNfcController.onResume();
+ assertThat(mNfcPreference.isChecked()).isFalse();
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java b/tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java
new file mode 100644
index 0000000..f6f5d43
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/inputmethods/DataSaverSummaryUITest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2018 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.ui.inputmethods;
+
+import static com.android.settings.ui.testutils.SettingsTestUtils.TIMEOUT;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DataSaverSummaryUITest {
+
+ private Instrumentation mInstrumentation;
+ private Intent mIntent;
+ private UiDevice mUiDevice;
+
+ @Before
+ public void setUp() {
+ mInstrumentation = InstrumentationRegistry.getInstrumentation();
+ mUiDevice = UiDevice.getInstance(mInstrumentation);
+ mIntent = new Intent().setClassName("com.android.settings",
+ "com.android.settings.Settings$DataUsageSummaryLegacyActivity")
+ .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ }
+
+ @Test
+ public void launchSettings_hasSwitchBar() throws Exception {
+ launchDataSaverSettings();
+ final UiObject2 switchBar =
+ mUiDevice.wait(Until.findObject(By.text("Use Data Saver")), TIMEOUT);
+
+ assertThat(switchBar).isNotNull();
+ }
+
+ private void launchDataSaverSettings() throws InterruptedException {
+ mInstrumentation.getContext().startActivity(mIntent);
+ final UiObject2 prefDataSaver =
+ mUiDevice.wait(Until.findObject(By.text("Data Saver")), TIMEOUT);
+
+ assertThat(prefDataSaver).isNotNull();
+ prefDataSaver.click();
+ Thread.sleep(TIMEOUT * 2);
+ }
+}