Merge "Directly show the layout selection screen."
diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml
index 0d857df..d9f71ae 100644
--- a/res/layout/admin_support_details_dialog.xml
+++ b/res/layout/admin_support_details_dialog.xml
@@ -24,7 +24,7 @@
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingBottom="@dimen/admin_details_dialog_padding">
- <ImageView
+ <ImageView android:id="@+id/admin_support_icon"
android:layout_width="@dimen/admin_details_dialog_icon_size"
android:layout_height="@dimen/admin_details_dialog_icon_size"
android:src="@drawable/ic_settings_lock_outline"
@@ -46,25 +46,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
- <TextView android:id="@+id/disabled_by_admin_msg"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorSecondary" />
<TextView android:id="@+id/admin_support_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+ android:text="@string/default_admin_support_msg"
+ android:maxLength="200"
+ android:autoLink="email|phone"
android:textColor="?android:attr/textColorSecondary" />
<TextView android:id="@+id/admins_policies_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/admin_details_dialog_link_padding_top"
- android:text="@string/list_of_administrators"
+ android:text="@string/admin_support_more_info"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"
android:textColor="?android:attr/colorAccent"
android:clickable="true"
android:background="?android:attr/selectableItemBackground" />
</LinearLayout>
</ScrollView>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index 9109440..e79f8d5 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -15,15 +15,14 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/category"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="@dimen/dashboard_category_padding_start"
- android:paddingEnd="@dimen/dashboard_category_padding_end"
- android:orientation="vertical"
- android:paddingBottom="8dip"
- android:background="@color/card_background"
- android:elevation="@dimen/dashboard_category_elevation" >
+ android:id="@+id/category"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dashboard_category_height"
+ android:paddingStart="@dimen/dashboard_category_padding_start"
+ android:paddingEnd="@dimen/dashboard_category_padding_end"
+ android:orientation="vertical"
+ android:paddingBottom="8dip"
+ android:background="@color/card_background" >
<View
android:layout_width="match_parent"
@@ -31,14 +30,14 @@
android:background="?android:attr/listDivider" />
<TextView android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dashboard_category_title_height"
- android:paddingStart="@dimen/dashboard_category_title_margin_start"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:gravity="center_vertical"
- android:textAppearance="@style/TextAppearance.CategoryTitle"
- android:textAlignment="viewStart"
- />
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingStart="@dimen/dashboard_category_title_margin_start"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:gravity="center_vertical"
+ android:textAppearance="@style/TextAppearance.CategoryTitle"
+ android:textAlignment="viewStart"
+ />
</LinearLayout>
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index cc237ee..cd7c8ee 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -21,8 +21,7 @@
android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true"
- android:background="@drawable/selectable_card"
- android:elevation="@dimen/dashboard_category_elevation" >
+ android:background="@drawable/selectable_card" >
<ImageView
android:id="@android:id/icon"
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 25b7f01..4e8a6ac 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -100,8 +100,10 @@
<TextView android:id="@+id/admin_warning"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_weight="1"
android:padding="10dip" />
+
<LinearLayout android:id="@+id/admin_policies"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -109,6 +111,13 @@
android:orientation="vertical"
android:paddingStart="16dip"
android:paddingEnd="12dip" />
+
+ <TextView android:id="@+id/admin_support_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:autoLink="email|phone"
+ android:padding="10dip" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/preference_button.xml b/res/layout/preference_button.xml
new file mode 100644
index 0000000..35e4255
--- /dev/null
+++ b/res/layout/preference_button.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+
+<!-- Layout for a ButtonPreference. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/accessibility_button_preference_padding_top_bottom"
+ android:paddingTop="@dimen/accessibility_button_preference_padding_top_bottom"
+ android:paddingStart="@dimen/accessibility_layout_margin_start_end"
+ android:paddingEnd="@dimen/accessibility_layout_margin_start_end"
+ android:focusable="true"
+ android:selectable="false"
+ android:persistent="false" >
+
+ <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+android:id/title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:selectable="true"
+ android:persistent="false"
+ android:gravity="left|center" />
+
+ <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+android:id/summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:selectable="true"
+ android:persistent="false"
+ android:gravity="left|center" />
+
+</LinearLayout>
diff --git a/res/layout/search_panel_results_header.xml b/res/layout/search_panel_results_header.xml
index 7b3f198..2deb273 100644
--- a/res/layout/search_panel_results_header.xml
+++ b/res/layout/search_panel_results_header.xml
@@ -16,7 +16,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="@dimen/dashboard_category_title_height"
+ android:layout_height="@dimen/dashboard_category_height"
android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
android:ellipsize="marquee"
diff --git a/res/layout/search_panel_suggestions_header.xml b/res/layout/search_panel_suggestions_header.xml
index d97c3cc..98957e4 100644
--- a/res/layout/search_panel_suggestions_header.xml
+++ b/res/layout/search_panel_suggestions_header.xml
@@ -16,7 +16,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="@dimen/dashboard_category_title_height"
+ android:layout_height="@dimen/dashboard_category_height"
android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
android:ellipsize="marquee"
diff --git a/res/layout/see_all.xml b/res/layout/see_all.xml
index fff4d07..af68036 100644
--- a/res/layout/see_all.xml
+++ b/res/layout/see_all.xml
@@ -21,8 +21,7 @@
android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height"
android:clickable="true"
- android:background="@drawable/selectable_card"
- android:elevation="@dimen/dashboard_category_elevation">
+ android:background="@drawable/selectable_card">
<View
android:layout_width="@dimen/dashboard_tile_image_size"
diff --git a/res/layout/suggestion_header.xml b/res/layout/suggestion_header.xml
new file mode 100644
index 0000000..512c53a
--- /dev/null
+++ b/res/layout/suggestion_header.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dashboard_category_height"
+ android:clickable="true"
+ android:background="@drawable/selectable_card"
+ android:elevation="@dimen/dashboard_category_elevation"
+ android:gravity="center_vertical" >
+
+ <TextView android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="@dimen/suggestion_arrow_margin"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.TileTitle"
+ android:textColor="?android:attr/colorAccent"
+ android:alpha=".87"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <ImageView android:id="@android:id/icon"
+ android:layout_width="@dimen/dashboard_tile_image_size"
+ android:layout_height="@dimen/dashboard_tile_image_size"
+ android:layout_marginStart="@dimen/suggestion_arrow_margin"
+ android:layout_marginEnd="@dimen/suggestion_arrow_margin"
+ android:src="@drawable/ic_expand_more" />
+
+</LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
new file mode 100644
index 0000000..0b5e652
--- /dev/null
+++ b/res/layout/suggestion_tile.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:background="@drawable/selectable_card"
+ android:elevation="@dimen/dashboard_category_elevation"
+ android:orientation="vertical" >
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?android:attr/listDivider" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/dashboard_tile_minimum_height">
+
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="@dimen/dashboard_tile_image_size"
+ android:layout_height="@dimen/dashboard_tile_image_size"
+ android:scaleType="centerInside"
+ android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+ android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1">
+
+ <TextView android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.TileTitle"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@android:id/summary"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="@style/TextAppearance.Small"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ </RelativeLayout>
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent">
+
+ <ImageView android:id="@+id/overflow"
+ android:layout_width="44dp"
+ android:layout_height="44dp"
+ android:paddingStart="16dp"
+ android:paddingBottom="16dp"
+ android:paddingTop="12dp"
+ android:paddingEnd="12dp"
+ android:gravity="top"
+ style="?android:attr/actionOverflowButtonStyle" />
+
+ </FrameLayout>
+
+ </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index faa28c0..ef59656 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, op die huidige skerm opspring of verskyn"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Geen kennisgewinglig"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, die lig laat flikker"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Moet die skerm nooit aanskakel nie"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"As die skerm af is, keer dat kennisgewings wat deur Moenie steur nie stilgemaak is, dit aanskakel"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
<string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Voer administrateur-PIN in"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index cf94965..57ecc33 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"በአትረብሽ ዝም እንዲሉ የተደረጉ ማሳወቂያዎች አሁን ባለው ማያ ገጽ ላይ ጥልቅ ወይም ብቅ እንዳይሉ ተከላከል"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"ምንም ማሳወቂያ ብርሃን የለም"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"በአትረብሽ ዝም እንዲሉ የተደረጉ ማሳወቂያዎች ብርሃኑ እንዲርገበገብ እንዳያደርጉ ተከላከል"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"ማያ ገጹን በጭራሽ አታብራ"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"ማያ ገጹ ከጠፋ በ«አትረብሽ» የተሰናከሉ ማሳወቂያዎች እንዳያበሩት ይከልኳቸው"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
<string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"የአስተዳዳሪ ፒን ያስገቡ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bdd36e7..af678ec 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -2459,8 +2459,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"عادي: عرض هذه الإشعارات بدون تنبيه صوتي"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"عالي الأهمية: عرض بأعلى قائمة الإشعارات مع إصدار تنبيه صوتي"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"عاجل: الظهور سريعًا على الشاشة مع إصدار تنبيه صوتي"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"مساعد الإشعار"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"الدخول إلى الإشعارات"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"لا يُمكن للتطبيقات قراءة الإشعارات"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2566,6 +2565,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"منع الإشعارات التي يتم تجاهلها باستخدام إعداد \"الرجاء عدم الإزعاج\" من الظهور بشكل موجز أو بالكامل على الشاشة الحالية"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"تعطيل مصباح الإشعار"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"منع الإشعارات التي يتم تجاهلها باستخدام إعداد \"الرجاء عدم الإزعاج\" من إحداث وميض للمصباح"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"عدم تشغيل الشاشة مطلقًا"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"منع الإشعارات التي يتم كتم صوتها باستخدام إعداد \"الرجاء عدم الإزعاج\" من تشغيل الشاشة إذا كانت الشاشة في وضع الإيقاف"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
<string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"أدخل رقم التعريف الشخصي للمشرف"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 355013b..6010db9 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Baxışlardakı Narahat Etməyin vasitəsilə və ya cari ekranda görünən ilə səssiz edilmiş bildirişlərin qarşısını alın"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Bildiriş işığı yoxdur"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"İşığın yanıb sönməsinə səbəb olan Narahat Etməyin ilə səssiz edilmiş bildirişlərin qarşısını alın"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Ekranı heç vaxt yandırmayın"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Ekran yanmadıqda, ekranın yanmasına səbəb olan Narahat Etməyin ilə səssiz edilmiş bildirişlərin qarşısını alın"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Bildiriş ayarları"</string>
<string name="device_feedback" msgid="3238056036766293294">"Bu cihaz haqqında fikrinizi bildirin"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administrator PIN kodunu daxil edin"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 8ac9f25..50d4d91 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -2417,8 +2417,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Uobičajena: Ova obaveštenja se prikazuju bez zvuka"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Velika: Prikazuju se u vrhu liste obaveštenja i emituje se zvuk"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Hitna: Nakratko se prikazuju na ekranu i emituje se zvuk"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obaveštenja"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obaveštenjima"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu da čitaju obaveštenja"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2515,6 +2514,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Sprečava da se na aktuelnom ekranu prikazuju obaveštenja koja su isključena režimom Ne uznemiravaj"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Bez svetla za obaveštenja"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Sprečava da svetlo treperi za obaveštenja koja su isključena režimom Ne uznemiravaj"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Podešavanja obaveštenja"</string>
<string name="device_feedback" msgid="3238056036766293294">"Šalji povratne informacije o uređaju"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Unesite PIN administratora"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a8aa76e..b056e2c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Нормално: Тези известия да се показват без звуков сигнал"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Важно: Показване в горната част на списъка с известия и издаване на звуков сигнал"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Спешно: Показване на екрана и издаване на звуков сигнал"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Помощник за известия"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Достъп до известията"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложенията не могат да четат известията"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Известията, блокирани чрез „Не безпокойте“, няма да се показват мимолетно или трайно на текущия екран"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Без извест. светлина"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Известията, блокирани чрез „Не безпокойте“, няма да задействат пулсиращата светлина"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
<string name="device_feedback" msgid="3238056036766293294">"Отзиви за устройството"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Въведете администраторския ПИН код"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index e01f47a..a168806 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"সাধারন: এই বিজ্ঞপ্তিগুলি নিঃশব্দে দেখানো হয়"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"উচ্চ: বিজ্ঞপ্তি তালিকার শীর্ষে দেখানো হয় এবং শব্দ করে"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"জরুরি: স্ক্রীনের উপরে প্রদর্শিত হয় এবং শব্দ করে"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"বিজ্ঞপ্তি সহায়ক"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"বিজ্ঞপ্তির অ্যাক্সেস"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"অ্যাপ্লিকেশানগুলি বিজ্ঞপ্তি পড়তে পারে না"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"\'বিরক্ত করবেন না\' এর দ্বারা নীরব করা আটকানো বিজ্ঞপ্তিগুলির কারণে বর্তমান স্ক্রীনে উঁকি মারে বা উপস্থিত হয়"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"কোনো বিজ্ঞপ্তি আলো নেই"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"\'বিরক্ত করবেন না\' এর দ্বারা নীরব করা আটকানো বিজ্ঞপ্তিগুলির কারণে লাইটটি জ্বলে ও নেভে"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"বিজ্ঞপ্তির সেটিংস"</string>
<string name="device_feedback" msgid="3238056036766293294">"এই ডিভাইসের সম্পর্কে মতামত পাঠান"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"প্রশাসক পিন লিখুন"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f0bc5ea..fb31c5c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedeix que les notificacions silenciades pel mode No molesteu apareguin a la pantalla"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Cap llum notificació"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedeix que les notificacions silenciades pel mode No molesteu activin el llum"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
<string name="device_feedback" msgid="3238056036766293294">"Envia suggeriments sobre el dispositiu"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introdueix el PIN d\'administrador"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4505cf9..e75dd56 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -2531,6 +2531,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Zabránit, aby se v režimu Nerušit zobrazovala oznámení v rychlém náhledu nebo na aktuální obrazovce"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Kontrolka vypnuta"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Zabránit, aby v režimu Nerušit po doručení oznámení začala blikat kontrolka"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Nikdy nezapínat obrazovku"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Zabránit, aby oznámení potlačená režimem Nerušit zapnula obrazovku, pokud je obrazovka vypnutá."</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
<string name="device_feedback" msgid="3238056036766293294">"Odeslat zpětnou vazbu o tomto zařízení"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Zadejte PIN administrátora"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9eab6a5..c5f02a2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normal: Vis disse underretninger lydløst"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Høj: Vis øverst på listen over underretninger, og giv lyd"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Presserende: Vis på skærmen, og giv lyd"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Underretningsassistent"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Adgang til underretninger"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps kan ikke læse underretninger"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Undgå, at underretninger, der er lydløse, når Forstyr ikke er slået til, vises på den aktuelle skærm"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Intet underretningslys"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Undgå, at underretninger, der er lydløse, når Forstyr ikke er slået til, får lyset til at blinke"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Tænd aldrig skærmen"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Undgå, at underretninger, der er lydløse, når Forstyr ikke er slået til, tænder skærmen, hvis den er slukket."</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Indtast administratorpinkoden"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f54b964..e8af42a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -2404,8 +2404,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normal: Benachrichtigungen ohne Ton anzeigen"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Hoch: Benachrichtigungen ganz oben in der Benachrichtigungsliste und mit Ton anzeigen"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Dringend: Mit Ton auf dem Display einblenden"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Benachrichtigungsassistent"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Benachrichtigungszugriff"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps können keine Benachrichtigungen lesen."</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2499,6 +2498,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Kein Erscheinen von Benachrichtigungen auf dem aktuellen Bildschirm, die mittels \"Bitte nicht stören\" stummgeschaltet wurden"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Keine Benachrichtigungsleuchte"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Kein Pulsieren der Leuchte bei mittels \"Bitte nicht stören\" stummgeschalteten Benachrichtigungen"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
<string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administrator-PIN eingeben"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5913f47..da49342 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Αποτρέπει τη σύντομη προβολή ή την εμφάνιση ειδοποιήσεων που έχουν τεθεί σε σίγαση από τη λειτουργία \"Μην ενοχλείτε\""</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Όχι φως ειδοποίησης"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Αποτρέπει την ενεργοποίηση της φωτεινής ένδειξης από τις ειδοποιήσεις που έχουν τεθεί σε σίγαση από τη λειτουργία \"Μην ενοχλείτε\""</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Να μην ενεργοποιείται ποτέ η οθόνη"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Εάν η οθόνη είναι απενεργοποιημένη, να αποτρέπεται η ενεργοποίησή της από ειδοποιήσεις σε σίγαση από τη λειτουργία \"Μην ενοχλείτε\""</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
<string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Εισαγάγετε κωδικό PIN διαχειριστή"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 839ddde..e4d103e 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"No notification light"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Prevent notifications silenced by Do Not Disturb from causing the light to pulse"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Enter administrator PIN"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 839ddde..e4d103e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"No notification light"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Prevent notifications silenced by Do Not Disturb from causing the light to pulse"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Enter administrator PIN"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 839ddde..e4d103e 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Prevent notifications silenced by Do Not Disturb from peeking or appearing on the current screen"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"No notification light"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Prevent notifications silenced by Do Not Disturb from causing the light to pulse"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Enter administrator PIN"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7fc01cc..f8eacc1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normal: mostrar estas notificaciones sin emitir sonido"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Alta: mostrar en la parte superior de la lista de notificaciones y emitir sonido"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Urgente: mostrar en la pantalla y emitir sonido"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Las aplicaciones no pueden leer las notificaciones."</string>
<!-- String.format failed for translation -->
@@ -2496,6 +2495,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Previene que las notificaciones silenciadas por \"No molestar\" se visualicen o aparezcan en la pantalla"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Sin luz de notificación"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Previene que las notificaciones silenciadas por el modo \"No molestar\" emitan luz"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
<string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ingresar PIN de administrador"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5c9f6a7..0ea07f1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedir que las notificaciones silenciadas por el modo No molestar aparezcan en la pantalla actual"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Sin luz de notificación"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedir que las notificaciones silenciadas por el modo No molestar activen la luz"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"No activar la pantalla"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Si la pantalla está desactivada, impide que las notificaciones silenciadas por el modo No molestar activen este modo"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
<string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduce el PIN del administrador"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 978dbe2..b23f44f 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Keelab režiimiga „Mitte segada” vaigistatud märguannete piilumise või praegusel ekraanil kuvamise"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Märguandetuld pole"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Keelab režiimiga „Mitte segada” vaigistatud märguannetel tuld vilgutada"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Ära kunagi lülita ekraani sisse"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Kui ekraan on välja lülitatud, ei lubata funktsiooniga „Mitte segada” vaigistatud märguannetel seda sisse lülitada"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
<string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administraatori PIN-koodi sisestamine"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 0c1a001..559efd7 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normala: erakutsi jakinarazpen hauek, baina soinurik egin gabe"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Handia: erakutsi jakinarazpen hauek zerrendaren goialdean eta egin soinua"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Premiazkoa: agerrarazi jakinarazpen hauek pantailan eta egin soinua"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Jakinarazpenen laguntzailea"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Jakinarazpenetarako sarbidea"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikazioek ezin dituzte jakinarazpenak irakurri"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Eragotzi \"Ez molestatu\" moduan isilarazitako jakinarazpenak pantailan agertzea"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Abisu-argirik ez"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Eragotzi \"Ez molestatu\" moduan isilarazitako jakinarazpenek argi keinukaria aktibatzea"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Jakinarazpen-ezarpenak"</string>
<string name="device_feedback" msgid="3238056036766293294">"Bidali gailu honi buruzko iritzia"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Idatzi administratzailearen PINa"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 04bb040..baf264d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"عادی: این اعلانها بدون صدا نشان داده شود"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"بالا: در بالای فهرست اعلانها و به همراه صدا نشان داده شود"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"ضروری: نمای کلی به همراه صدا در صفحه نشان داده شود"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"دستیار اعلان"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"دسترسی به اعلان"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"برنامهها نمیتوانند اعلانها را بخوانند"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"مانع از آن میشود که اعلانهای بیصدا شده با «مزاحم نشوید» در صفحه فعلی ظاهر شوند"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"بدون چراغ اعلان"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"مانع از آن میشود که اعلانهای بیصدا شده با «مزاحم نشوید» باعث چشمک زدن چراغ شوند"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
<string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"پین سرپرست را وارد کنید"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index a293bea..096844f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Tavallinen: näytä nämä ilmoitukset huomaamattomasti."</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Korkea: näytä nämä ilmoitukset luettelon yläosassa ja toista äänimerkki."</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Kiireellinen: näytä nämä ilmoitukset näytöllä ja toista äänimerkki."</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Ilmoitusapuri"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Pääsy ilmoituksiin"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Sovellukset eivät voi lukea ilmoituksia"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Estä Älä häiritse -tilan hiljentämiä ilmoituksia kurkistamasta tai näkymästä näytöllä."</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Ei merkkivaloa"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Estä Älä häiritse -tilan hiljentämiä ilmoituksia näyttämästä vilkkuvaa valoa."</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
<string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Anna järjestelmänvalvojan PIN-koodi"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 55b8075..f82bf85 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normale : afficher ces notifications en mode silencieux"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Élevée : afficher en haut de la liste des notifications et émettre un son"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Urgent : afficher sur l\'écran et émettre un son"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Assistant des notifications"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Empêcher les notifications désactivées par le mode Ne pas déranger de s\'afficher à l\'écran actuel"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Aucune témoin de notification"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Empêcher les notifications désactivées par le mode Ne pas déranger de faire clignoter le voyant"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
<string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Entrez le NIP d\'administrateur"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fb5d941..64c22f0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normale : afficher ces notifications en mode silencieux"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Élevée : afficher en haut de la liste des notifications et émettre un son"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Urgente : afficher sur l\'écran et émettre un son"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Assistant de notifications"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux notifications"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Empêcher les notifications désactivées par le mode Ne pas déranger de s\'afficher brièvement ou durablement sur l\'écran actuel"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Aucun voyant notif."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Empêcher les notifications désactivées par le mode Ne pas déranger de faire clignoter le voyant"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
<string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Saisir le code d\'accès d\'administrateur"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index af9fd9a..2f0cdc1 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Evita que as notificacións silenciadas pola función Non molestar se asomen ou aparezan na pantalla actual"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Non hai ningunha luz de notificación"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Evita que as notificacións silenciadas pola función Non molestar fagan que se acenda a luz"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Non activar nunca a pantalla"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Se a pantalla está desactivada, evita que as notificacións silenciadas pola función Non molestar activen este modo"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración das notificacións"</string>
<string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios do dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduce o PIN de administrador"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 829ccdb..134276f 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -2499,6 +2499,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"ખલેલ પાડશો નહિ દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને વર્તમાન સ્ક્રીન પર દેખાતાં અથવા પિક થતાં અટકાવો"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"કોઈ સૂચના લાઇટ નથી"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"ખલેલ પાડશો નહિ દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને કારણે લાઇટને ધબકતી અટકાવો"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"સ્ક્રીનને ક્યારેય ચાલુ કરશો નહીં"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"જો સ્ક્રીન બંધ હોય, તો ખલેલ પાડશો નહીં દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને તેને ચાલુ કરવાથી અટકાવો"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"સૂચનાઓની સેટિંગ્સ"</string>
<string name="device_feedback" msgid="3238056036766293294">"આ ઉપકરણ વિશે પ્રતિસાદ મોકલો"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"વ્યવસ્થાપક PIN દાખલ કરો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 39c71b3..890705a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"सामान्य: ये नोटिफिकेशन मौन रूप से दिखाएं"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"उच्च: नोटिफिकेशन सूची के शीर्ष पर दिखाएं और ध्वनि करें"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"तत्काल: स्क्रीन पर एक झलक देखें और ध्वनि करें"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"नोटिफिकेशन सहायक"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"एक्सेस नोटिफिकेशन"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप्स नोटिफिकेशन नहीं पढ़ सकते"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"परेशान ना करें द्वारा मौन किए गए नोटिफिकेशन को वर्तमान स्क्रीन पर तांक-झांक करने या दिखाई देने से रोकें"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"नोटिफिकेशन रोशनी नहीं"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"परेशान ना करें द्वारा मौन किए गए नोटिफिकेशन को रोशनी करने से रोकें"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"स्क्रीन को कभी चालू नहीं करें"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"यदि स्क्रीन बंद है, तो परेशान न करें द्वारा मौन किए गए नोटिफिकेशन उसे चालू होने से रोकते हैं"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"नोटिफिकेशन सेटिंग"</string>
<string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"व्यवस्थापक पिन डालें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index fce2c2b..08b7bc7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -2417,8 +2417,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Uobičajeno: prikazuj te obavijesti tiho"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Visoko: prikaži na vrhu popisa obavijesti i emitiraj zvučni signal"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Hitno: prikaži na zaslonu i emitiraj zvučni signal"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obavijesti"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavijestima"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu čitati obavijesti"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2515,6 +2514,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Sprječava da se obavijesti utišane opcijom Ne ometaj pojavljuju na trenutačnom zaslonu"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Bez svjetla obav."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Sprječava pulsiranje svjetla za obavijesti utišane opcijom Ne ometaj"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
<string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Unesite PIN administratora"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 04f80a0..46276ad 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"A „Ne zavarjanak” funkció által elnémított értesítések ne jelenjenek meg részben vagy teljesen az aktuális képernyőn"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Nincs értesítőfény"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"A „Ne zavarjanak” funkció által elnémított értesítések ne aktiválhassák az értesítőfényt"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Soha ne kapcsoljon be a képernyő"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Ha a képernyő ki van kapcsolva, a „Ne zavarjanak” funkció által elnémított értesítések ne aktiválhassák."</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
<string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Rendszergazdai PIN-kód megadása"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index e2b7e1c..13431c5 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Նորմալ. Ցուցադրել այս ծանուցումներն առանց ձայնային ազդանշանի"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Բարձր. Ցուցադրել ծանուցումների ցանկի վերևում և հնչեցնել ձայնային ազդանշան"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Հրատապ. Ցուցադրել էկրանին և հնչեցնել ձայնային ազդանշան"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Ծանուցումների օգնական"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Մուտք ծանուցումներին"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ծրագրիը չի կարող կարդալ ծանուցումները"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել դիտել ընթացիկ էկրանը կամ հայտնվել այնտեղ"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Անջատել ծանուցման լույսը"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել գործարկել լույսի թարթումը"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
<string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Մուտքագրեք կառավարչի PIN-ը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 7fe8836..0a885ef 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normal: Menampilkan notifikasi ini secara diam-diam"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Tinggi: Menampilkan di bagian atas daftar notifikasi dan membunyikan suara"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Darurat: Muncul di layar dan membunyikan suara"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Asisten notifikasi"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Akses notifikasi"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikasi tidak dapat membaca notifikasi"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Mencegah notifikasi yang dibisukan oleh mode Jangan Ganggu agar tidak diintip atau muncul di layar saat ini"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Tanpa lampu notifikasi"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Mencegah notifikasi yang dibisukan oleh mode Jangan Ganggu agar lampu tidak berkedip"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan notifikasi"</string>
<string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Masukkan PIN administrator"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 35db76a..6d35dc6 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Venjulegar: Sýna þessar tilkynningar án hljóðs"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Mikilvægar: Sýna efst á tilkynningalistanum og spila hljóð"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Áríðandi: Birta á skjánum og spila hljóð"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Tilkynningaaðstoð"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Tilkynningaaðgangur"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Forrit geta ekki lesið tilkynningar"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Koma í veg fyrir að tilkynningar birtist á skjánum þegar þær eru þaggaðar með „Ónáðið ekki“"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Ekkert tilkynningaljós"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Koma í veg fyrir að tilkynningaljós blikki þegar tilkynningar eru þaggaðar með „Ónáðið ekki“"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Tilkynningastillingar"</string>
<string name="device_feedback" msgid="3238056036766293294">"Senda ábendingar um þetta tæki"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Sláðu inn PIN-númer stjórnanda"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1e47797..aa86c9c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Disattiva visualizzazione di notifiche con modalità \"Non disturbare\" attiva in schermata corrente"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Luce notifica off"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Disattiva luce pulsante per notifiche con modalità \"Non disturbare\" attiva"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Non attivare mai lo schermo"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Se lo schermo è disattivato, non attivarlo in presenza di notifiche con modalità \"Non disturbare\""</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
<string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Inserisci PIN amministratore"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c38474a..a2e0764 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -2433,8 +2433,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"רגילה: הצג את ההודעות האלה בלי להשמיע צליל"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"גבוהה: הצג בראש רשימת ההודעות והשמע צליל"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"דחופה: הצג לרגע על המסך והשמע צליל"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"אסיסטנט ההודעות"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"גישה אל הודעות"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא התראות"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2534,6 +2533,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"מנע הצצה או הופעה של הודעות שהושתקו במצב \'נא לא להפריע\' במסך הנוכחי"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"ללא תאורת התראה"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"מנע את הבהוב האור שנגרם על ידי הודעות שהושתקו במצב \'נא לא להפריע\'"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
<string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"הזן את מספר ה-PIN של מנהל המערכת"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a8c242a..63b2903 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -2409,8 +2409,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"標準: この通知をマナーモードで表示する"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"高: 通知リストの上に表示し、音声でも知らせる"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"緊急: 画面にプレビューを表示し、音声でも知らせる"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"通知アシスタント"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"通知へのアクセス"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"アプリは通知を読み取ることができません"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2504,6 +2503,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"[通知を非表示] でサイレントに設定した通知を受信したときに画面にプレビューまたは表示されなくなります"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"光を点滅しない"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"[通知を非表示] でサイレントに設定した通知を受信したときに光が点滅しなくなります"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
<string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"管理者PINを入力"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 01c6377..9d7919d 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"ნორმალური: ეს შეტყობინებები უხმოდ გამოჩნდება"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"მაღალი: ეს შეტყობინებები სიის თავში, ხმოვან სიგნალთან ერთად გამოჩნდება"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"გადაუდებელი: შეტყობინებები პირდაპირ ეკრანზე, ხმოვან სიგნალთან ერთად გამოჩნდება"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"შეტყობინებათა ასისტენტი"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"შეტყობინებებზე წვდომა"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"აპები ვერ კითხულობს შეტყობინებებს"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"„არ შემაწუხოთ“-ის მეშვეობით დადუმებული შეტყობინებებისთვის მიმდინარე ეკრანზე გამოჩენის აღკვეთა"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"სინათლის ინდიკატორის გარეშე"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"„არ შემაწუხოთ“-ის მეშვეობით დადუმებული შეტყობინებებისთვის სინათლის ინდიკატორის გამოყენების აღკვეთა"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
<string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"შეიყვანეთ ადმინისტრატორის PIN"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 236b4a5..75bcde9 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Қалыпты: осы хабарландыруларды үнсіз көрсету"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Жоғары: хабарландырулар тізімінің жоғарғы жағында көрсету және дыбыс шығару"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Шұғыл: экранға бекіту және дыбыс шығару"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Хабарландыру көмекшісі"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Хабарландыруға кіру мүмкіндігі"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Қолданбалар хабарларды оқи алмайды."</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"\"Мазаламау\" арқылы үнсіз етілген хабарландырулардың ағымдағы экранда қысқа уақытқа көрінуін немесе көрінуін болдырмау"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Хабарландыру жарығы жоқ"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"\"Мазаламау\" арқылы үнсіз етілген хабарландырулардың жарықты жыпылықтатуын болдырмау"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Хабарландыру параметрлері"</string>
<string name="device_feedback" msgid="3238056036766293294">"Осы құрылғы туралы пікір жіберу"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Әкімші PIN кодын енгізу"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index dae93c5..d2c4c3c 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"ធម្មតា៖ បង្ហាញការជូនដំណឹងទាំងនេះស្ងាត់ៗ"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"កម្រិតខ្ពស់៖ បង្ហាញនៅផ្នែកខាងលើបញ្ជីនៃការជូនដំណឹង និងបន្លឺសំឡេង"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"បន្ទាន់៖ លោតបង្ហាញនៅលើអេក្រង់ និងបន្លឺសំឡេង"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"ជំនួយការជូនដំណឹង"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"ចូលដំណើរការការជូនដំណឹង"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"កម្មវិធីមិនអាចអានការជូនដំណឹង"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"ទប់ស្កាត់ការជូនដំណឹងដែលធ្វើឲ្យស្ងាត់ដោយ កុំរំខាន មិនឲ្យលោតឡើង ឬបង្ហាញលើអេក្រង់បច្ចុប្បន្ន"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"គ្មានភ្លើងការជូនដំណឹង"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"ទប់ស្កាត់ការជូនដំណឹងដែលធ្វើឲ្យស្ងាត់ដោយ កុំរំខាន មិនឲ្យបញ្ចេញពន្លឺភ្លឹបភ្លេត"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"កំណត់ការជូនដំណឹង"</string>
<string name="device_feedback" msgid="3238056036766293294">"ផ្ដល់មតិស្ថាបនាអំពីឧបករណ៍នេះ"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"បញ្ចូលកូដ PIN របស់អ្នកគ្រប់គ្រង"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index b14b590..05bc082 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"ಪ್ರಸ್ತುತ ಪರದೆಯಲ್ಲಿ ಇಣುಕು ನೋಟ ಅಥವಾ ಗೋಚರಿಸುವುದರಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"ಅಧಿಸೂಚನೆ ಲೈಟ್ ಇಲ್ಲ"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"ಪಲ್ಸ್ಗೆ ಕಾರಣವಾಗುವ ಲೈಟ್ನಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದ ಮಾಡಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"ಎಂದಿಗೂ ಪರದೆಯನ್ನು ಆನ್ ಮಾಡಬೇಡಿ"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"ಒಂದು ವೇಳೆ ಪರದೆಯು ಆಫ್ ಆಗಿದ್ದರೆ, ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಆನ್ ಮಾಡುವ ಮೂಲಕ ನಿಶ್ಯಬ್ದಗೊಳಿಸಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="device_feedback" msgid="3238056036766293294">"ಈ ಸಾಧನದ ಕುರಿತು ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"ನಿರ್ವಾಹಕರ ಪಿನ್ ನಮೂದಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 6be6c09..6bb6f9d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"일반: 무음으로 알림 표시"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"높음: 알림 목록 상단에 표시하고 소리로 알림"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"긴급: 화면에 표시하고 소리로 알림"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"알림 어시스턴트"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"알림 액세스"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"앱에서 알림을 읽을 수 없습니다."</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"알림 일시중지로 인해 무음 처리된 알림이 현재 화면에 표시되지 않도록 함"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"알림등 없음"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"알림 일시중지로 인해 무음 처리된 알림이 빛을 내는 대신 진동으로 변환되지 않도록 함"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
<string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"관리자 PIN 입력"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 9e2aa62..11e0e4e 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Кадимки: Бул эскертмелер үнсүз көрсөтүлсүн"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Жогору: Эскертмелер тизмесинин башында үн чыгарып көрсөтүлсүн"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Шашылыш: Үн менен коштолуп, экранга чыгарылсын"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Эскертме жардамчысы"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмени колдонуу мүмкүнчлгү"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Колдонмолор эскертмелерди окуй алышпайт"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"\"Тынчымды албагыла\" режиминде эскертмелер тууралуу маалымат экранда көрүнбөйт"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Эскертме жарыгы жок"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"\"Тынчымды албагыла\" режиминде бөгөттөлгөн эскертмелер алынганда жарык индикатору өчүп-күйбөйт."</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
<string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Администратор PIN\'ин киргиңиз"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 586ed16..f6a652e 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"ປົກກະຕິ: ສະແດງການແຈ້ງເຕືອນເຫຼົ່ານີ້ແບບບໍ່ມີສຽງ"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"ສູງ: ສະແດງຢູ່ສ່ວນເທິງຂອງລາຍການແຈ້ງເຕືອນ ແລະສົ່ງສຽງດັງ"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"ດ່ວນ: ເດັ້ງຂຶ້ນເທິງຫນ້າຈໍ ແລະສົ່ງສຽງດັງ"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"ຕົວຊ່ວຍການແຈ້ງເຕືອນ"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"ການເຂົ້າເຖິງການແຈ້ງເຕືອນ"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ແອັບຯບໍ່ສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"ປ້ອງກັນການແຈ້ງເຕືອນທີ່ເຮັດໃຫ້ມິດງຽບໂດຍ ຢ່າລົບກວນ ບໍ່ໃຫ້ສະແດງ ຫຼືປາກົດຂຶ້ນເທິງໜ້າຈໍປະຈຸບັນ"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"ບໍ່ມີໄຟແຈ້ງເຕືອນ"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"ປ້ອງກັນການແຈ້ງເຕືອນທີ່ເຮັດໃຫ້ມິດງຽບໂດຍ ຢ່າລົບກວນ ບໍ່ໃຫ້ມີໄຟສັນຍານກະພິບ"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string>
<string name="device_feedback" msgid="3238056036766293294">"ສົ່ງຄຳຕິຊົມກ່ຽວກັບອຸປະກອນນີ້"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"ໃສ່ PIN ຜູ່ເບິ່ງແຍງລະບົບ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6155399..1174c2c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -2431,8 +2431,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Įprasta: tyliai rodyti šiuos pranešimus"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Didelė: rodyti pranešimų sąrašo viršuje ir skambėti"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Skubu: rodyti ekrane ir skambėti"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Pranešimų pagelbiklis"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Prieiga prie pranešimų"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programos negali skaityti pranešimų"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2532,6 +2531,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Neleisti, kad gavus praneš., nutildytų naud. rež. „Netrukdyti“, jie būtų rodomi dabart. ekrane"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Nėra praneš. lemp."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Neleisti, kad lemputė pulsuotų gavus praneš., nutildytų naud. rež. „Netrukdyti“"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
<string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Įveskite administratoriaus PIN kodą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index a19150b..9781660 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -2417,8 +2417,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Parasts: rādīt šos paziņojumus bez skaņas signāla"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Svarīgs: rādīt paziņojumu saraksta augšdaļā un ar skaņas signālu"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Steidzami: rādīt ekrānā ar skaņas signālu"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Paziņojumu palīgs"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Piekļuve paziņojumiem"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Lietotnēs nevar lasīt paziņojumus."</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2515,6 +2514,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Novērst tādu paziņojumu rādīšanu pašreizējā ekrānā, kas izslēgti, izmantojot režīmu “Netraucēt”"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Bez paz. indikatora"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Novērst gaismas mirgošanu paziņojumiem, kas izslēgti, izmantojot režīmu “Netraucēt”"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
<string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administratora PIN ievadīšana"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 79c38fb..0e31d24 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Спречи ги известувањата стишени од „Не вознемирувај“ од ѕиркање или појавување на тековниот екран"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Без светло за извес."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Спречи ги известувањата стишени од „Не вознемирувај“ да предизвикуваат треперење на светлото"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Никогаш не вклучувај го екранот"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Доколку екранот е исклучен, спречете ги известувања стишени од „Не вознемирувај“ да го вклучат"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Поставки на известувања"</string>
<string name="device_feedback" msgid="3238056036766293294">"Испрати информации за уредот"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Внеси ПИН на администратор"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 510d5c1..db13fcc 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"നിലവിലെ സ്ക്രീനിൽ എത്തിനോക്കുന്നതിൽ നിന്നോ പ്രത്യക്ഷപ്പെടുന്നതിൽ നിന്നോ, \'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്ദമാക്കപ്പെടുന്ന അറിയിപ്പുകളെ തടയുക"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"അറിയിപ്പ് വെളിച്ചമില്ല"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"തുടിപ്പായി വെളിച്ചം മാറുന്നതിൽ നിന്ന്, \'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്ദമാക്കപ്പെടുന്ന അറിയിപ്പുകളെ തടയുക"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
<string name="device_feedback" msgid="3238056036766293294">"ഇതേക്കുറിച്ചുള്ള ഫീഡ്ബാക്ക് അയയ്ക്കൂ"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"അഡ്മിനിസ്ട്രേറ്റർ പിൻ നൽകുക"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index f07f956..87e5d27 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -2393,8 +2393,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Ердийн: Эдгээр мэдэгдлийг дуугүй харуулах"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Өндөр: Мэдэгдлийг жагсаалтын эхэнд дуутай харуулах"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Яаралтай: Дэлгэцэнд яаралтайгаар дуутай гаргах"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Мэдэгдлийн туслагч"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Мэдэгдлийн хандалт"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апп-ууд мэдэгдлийг уншиж чадахгүй"</string>
<!-- String.format failed for translation -->
@@ -2486,6 +2485,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"\"Бүү саад бол\"-оос хаасан мэдэгдлийг гэнэт гарч ирэх, дэлгэцэнд харагдахаас сэргийлэх"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Мэдэгдлийн гэрэл байхгүй"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"\"Бүү саад бол\"-оос хаасан мэдэгдлийг гэрэл тасалдуулахаас хамгаалах"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
<string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Админ PIN оруулна уу"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 88dba7e..83aaabe 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"व्यत्यय आणू नका द्वारे न दिसणार्या सूचनांना विद्यमान स्क्रीनवर दिसण्यापासून प्रतिबंधित करा"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"सूचना प्रकाश नाही"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"व्यत्यय आणू नका द्वारे न दिसणार्या ज्या सूचनांमुळे प्रकाशाची उघडझाप होते त्यांना प्रतिबंधित करा"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"स्क्रीन कधीही चालू करू नका"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"स्क्रीन बंद असल्यास, व्यत्यय आणू नका द्वारे न दिसणार्या सूचनेस चालू होण्यास प्रतिबंधित करा"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
<string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"प्रशासक पिन प्रविष्ट करा"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 8860700..eda6b84 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Biasa: Tunjukkan pemberitahuan ini secara senyap"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Tinggi: Tunjukkan pada bahagian atas senarai pemberitahuan dan bunyikan"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Segera: Intai pada skrin dan bunyikan"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Pembantu pemberitahuan"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Akses pemberitahuan"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apl tidak boleh membaca pemberitahuan"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Halang pemberitahuan yang disenyapkan oleh Jangan Ganggu daripada muncul atau dipaparkan pada skrin semasa"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Tiada lampu pemberitahuan"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Halang pemberitahuan yang disenyapkan oleh Jangan Ganggu daripada menyebabkan lampu berdenyut"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
<string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Masukkan PIN pentadbir"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index c19421f..844b747 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"လက်ရှိမျက်နှာပြင်တွင် အသိပေးချက် မိတ်တုတ်မိတ်တုတ်ဖြစ်ခြင်း သို့မဟုတ် ပေါ်လာခြင်းကို Do Not Disturb မှတိတ်ဆိတ်ခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"အသိပေးချက်အလင်း မရှိပါ"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"အသိပေးချက် အလင်း မိတ်တုတ်မိတ်တုတ်ဖြစ်ခြင်းကို Do Not Disturb မှတိတ်ဆိတ်ခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
<string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"စီမံအုပ်ချုပ်သူ PIN ကို ရိုက်ထည့်ရန်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 31b9f64..2af13b0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normalt: Vis disse varslene uten lyd"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Høyt: Vis øverst i varsellisten med lyd"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Haster: Vis fort på skjermen med lyd"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Varselassistent"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Varseltilgang"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apper kan ikke lese varsler"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Unngå at varsler som er dempet når «Ikke forstyrr»-modusen er slått på, vises på skjermen"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Ikke noe varsellys"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Unngå at varsler som er dempet når «Ikke forstyrr»-modusen er slått på, får lyset til å blinke"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
<string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Skriv inn administrator-PIN-koden"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 2c0f9c5..c5fa12f 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"हालको स्क्रिनमा झलक देखाउने वा देखापर्नबाट बाधा नपुर्याउनुहोस् मार्फत मौन गरिएका सूचनाहरू रोक्नुहोस्"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"कुनै सूचना प्रकाश छैन"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"पल्समा प्रकाशको कारणबाट बाधा नपुर्याउनुहोस् मार्फत मौन गरिएको सूचनाहरू रोक्नुहोस्"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"स्क्रिनलाई कहिल्यै अन नगर्नुहोस्"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"स्क्रिन बन्द छ भने, बाधा नुपर्याउनुहोस् द्वारा आवाजविहीन बनाइएका सूचनाहरूलाई अन गर्नबाट रोक्नुहोस्"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिङहरू"</string>
<string name="device_feedback" msgid="3238056036766293294">"उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"प्रशासक PIN प्रविष्ट गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9a88153..8643dd1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Voorkomen dat meldingen die op stil zijn gezet door \'Niet storen\', op het huidige scherm verschijnen"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Geen meldingslampje"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Voorkomen dat meldingen die op stil zijn gezet door \'Niet storen\', het lampje laten knipperen"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Het scherm nooit inschakelen"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Voorkomen dat meldingen die op stil zijn gezet door \'Niet storen\', het scherm inschakelen als het scherm is uitgeschakeld"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
<string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Pincode voor beheerder opgeven"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 2fd36d1..c19bc08 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਦੁਆਰਾ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਮੌਜੂਦਾ ਸਕਰੀਨ \'ਤੇ ਝਲਕਣ ਅਤੇ ਵਿਖਾਈ ਦੇਣ ਤੋਂ ਰੋਕੋ"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"ਕੋਈ ਸੂਚਨਾ ਬੱਤੀ ਨਹੀਂ"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਦੁਆਰਾ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬੱਤੀ ਨੂੰ ਜਗਮਗਾਉਣ ਤੋਂ ਰੋਕੋ"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"ਸਕ੍ਰੀਨ ਨੂੰ ਕਦੇ ਵੀ ਚਾਲੂ ਨਾ ਕਰੋ"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"ਜੇਕਰ ਸਕ੍ਰੀਨ ਬੰਦ ਹੈ, ਤਾਂ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਦੁਆਰਾ ਚੁੱਪ ਕਰਵਾਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਰੋਕਦੀ ਹੈ।"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ"</string>
<string name="device_feedback" msgid="3238056036766293294">"ਇਸ ਡਿਵਾਈਸ ਬਾਰੇ ਫੀਡਬੈਕ ਭੇਜੋ"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"ਪ੍ਰਬੰਧਕ PIN ਦਰਜ ਕਰੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ea6937c..42f84d2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -2431,8 +2431,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normalna: pokazuj te powiadomienia bez sygnału dźwiękowego"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Wysoka: pokazuj na początku listy powiadomień i odtwarzaj dźwięk"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Pilna: wyświetlaj na ekranie i odtwarzaj dźwięk"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Asystent powiadomień"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Dostęp do powiadomień"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacje nie mogą odczytywać powiadomień"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2532,6 +2531,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Powiadomienia wyciszone w trybie Nie przeszkadzać nie będą pojawiać się w szybkim podglądzie ani na bieżącym ekranie"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Bez diody powiadomień"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Powiadomienia wyciszone w trybie Nie przeszkadzać nie będą sygnalizowane diodą"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Nigdy nie włączaj ekranu"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Jeśli ekran jest wyłączony, nie będą go włączać powiadomienia wyciszone przez funkcję Nie przeszkadzać."</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
<string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Podaj PIN administratora"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ffd7e67..edf8a28 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela atual"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Sem luz de notif."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedir que notifficações silenciadas pelo modo \"Não perturbe\" façam a luz pulsar"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
<string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Inserir PIN do administrador"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2aec9be..3871478 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normal: mostrar estas notificações sem som"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Elevado: mostrar na parte superior da lista de notificações com som"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Urgente: mostrar no ecrã com som"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificações"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicações não podem ler notificações"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Evitar que as notificações silenciadas pelo modo Não incomodar surjam no ecrã atual"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Sem luz de notific."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Evitar que as notif. silenc. pelo modo Não incomodar ativem a luz de forma intermitente"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Nunca ligar o ecrã"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Se o ecrã estiver desligado, evitar que as notificações silenciadas pelo modo Não incomodar liguem o ecrã"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
<string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduzir o PIN de administrador"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index ffd7e67..edf8a28 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Impedir que notificações silenciadas pelo modo \"Não perturbe\" sejam exibidas na tela atual"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Sem luz de notif."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Impedir que notifficações silenciadas pelo modo \"Não perturbe\" façam a luz pulsar"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
<string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Inserir PIN do administrador"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 512b585..10cea61 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -2418,8 +2418,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normală: aceste notificări se afișează fără a se emite un sunet"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Ridicată: se afișează în partea de sus a listei cu notificări și se emite un sunet"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Urgente: se afișează pentru o scurtă durată pe ecran și se emite un sunet"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent pentru notificări"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Acces la notificări"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplicațiile nu pot citi notificările"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2516,6 +2515,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Împiedicați afișarea de scurtă durată sau pe ecranul actual a notificărilor dezactivate prin Nu deranja"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Nicio lumină de notificare"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Împiedicați lumina intermitentă de la notificările dezactivate prin Nu deranja"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
<string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Introduceți codul PIN de administrator"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6c9d92e..5e48978 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -2431,8 +2431,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Обычная: показывать без звука"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Высокая: показывать со звуком в начале списка уведомлений"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Срочно: показывать со звуковым сигналом поверх всех окон"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Настройка уведомлений"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ к уведомлениям"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложения не могут просматривать уведомления"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2532,6 +2531,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Не показывать на экране уведомления, отключенные в режиме \"Не беспокоить\"."</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Без свет. индикатора"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Не включать световой индикатор для уведомлений, отключенных в режиме \"Не беспокоить\"."</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
<string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Введите PIN-код администратора"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 899cdfa..eba0763 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -2405,8 +2405,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"සාමාන්ය: නිශ්ශබ්දව මෙම දැනුම්දීම් පෙන්වන්න"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"වැඩි: දැනුම්දීම් ලැයිස්තුවෙහි ඉහළින්ම පෙන්වන්න සහ ශබ්ද කරන්න"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"හදිසි: තිරයට පැමිණ ශබ්ද කරන්න"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"දැනුම්දීම් සහායක"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"දැනුම්දීම් ප්රවේශනය"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"යෙදුම්වලට දැනුම් දීම් කියවිය නොහැක"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2500,6 +2499,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"වත්මන් තිරය මත පෙනී සිටීමෙන් හෝ දිස් වීමෙන් බාධා නොකරන්න වෙතින් දැනුම්දීම් නිහඬ වීම වළක්වන්න"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"දැනුම්දීම් ආලෝකය නැත"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"ආලෝකය ස්පන්දනය වීමෙන් බාධා නොකරන්න වෙතින් දැනුම්දීම් නිහඬ වීම වළක්වන්න"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"දැනුම්දීම් සැකසීම්"</string>
<string name="device_feedback" msgid="3238056036766293294">"මෙම උපාංගය පිළිබඳ ප්රතිපෝෂණ යවන්න"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"පරිපාලකයාගේ PIN එක ඇතුළ් කරන්න"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a18686d..0cc4fd6 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -2431,8 +2431,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normálne: Tieto upozornenia zobrazovať bez zvukového signálu"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Vysoké: Zobrazovať v hornej časti zoznamu upozornení so zvukovým signálom"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Neodkladné: Zobraziť cez obrazovku so zvukovým signálom"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent upozornení"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Prístup k upozorneniam"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikácie nesmú čítať upozornenia"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2532,6 +2531,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Zabráňte, aby sa upozornenia stlmené nastavením Nerušiť čiastočne alebo úplne zobrazovali na aktuálnej obrazovke"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Žiadne svetlo upoz."</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Zabráňte, aby upozornenia stlmené nastavením Nerušiť nespúšťali blikajúce svetlo"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
<string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú väzbu o zariadení"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Zadajte číslo PIN správcu"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2c90fd2..4b579ed 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -2431,8 +2431,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Običajno: prikaži ta obvestila brez zvoka"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Pomembno: prikaži na vrhu seznama obvestil in predvajaj zvok"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Nujno: za hip pokaži predogled na zaslonu in predvajaj zvok"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Pomočnik za obvestila"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Dostop do obvestil"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne morejo brati obvestil"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2532,6 +2531,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Preprečevanje, da bi si bilo mogoče obvestila, utišana z načinom »ne moti«, ogledati s kukanjem, ali da bi se prikazala na trenutnem zaslonu"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Brez lučke za obvestila"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Preprečevanje, da bi obvestila, utišana z načinom »ne moti«, povzročila utripanje lučke"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
<string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Vnesite skrbniški PIN"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 89338da..b2c6e37 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Mos lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të duken ose të shfaqen në ekranin aktual"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Asnjë dritë njoftimi"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Mos lejo që njoftimet e vendosura në heshtje nga \"Mos shqetëso\" të bëjnë që drita të pulsojë"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Mos e aktivizo asnjëherë ekranin"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Nëse ekrani është joaktiv, parandalo aktivizimin e tij nga njoftimet e vendosura në heshtje nga funksioni \"Mos shqetëso\""</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Cilësimet e njoftimeve"</string>
<string name="device_feedback" msgid="3238056036766293294">"Dërgo përshtypjet për këtë pajisje"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Fut kodin PIN të administratorit"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5dccd26..d45f3b1 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -2417,8 +2417,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Уобичајена: Ова обавештења се приказују без звука"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Велика: Приказују се у врху листе обавештења и емитује се звук"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Хитна: Накратко се приказују на екрану и емитује се звук"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Помоћник за обавештења"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Приступ обавештењима"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апликације не могу да читају обавештења"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2515,6 +2514,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Спречава да се на актуелном екрану приказују обавештења која су искључена режимом Не узнемиравај"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Без светла за обавештења"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Спречава да светло трепери за обавештења која су искључена режимом Не узнемиравај"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
<string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Унесите PIN администратора"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3ccb667..05ad6aa 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Hindra att aviseringar visas på den aktuella skärmen när du har aktiverat tysta aviseringar via läget Stör ej"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Ingen ljusavisering"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Hindra att aviseringslampan blinkar när du har aktiverat tysta aviseringar via läget Stör ej"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
<string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enheten"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ange administratörspinkod"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index d3c2b49..3ec25b0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -2409,8 +2409,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Kawaida: Onyesha arifa hizi bila sauti"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Juu: Onyesha katika sehemu ya juu ya orodha ya arifa na itoe sauti"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Dharura: Weka onyesho la kuchungulia kwenye skrini na itoe sauti"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Mratibu wa arifa"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Kufikia arifa"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programu haziwezi kusoma arifa"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2504,6 +2503,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Zuia arifa zilizozimwa sauti kwa Usinisumbue zisichungulie au kuonekana kwenye skrini ya sasa"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Hakuna mwangaza wa arifa"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Zuia arifa zilizozimwa sauti kwa Usinisumbue zisisababishe mwangaza uonekane"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
<string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ingiza PIN ya msimamizi"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 3ba8b52..6ee62c2 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -2497,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"தொந்தரவு செய்ய வேண்டாம் என்பதை அமைக்கும் போது, அறிவிப்புகள் தற்போதைய திரையில் குறுக்கிடுவது அல்லது தோன்றுவது முடக்கப்படும்."</string>
<string name="zen_mode_lights" msgid="904184586121619154">"அறிவிப்பு லைட் வேண்டாம்"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"தொந்தரவு செய்ய வேண்டாம் என்பதை அமைக்கும் போது, அறிவிப்புகள் வரும் போது ஒளிர்வது முடக்கப்படும்."</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
<string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"நிர்வாகி பின்னை உள்ளிடவும்"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index c62428a..03b06b3 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -2497,6 +2497,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"అంతరాయం కలిగించవద్దు సేవ ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్లు ప్రస్తుత స్క్రీన్పై చూపకుండా లేదా కనిపించకుండా నిరోధిస్తుంది"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"నోటిఫికేషన్ లైట్ వద్దు"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"అంతరాయం కలిగించవద్దు సేవ ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్ల కోసం లైట్ వెలగకుండా నిరోధిస్తుంది"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"ఎప్పటికీ స్క్రీన్ను ఆన్ చేయవద్దు"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"స్క్రీన్ ఆఫ్లో ఉంటే, అంతరాయం కలిగించవద్దు లక్షణం ద్వారా నిశ్శబ్దం చేయబడిన నోటిఫికేషన్లు స్క్రీన్ను ఆన్ చేయనీయకుండా నిరోధిస్తుంది"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"నోటిఫికేషన్ సెట్టింగ్లు"</string>
<string name="device_feedback" msgid="3238056036766293294">"ఈ పరికరం గురించి అభిప్రాయం పంపండి"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"నిర్వాహకుని పిన్ను నమోదు చేయండి"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 92a65a7..77335da 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"ปกติ: แสดงการแจ้งเตือนเหล่านี้โดยไม่ส่งเสียง"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"สูง: แสดงที่ด้านบนของรายการแจ้งเตือนและส่งเสียง"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"ด่วน: แสดงบนหน้าจอในช่วงเวลาสั้นๆ และส่งเสียง"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"ผู้ช่วยการแจ้งเตือน"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"การเข้าถึงการแจ้งเตือน"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"แอปไม่สามารถอ่านการแจ้งเตือน"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"ป้องกันการแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" ไม่ให้แจ้งหรือแสดงบนหน้าจอปัจจุบัน"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"ไม่มีไฟแจ้งเตือน"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"ป้องกันการแจ้งเตือนที่ปิดเสียงโดย \"ห้ามรบกวน\" ไม่ให้กะพริบไฟ"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
<string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"ป้อน PIN ของผู้ดูแลระบบ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 2d21e2e..5b6a6ca 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Mahalaga: Tahimik na ipakita ang mga notification na ito"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Napakahalaga: Ipakita sa itaas ng listahan ng mga notification at mag-play ng tunog"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Mahalagang-mahalaga: Ipasilip sa screen at mag-play ng tunog"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Assistant para sa notification"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Access sa notification"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Hindi makakapagbasa ng mga notification ang mga app"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Pigilang sumilip o lumabas sa kasalukuyang screen ang notification na pinatahimik sa pamamagitan ng Huwag Istorbohin"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Walang notification light"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Pigilang mapatay-sindi ng notification na pinatahimik sa pamamagitan ng Huwag Istorbohin ang ilaw"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
<string name="device_feedback" msgid="3238056036766293294">"Feedback tungkol sa device"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ilagay ang PIN ng administrator"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 7a418cd..20d650e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Normal: Bu bildirimleri sessizce göster"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Yüksek: Bildirim listesinin üstünde göster ve ses çıkar"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Acil: Ekrana getir ve ses çıkar"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Bildirim yardımcısı"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirim erişimi"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Uygulamalar bildirimleri okuyamaz"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Rahatsız Etmeyin ayarıyla sessize alınan bildirimlerin ekranda gizlice belirmesini veya görünmesini engelle"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Bildirim ışığı yok"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Rahatsız Etmeyin ayarıyla sessize alınan bildirimlerin yanıp sönen ışık göstermesini engelle"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
<string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Yönetici PIN\'ini girin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f908252..b3e6522 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -2531,6 +2531,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Не виводити на поточний екран сповіщення, для яких вибрано режим \"Не турбувати\""</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Без індикатора"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Не вмикати індикатор сповіщень, для яких вибрано режим \"Не турбувати\""</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Не вмикати екран"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Екран не вмикатиметься, коли надходитимуть сповіщення в режимі \"Не турбувати\""</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
<string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Ввести PIN-код адміністратора"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 3a7235d..574325c 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"عام: خاموشی سے یہ اطلاعات دکھائیں"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"اعلی: اطلاعات کی فہرست پر سب سے اوپر دکھائیں اور آواز چلائیں"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"ارجنٹ: اسکرین پر دکھائیں اور آواز چلائیں"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"اطلاع کا معاون"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"اطلاع تک رسائی"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ایپس اطلاعات نہیں پڑھ سکتی ہیں"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"\'تنگ مت کریں\' کی جانب سے خاموش کردہ اطلاعات کو موجودہ اسکرین پر جھانکنے یا ظاہر ہونے سے روکیں"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"کوئی اطلاعی روشنی نہیں"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"\'تنگ مت کریں\' کی جانب سے خاموش کردہ اطلاعات کو روشنی جھپکنے سے روکیں"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"اطلاع کی ترتیبات"</string>
<string name="device_feedback" msgid="3238056036766293294">"اس آلہ کے بارے میں تاثرات بھیجیں"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"منتظم کا PIN درج کریں"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 906d981..3611f94 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Odatiy: bu bildirishnomalar ovozsiz ko‘rsatilsin"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Yuqori: bildirishnomalar ro‘yxatining boshida ovoz bilan ko‘rsatilsin"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Shoshilinch: barcha oynalar ustida signal ovozi bilan ko‘rsatilsin"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Bildirishnoma yordamchisi"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirishnomalarga kirish"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ilovalar bildirishnomalarni ko‘ra olmaydi"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"“Bezovta qilinmasin” funksiyasi orqali ovozsiz qilingan bildirishnomalarning hozirgi ekranda ko‘rsatilishining oldini olish"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Bildirishnoma indikatorisiz"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"“Bezovta qilinmasin” funksiyasi orqali ovozsiz qilingan bildirishnomalarning yoritkichli indikatori ishlashining oldini olish"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirishnoma sozlamalari"</string>
<string name="device_feedback" msgid="3238056036766293294">"Qurilma haqida fikr-mulohaza"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Administrator PIN kodini kiriting"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e9d8003f..9d2ebc5 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -2403,8 +2403,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"Bình thường: Hiển thị im lặng các thông báo này"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"Cao: Hiển thị ở đầu danh sách thông báo và phát ra âm thanh"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"Khẩn cấp: Hiển thị trên màn hình và phát ra âm thanh"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"Trợ lý thông báo"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"Truy cập thông báo"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ứng dụng không thể đọc thông báo"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2498,6 +2497,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Ngăn thông báo được tắt tiếng bằng tính năng Không làm phiền lướt qua hay xuất hiện trên màn hình hiện tại"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Không có đèn thông báo"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Ngăn thông báo được tắt tiếng bằng tính năng Không làm phiền khiến ánh sáng xung"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
<string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Nhập mã PIN của quản trị viên"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index bc6b6ae..f655537 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -2498,6 +2498,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"禁止在勿扰模式下被静音的通知在当前屏幕上短暂弹出或持续显示"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"停用通知指示灯"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"禁止在勿扰模式下被静音的通知让指示灯亮起"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
<string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"输入管理员PIN码"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 12bacc1..47bf83a 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -2408,8 +2408,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"一般：顯示這些通知但不發出音效"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"高：在通知清單頂部顯示並發出音效"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"緊急：不時於螢幕出現並發出音效"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"通知小幫手"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2503,6 +2502,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"防止已啟用「請勿騷擾」的通知在目前的螢幕出現"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"停用通知燈"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"防止已啟用「請勿騷擾」的通知令通知燈閃爍"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
<string name="device_feedback" msgid="3238056036766293294">"傳送您對這部裝置的意見"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"輸入管理員 PIN"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ff2dbb6..1c4402a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -2407,8 +2407,7 @@
<string name="notification_importance_default" msgid="4924370061477615318">"一般：顯示這些通知，但不發出任何音效"</string>
<string name="notification_importance_high" msgid="1918112760912803959">"高：顯示在通知清單頂端並發出音效"</string>
<string name="notification_importance_max" msgid="5501185277889361261">"緊急：短暫顯示在螢幕上並發出音效"</string>
- <!-- no translation found for default_notification_assistant (7631945224761430146) -->
- <skip />
+ <string name="default_notification_assistant" msgid="7631945224761430146">"通知小幫手"</string>
<string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2502,6 +2501,10 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"禁止「零打擾」模式設為靜音的通知在目前的畫面上短暫或持續顯示"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"禁止使用指示燈號"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"禁止「零打擾」模式設為靜音的通知使用指示燈號"</string>
+ <!-- no translation found for zen_mode_screen_on (200863707448412727) -->
+ <skip />
+ <!-- no translation found for zen_mode_screen_on_summary (5397223499131913528) -->
+ <skip />
<string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
<string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"輸入管理員 PIN"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 468f556..290e225 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -2504,6 +2504,8 @@
<string name="zen_mode_peek_summary" msgid="27622220787132681">"Gwema izaziso ezithuliswe ukungaphazamisi kusuka ekukhetheni noma ekubonakaleni esikrinini samanje"</string>
<string name="zen_mode_lights" msgid="904184586121619154">"Asikho isibani sesaziso"</string>
<string name="zen_mode_lights_summary" msgid="6953305086643633530">"Gwema izaziso ezithuliswe ukungaphazamisi kusuka ekubangeleni isibani ukuthi sishaye"</string>
+ <string name="zen_mode_screen_on" msgid="200863707448412727">"Ungalokothi uvule isikrini"</string>
+ <string name="zen_mode_screen_on_summary" msgid="5397223499131913528">"Uma isikrini sivaliwe, vimbela izaziso ezithuliswe Ngokungaphazamisi kusukela ekusivuleni"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
<string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
<string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Faka i-PIN yomlawuli"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 539dc05..f7c3437 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -103,8 +103,8 @@
<!-- Dashboard category panel elevation -->
<dimen name="dashboard_category_elevation">2dp</dimen>
- <!-- Dashboard category title layout height -->
- <dimen name="dashboard_category_title_height">48dp</dimen>
+ <!-- Dashboard category layout height -->
+ <dimen name="dashboard_category_height">48dp</dimen>
<!-- Dashboard category title margin start -->
<dimen name="dashboard_category_title_margin_start">16dp</dimen>
@@ -119,6 +119,8 @@
<dimen name="dashboard_tile_image_margin_start">16dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
+ <dimen name="suggestion_arrow_margin">16dp</dimen>
+
<!-- SwitchBar margin start / end -->
<dimen name="switchbar_margin_start">16dp</dimen>
<dimen name="switchbar_margin_end">16dp</dimen>
@@ -264,4 +266,8 @@
<!-- Display, Screen zoom -->
<dimen name="screen_zoom_preview_height">240dp</dimen>
+
+ <!-- Accessibility Settings -->
+ <dimen name="accessibility_layout_margin_start_end">24dp</dimen>
+ <dimen name="accessibility_button_preference_padding_top_bottom">18dp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 86a6195..5aea3f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3623,6 +3623,8 @@
<string name="accessibility_settings">Accessibility</string>
<!-- Settings title for accessibility settings screen -->
<string name="accessibility_settings_title">Accessibility settings</string>
+ <!-- Settings title for a brief version of Accessibility Settings, as displayed in Setup Wizard -->
+ <string name="accessibility_settings_for_setup_wizard_title">Guide me</string>
<!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
<string name="accessibility_services_title">Services</string>
<!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
@@ -3634,7 +3636,7 @@
<!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
<string name="accessibility_screen_magnification_title">Magnification gestures</string>
<!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
- <string name="accessibility_screen_magnification_summary">When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n<ul><li>Pan: Drag two or more fingers across the screen.</li>\n<li>Adjust zoom level: Pinch two or more fingers together or spread them apart.</li></ul>\n\nYou can also temporarily magnify what\u2019s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar.</string>
+ <string name="accessibility_screen_magnification_summary">Zoom in and out by triple-tapping the screen with one finger.\n\nWhile zoomed in, you can:\n<ul><li>Pan: Drag two or more fingers across the screen.</li>\n<li>Adjust zoom level: Pinch two or more fingers together or spread them apart.</li>\n<li>Temporariliy magnify: Triple-tap, hold, and drag your finger to explore different parts of the screen. Lift your finger to return to our previous state.</li></ul>\n\nTriple-tap for magnification works everywhere except the keyboard and navigation bar.</string>
<!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
<string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string>
<!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
@@ -3841,6 +3843,15 @@
<!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
<string name="print_settings">Printing</string>
+
+ <!-- Summary in settings screen [CHAR LIMIT=25] -->
+ <plurals name="print_settings_title">
+ <item quantity="one">1 print job</item>
+ <item quantity="other">%d print jobs</item>
+ </plurals>
+
+ <string name="print_settings_title"><xliff:g id="printJonCount">%1$s</xliff:g> print job</string>
+
<!-- Title for print service settings screen [CHAR LIMIT=25] -->
<string name="print_settings_title">Print services</string>
@@ -4435,7 +4446,6 @@
<!-- Message when there are no available device admins to display -->
<string name="no_device_admins">No available device administrators</string>
<!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
- <string name="managed_profile_device_admin_info">To stop <xliff:g id="app_name">%1$s</xliff:g> from accessing your work profile, remove the profile under Settings > Accounts</string>
<!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
<string name="personal_device_admin_title">Personal</string>
<!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
@@ -5130,8 +5140,12 @@
<!-- User details remove user menu [CHAR LIMIT=20] -->
<string name="user_remove_user_menu">Delete <xliff:g id="user_name">%1$s</xliff:g> from this device</string>
- <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
- <string name="user_add_on_lockscreen_menu">Add users when device is locked</string>
+ <!-- User lock screen settings header[CHAR LIMIT=40] -->
+ <string name="user_lockscreen_settings">Lock screen settings</string>
+ <!-- User settings item to allow creating new users from locks creen [CHAR LIMIT=40] -->
+ <string name="user_add_on_lockscreen_menu">Add users</string>
+ <!-- User settings user_add_on_lockscreen_menu item summary [CHAR LIMIT=40] -->
+ <string name="user_add_on_lockscreen_menu_summary">when device is locked</string>
<!-- User details new user name [CHAR LIMIT=30] -->
<string name="user_new_user_name">New user</string>
<!-- User details new restricted profile name [CHAR LIMIT=30] -->
@@ -5991,6 +6005,12 @@
<!-- [CHAR LIMIT=105] Zen mode settings: No notification light summary -->
<string name="zen_mode_lights_summary">Prevent notifications silenced by Do Not Disturb from causing the light to pulse</string>
+ <!-- [CHAR LIMIT=40] Zen mode settings: Don't turn the screen on option -->
+ <string name="zen_mode_screen_on">Never turn on the screen</string>
+
+ <!-- [CHAR LIMIT=130] Zen mode settings: Don't turn the screen on summary -->
+ <string name="zen_mode_screen_on_summary">If the screen is off, prevent notifications silenced by Do Not Disturb from turning it on</string>
+
<!-- [CHAR LIMIT=NONE] Content description for per-app notification
settings button -->
<string name="notification_app_settings_button">Notification settings</string>
@@ -6706,11 +6726,18 @@
<string name="about_summary">Android <xliff:g id="version" example="6.0">%1$s</xliff:g></string>
<!-- TODO: Update these strings with the finalized ones. -->
+ <!-- Title for dialog displayed when user clicks on a setting locked by an admin [CHAR LIMIT=30] -->
<string name="disabled_by_policy_title">Disabled by policy</string>
- <string name="disabled_by_admin_msg">Disabled by your <xliff:g id="organisation_name" example="organisation">%s</xliff:g>\'s administrator.</string>
- <string name="default_organisation_name">organisation</string>
- <string name="default_admin_support_msg">Contact them to learn more.</string>
- <string name="list_of_administrators">List of administrators</string>
+ <!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
+ <string name="default_admin_support_msg">Disabled by your organisation\'s administrator.\nContact them to learn more.</string>
+ <!-- Shown in dialog to allow user to see more information about the device admin [CHAR LIMIT=30] -->
+ <string name="admin_support_more_info">More details</string>
+ <!-- Shown in admin details page to warn user about policies the admin can set in a work profile. [CHAR LIMIT=NONE] -->
+ <string name="admin_profile_owner_message">Your administrator has the ability to monitor and manage settings, corporate access, apps, permissions, and data associated with the profile, including network activity and your device\'s location information.</string>
+ <!-- Shown in admin details page to warn user about policies the admin can set on a user. [CHAR LIMIT=NONE] -->
+ <string name="admin_profile_owner_user_message">Your administrator has the ability to monitor and manage settings, corporate access, apps, permissions, and data associated with this user, including network activity and your device\'s location information.</string>
+ <!-- Shown in admin details page to warn user about policies the admin can set on a device. [CHAR LIMIT=NONE] -->
+ <string name="admin_device_owner_message">Your administrator has the ability to monitor and manage settings, corporate access, apps, permissions, and data associated with this device, including network activity and your device\'s location information.</string>
<!-- Turn off a conditional state of the device (e.g. airplane mode, or hotspot) [CHAR LIMIT=30] -->
<string name="condition_turn_off">Turn off</string>
@@ -6751,4 +6778,10 @@
<!-- Summary of condition that background data is off [CHAR LIMIT=NONE] -->
<string name="condition_bg_data_summary">Background data is only available via Wi-Fi. This may affect some apps or services when Wi-Fi is not available.</string>
+ <!-- Title for the suggestions section on the dashboard [CHAR LIMIT=30] -->
+ <string name="suggestions_title">Suggestions (<xliff:g name="count" example="3">%1$d</xliff:g>)</string>
+
+ <!-- Name of option to remove a suggestion from the list [CHAR LIMIT=30] -->
+ <string name="suggestion_remove">Remove</string>
+
</resources>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 791f1b8..591bdad 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -16,7 +16,13 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
- android:title="@string/accessibility_settings">
+ android:title="@string/accessibility_settings"
+ android:persistent="true">
+
+ <PreferenceScreen
+ android:key="accessibility_settings_for_setup_wizard"
+ android:title="@string/accessibility_settings_for_setup_wizard_title"
+ android:fragment="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
<PreferenceCategory
android:key="services_category"
diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml
new file mode 100644
index 0000000..742b897
--- /dev/null
+++ b/res/xml/accessibility_settings_for_setup_wizard.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/accessibility_settings_title"
+ android:persistent="true" >
+
+ <Preference
+ android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
+ android:key="screen_magnification_preference"
+ android:layout="@layout/preference_button"
+ android:title="@string/accessibility_screen_magnification_title" />
+
+ <Preference
+ android:key="font_size_preference"
+ android:layout="@layout/preference_button"
+ android:title="@string/title_font_size" />
+
+ <com.android.settings.DisplayDensityPreference
+ android:key="force_density_preference"
+ android:layout="@layout/preference_button"
+ settings:keywords="@string/screen_zoom_keywords"
+ android:title="@string/screen_zoom_title"
+ android:summary="%s" />
+
+ <Preference
+ android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
+ android:key="daltonizer_preference"
+ android:layout="@layout/preference_button"
+ android:title="@string/accessibility_display_daltonizer_preference_title" />
+
+ <Preference
+ android:key="talkback_preference"
+ android:layout="@layout/preference_button" />
+
+</PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 57fdc36..ea4750e 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -369,6 +369,11 @@
android:key="force_resizable_activities"
android:title="@string/force_resizable_activities"
android:summary="@string/force_resizable_activities_summary"/>
+
+ <SwitchPreference
+ android:key="enable_freeform_support"
+ android:title="@string/enable_freeform_support"
+ android:summary="@string/enable_freeform_support_summary"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/suggestion_ordering.xml b/res/xml/suggestion_ordering.xml
new file mode 100644
index 0000000..339b195
--- /dev/null
+++ b/res/xml/suggestion_ordering.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<optional-steps>
+ <step category="com.android.settings.suggested.category.LOCK_SCREEN" />
+ <step category="com.android.settings.suggested.category.EMAIL" />
+ <step category="com.android.settings.suggested.category.PAYMENT" />
+ <step category="com.android.settings.suggested.category.PARTNER_ACCOUNT"
+ multiple="true" />
+ <step category="com.android.settings.suggested.category.DEFAULT"
+ multiple="true" />
+</optional-steps>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index f33177c..d7189de 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -28,4 +28,10 @@
android:title="@string/user_add_user_or_profile_menu"
android:icon="@drawable/ic_menu_add_dark" />
+ <PreferenceCategory
+ android:key="lock_screen_settings"
+ android:title="@string/user_lockscreen_settings">
+ <SwitchPreference android:key="add_users_when_locked" android:title="@string/user_add_on_lockscreen_menu"
+ android:summary="@string/user_add_on_lockscreen_menu_summary" />
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/zen_mode_visual_interruptions_settings.xml b/res/xml/zen_mode_visual_interruptions_settings.xml
index 8131650..8f67e08 100644
--- a/res/xml/zen_mode_visual_interruptions_settings.xml
+++ b/res/xml/zen_mode_visual_interruptions_settings.xml
@@ -28,4 +28,9 @@
android:summary="@string/zen_mode_lights_summary"
android:persistent="false" />
+ <SwitchPreference android:key="screen_on"
+ android:title="@string/zen_mode_screen_on"
+ android:summary="@string/zen_mode_screen_on_summary"
+ android:persistent="false" />
+
</PreferenceScreen>
diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index c3dd474..3b7d169 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -16,6 +16,7 @@
package com.android.settings;
+import android.app.ActivityManager;
import android.app.ActivityManagerNative;
import android.app.AlertDialog.Builder;
import android.content.Context;
@@ -83,7 +84,7 @@
if (mFullTitle.isChecked()) {
Log.v(TAG, "Taking full bugreport right away");
- takeBugreport(false);
+ takeBugreport(ActivityManager.BUGREPORT_OPTION_FULL);
} else {
Log.v(TAG, "Taking interactive bugreport in " + BUGREPORT_DELAY_SECONDS + "s");
// Add a little delay before executing, to give the user a chance to close
@@ -97,18 +98,18 @@
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
- takeBugreport(true);
+ takeBugreport(ActivityManager.BUGREPORT_OPTION_INTERACTIVE);
}
}, BUGREPORT_DELAY_SECONDS * DateUtils.SECOND_IN_MILLIS);
}
}
}
- private void takeBugreport(boolean progress) {
+ private void takeBugreport(int bugreportType) {
try {
- ActivityManagerNative.getDefault().requestBugReport(progress);
+ ActivityManagerNative.getDefault().requestBugReport(bugreportType);
} catch (RemoteException e) {
- Log.e(TAG, "error taking bugreport (progress=" + progress + ")", e);
+ Log.e(TAG, "error taking bugreport (bugreportType=" + bugreportType + ")", e);
}
}
}
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index ab81455..53fbb7f 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -197,18 +197,10 @@
if (external) {
intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
if (mFragment != null) {
- IntentSender intentSender = mFragment.getActivity().getIntent()
- .getParcelableExtra(Intent.EXTRA_INTENT);
- if (intentSender != null) {
- intent.putExtra(Intent.EXTRA_INTENT, intentSender);
- }
+ copyOptionalExtras(mFragment.getActivity().getIntent(), intent);
mFragment.startActivity(intent);
} else {
- IntentSender intentSender = mActivity.getIntent()
- .getParcelableExtra(Intent.EXTRA_INTENT);
- if (intentSender != null) {
- intent.putExtra(Intent.EXTRA_INTENT, intentSender);
- }
+ copyOptionalExtras(mActivity.getIntent(), intent);
mActivity.startActivity(intent);
}
} else {
@@ -220,4 +212,22 @@
}
return true;
}
+
+ private void copyOptionalExtras(Intent inIntent, Intent outIntent) {
+ IntentSender intentSender = inIntent.getParcelableExtra(Intent.EXTRA_INTENT);
+ if (intentSender != null) {
+ outIntent.putExtra(Intent.EXTRA_INTENT, intentSender);
+ }
+ int taskId = inIntent.getIntExtra(Intent.EXTRA_TASK_ID, -1);
+ if (taskId != -1) {
+ outIntent.putExtra(Intent.EXTRA_TASK_ID, taskId);
+ }
+ // If we will launch another activity once credentials are confirmed, exclude from recents.
+ // This is a workaround to a framework bug where affinity is incorrect for activities
+ // that are started from a no display activity, as is ConfirmDeviceCredentialActivity.
+ // TODO: Remove once that bug is fixed.
+ if (intentSender != null || taskId != -1) {
+ outIntent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ }
+ }
}
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index e04f86f..0a22d45 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -17,9 +17,15 @@
package com.android.settings;
import android.annotation.Nullable;
+import android.app.ActivityManager;
+import android.app.ActivityManagerNative;
+import android.app.ActivityOptions;
+import android.app.IActivityManager;
+import android.content.Context;
import android.content.Intent;
import android.content.IntentSender;
import android.os.Bundle;
+import android.os.RemoteException;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
@@ -127,6 +133,18 @@
}
protected void checkForPendingIntent() {
+ int taskId = getActivity().getIntent().getIntExtra(Intent.EXTRA_TASK_ID, -1);
+ if (taskId != -1) {
+ try {
+ IActivityManager activityManager = ActivityManagerNative.getDefault();
+ final ActivityOptions options = ActivityOptions.makeBasic();
+ options.setLaunchStackId(ActivityManager.StackId.INVALID_STACK_ID);
+ activityManager.startActivityFromRecents(taskId, options.toBundle());
+ return;
+ } catch (RemoteException e) {
+ // Do nothing.
+ }
+ }
IntentSender intentSender = getActivity().getIntent()
.getParcelableExtra(Intent.EXTRA_INTENT);
if (intentSender != null) {
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 38376e4..c9a2999 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -480,7 +480,7 @@
return;
}
try {
- int uid = getActivity().getPackageManager().getPackageUid(mShowAppImmediatePkg,
+ int uid = getActivity().getPackageManager().getPackageUidAsUser(mShowAppImmediatePkg,
UserHandle.myUserId());
AppItem app = new AppItem(uid);
app.addUid(uid);
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 80596ba..a332632 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1262,8 +1262,7 @@
private void updateForceResizableOptions() {
updateSwitchPreference(mForceResizable, Settings.Global.getInt(getContentResolver(),
- Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES,
- Build.IS_DEBUGGABLE ? 1 : 0) != 0);
+ Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0);
}
private void writeForceResizableOptions() {
@@ -1414,14 +1413,8 @@
final String size = (newValue != null) ?
newValue.toString() : DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES;
SystemProperties.set(SELECT_LOGD_SIZE_PROPERTY, size);
+ SystemProperties.set("ctl.start", "logd-reinit");
pokeSystemProperties();
- try {
- Process p = Runtime.getRuntime().exec("logcat -b all -G " + size);
- p.waitFor();
- Log.i(TAG, "Logcat ring buffer sizes set to: " + size);
- } catch (Exception e) {
- Log.w(TAG, "Cannot set logcat ring buffer sizes", e);
- }
updateLogdSizeValues();
}
@@ -1976,12 +1969,7 @@
static class SystemPropPoker extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... params) {
- String[] services;
- try {
- services = ServiceManager.listServices();
- } catch (RemoteException e) {
- return null;
- }
+ String[] services = ServiceManager.listServices();
for (String service : services) {
IBinder obj = ServiceManager.checkService(service);
if (obj != null) {
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index acd8c3b..3067ca2 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -34,6 +34,7 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.os.Binder;
import android.os.Bundle;
@@ -42,6 +43,7 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
+import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.util.EventLog;
import android.util.Log;
@@ -55,6 +57,8 @@
import android.widget.ImageView;
import android.widget.TextView;
+import com.android.settings.users.UserDialogs;
+
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
@@ -86,6 +90,7 @@
ImageView mAddMsgExpander;
boolean mAddMsgEllipsized = true;
TextView mAdminWarning;
+ TextView mSupportMessage;
ViewGroup mAdminPolicies;
Button mActionButton;
Button mCancelButton;
@@ -279,6 +284,7 @@
mAdminWarning = (TextView) findViewById(R.id.admin_warning);
mAdminPolicies = (ViewGroup) findViewById(R.id.admin_policies);
+ mSupportMessage = (TextView) findViewById(R.id.admin_support_message);
mCancelButton = (Button) findViewById(R.id.cancel_button);
mCancelButton.setFilterTouchesWhenObscured(true);
mCancelButton.setOnClickListener(new View.OnClickListener() {
@@ -294,6 +300,19 @@
public void onClick(View v) {
if (mAdding) {
addAndFinish();
+ } else if (isManagedProfile(mDeviceAdmin)
+ && mDeviceAdmin.getComponent().equals(mDPM.getProfileOwner())) {
+ final int userId = UserHandle.myUserId();
+ UserDialogs.createRemoveDialog(DeviceAdminAdd.this, userId,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ UserManager um = UserManager.get(DeviceAdminAdd.this);
+ um.removeUser(userId);
+ finish();
+ }
+ }
+ ).show();
} else if (!mWaitingForRemoveMsg) {
try {
// Don't allow the admin to put a dialog up in front
@@ -451,12 +470,42 @@
}
if (!mRefreshing && !mAddingProfileOwner
&& mDPM.isAdminActive(mDeviceAdmin.getComponent())) {
- addDeviceAdminPolicies(false /* showDescription */);
- mAdminWarning.setText(getString(R.string.device_admin_status,
- mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(getPackageManager())));
- setTitle(getText(R.string.active_device_admin_msg));
- mActionButton.setText(getText(R.string.remove_device_admin));
mAdding = false;
+ final boolean isProfileOwner =
+ mDeviceAdmin.getComponent().equals(mDPM.getProfileOwner());
+ final boolean isManagedProfile = isManagedProfile(mDeviceAdmin);
+ if (isProfileOwner && isManagedProfile) {
+ // Profile owner in a managed profile, user can remove profile to disable admin.
+ mAdminWarning.setText(R.string.admin_profile_owner_message);
+ mActionButton.setText(R.string.remove_managed_profile_label);
+ } else if (isProfileOwner || mDeviceAdmin.getComponent().equals(
+ mDPM.getDeviceOwnerComponentOnCallingUser())) {
+ // Profile owner in a user or device owner, user can't disable admin.
+ if (isProfileOwner) {
+ // Show profile owner in a user description.
+ mAdminWarning.setText(R.string.admin_profile_owner_user_message);
+ } else {
+ // Show device owner description.
+ mAdminWarning.setText(R.string.admin_device_owner_message);
+ }
+ mActionButton.setText(R.string.remove_device_admin);
+ mActionButton.setEnabled(false);
+ } else {
+ addDeviceAdminPolicies(false /* showDescription */);
+ mAdminWarning.setText(getString(R.string.device_admin_status,
+ mDeviceAdmin.getActivityInfo().applicationInfo.loadLabel(
+ getPackageManager())));
+ setTitle(R.string.active_device_admin_msg);
+ mActionButton.setText(R.string.remove_device_admin);
+ }
+ String supportMessage = mDPM.getLongSupportMessageForUser(
+ mDeviceAdmin.getComponent(), UserHandle.myUserId());
+ if (!TextUtils.isEmpty(supportMessage)) {
+ mSupportMessage.setText(supportMessage);
+ mSupportMessage.setVisibility(View.VISIBLE);
+ } else {
+ mSupportMessage.setVisibility(View.GONE);
+ }
} else {
addDeviceAdminPolicies(true /* showDescription */);
mAdminWarning.setText(getString(R.string.device_admin_warning,
@@ -467,6 +516,7 @@
setTitle(getText(R.string.add_device_admin_msg));
}
mActionButton.setText(getText(R.string.add_device_admin));
+ mSupportMessage.setVisibility(View.GONE);
mAdding = true;
}
}
@@ -505,4 +555,13 @@
MAX_ADD_MSG_LINES_PORTRAIT : MAX_ADD_MSG_LINES_LANDSCAPE;
}
+ /**
+ * @return true if adminInfo is running in a managed profile.
+ */
+ private boolean isManagedProfile(DeviceAdminInfo adminInfo) {
+ UserManager um = UserManager.get(this);
+ UserInfo info = um.getUserInfo(
+ UserHandle.getUserId(adminInfo.getActivityInfo().applicationInfo.uid));
+ return info != null ? info.isManagedProfile() : false;
+ }
}
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 5324983..9791160 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -59,12 +59,29 @@
private DevicePolicyManager mDPM;
private UserManager mUm;
+
+ private static class DeviceAdminListItem implements Comparable<DeviceAdminListItem> {
+ public DeviceAdminInfo info;
+
+ // These aren't updated so they keep a stable sort order if user activates / de-activates
+ // an admin.
+ public String name;
+ public boolean active;
+
+ public int compareTo(DeviceAdminListItem other) {
+ // Sort active admins first, then by name.
+ if (this.active != other.active) {
+ return this.active ? -1 : 1;
+ }
+ return this.name.compareTo(other.name);
+ }
+ }
/**
* Internal collection of device admin info objects for all profiles associated with the current
* user.
*/
- private final SparseArray<ArrayList<DeviceAdminInfo>>
- mAdminsByProfile = new SparseArray<ArrayList<DeviceAdminInfo>>();
+ private final ArrayList<DeviceAdminListItem>
+ mAdmins = new ArrayList<DeviceAdminListItem>();
private String mDeviceOwnerPkg;
private SparseArray<ComponentName> mProfileOwnerComponents = new SparseArray<ComponentName>();
@@ -133,7 +150,7 @@
* current user.
*/
void updateList() {
- mAdminsByProfile.clear();
+ mAdmins.clear();
final List<UserHandle> profiles = mUm.getUserProfiles();
final int profilesSize = profiles.size();
@@ -141,6 +158,7 @@
final int profileId = profiles.get(i).getIdentifier();
updateAvailableAdminsForProfile(profileId);
}
+ Collections.sort(mAdmins);
getListView().setAdapter(new PolicyListAdapter());
}
@@ -148,25 +166,12 @@
@Override
public void onListItemClick(ListView l, View v, int position, long id) {
Object o = l.getAdapter().getItem(position);
- if (!(o instanceof DeviceAdminInfo)) {
- // race conditions may cause this
- return;
- }
DeviceAdminInfo dpi = (DeviceAdminInfo) o;
+ final UserHandle user = new UserHandle(getUserId(dpi));
final Activity activity = getActivity();
- final int userId = getUserId(dpi);
- if (userId == UserHandle.myUserId() || !isProfileOwner(dpi)) {
- Intent intent = new Intent();
- intent.setClass(activity, DeviceAdminAdd.class);
- intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, dpi.getComponent());
- activity.startActivityAsUser(intent, new UserHandle(userId));
- } else {
- AlertDialog.Builder builder = new AlertDialog.Builder(activity);
- builder.setMessage(getString(R.string.managed_profile_device_admin_info,
- dpi.loadLabel(activity.getPackageManager())));
- builder.setPositiveButton(android.R.string.ok, null);
- builder.create().show();
- }
+ Intent intent = new Intent(activity, DeviceAdminAdd.class);
+ intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, dpi.getComponent());
+ activity.startActivityAsUser(intent, user);
}
static class ViewHolder {
@@ -191,55 +196,17 @@
@Override
public int getCount() {
- int adminCount = 0;
- final int profileCount = mAdminsByProfile.size();
- for (int i = 0; i < profileCount; ++i) {
- adminCount += mAdminsByProfile.valueAt(i).size();
- }
- // Add 'profileCount' for title items.
- return adminCount + profileCount;
+ return mAdmins.size();
}
/**
* The item for the given position in the list.
*
- * @return a String object for title items and a DeviceAdminInfo object for actual device
- * admins.
+ * @return DeviceAdminInfo object for actual device admins.
*/
@Override
public Object getItem(int position) {
- if (position < 0) {
- throw new ArrayIndexOutOfBoundsException();
- }
- // The position of the item in the list of admins.
- // We start from the given position and discount the length of the upper lists until we
- // get the one for the right profile
- int adminPosition = position;
- final int n = mAdminsByProfile.size();
- int i = 0;
- for (; i < n; ++i) {
- // The elements in that section including the title item (that's why adding one).
- final int listSize = mAdminsByProfile.valueAt(i).size() + 1;
- if (adminPosition < listSize) {
- break;
- }
- adminPosition -= listSize;
- }
- if (i == n) {
- throw new ArrayIndexOutOfBoundsException();
- }
- // If countdown == 0 that means the title item
- if (adminPosition == 0) {
- Resources res = getActivity().getResources();
- if (mAdminsByProfile.keyAt(i) == UserHandle.myUserId()) {
- return res.getString(R.string.personal_device_admin_title);
- } else {
- return res.getString(R.string.managed_device_admin_title);
- }
- } else {
- // Subtracting one for the title.
- return mAdminsByProfile.valueAt(i).get(adminPosition - 1);
- }
+ return ((DeviceAdminListItem) (mAdmins.get(position))).info;
}
@Override
@@ -257,16 +224,15 @@
*/
@Override
public int getViewTypeCount() {
- return 2;
+ return 1;
}
/**
- * Returns 1 for title items and 0 for anything else.
+ * Returns 0 for all types.
*/
@Override
public int getItemViewType(int position) {
- Object o = getItem(position);
- return (o instanceof String) ? 1 : 0;
+ return 0;
}
@Override
@@ -276,15 +242,7 @@
}
private boolean isEnabled(Object o) {
- if (!(o instanceof DeviceAdminInfo)) {
- // Title item
- return false;
- }
DeviceAdminInfo info = (DeviceAdminInfo) o;
- if (isActiveAdmin(info) && getUserId(info) == UserHandle.myUserId()
- && (isDeviceOwner(info) || isProfileOwner(info))) {
- return false;
- }
// Disable item if admin is being removed
if (isRemovingAdmin(info)) {
return false;
@@ -295,28 +253,20 @@
@Override
public View getView(int position, View convertView, ViewGroup parent) {
Object o = getItem(position);
- if (o instanceof DeviceAdminInfo) {
- if (convertView == null) {
- convertView = newDeviceAdminView(parent);
- }
- bindView(convertView, (DeviceAdminInfo) o);
- } else {
- if (convertView == null) {
- convertView = Utils.inflateCategoryHeader(mInflater, parent);
- }
- final TextView title = (TextView) convertView.findViewById(android.R.id.title);
- title.setText((String)o);
+ if (convertView == null) {
+ convertView = newDeviceAdminView(parent);
}
+ bindView(convertView, (DeviceAdminInfo) o);
return convertView;
}
private View newDeviceAdminView(ViewGroup parent) {
View v = mInflater.inflate(R.layout.device_admin_item, parent, false);
ViewHolder h = new ViewHolder();
- h.icon = (ImageView)v.findViewById(R.id.icon);
- h.name = (TextView)v.findViewById(R.id.name);
- h.checkbox = (CheckBox)v.findViewById(R.id.checkbox);
- h.description = (TextView)v.findViewById(R.id.description);
+ h.icon = (ImageView) v.findViewById(R.id.icon);
+ h.name = (TextView) v.findViewById(R.id.name);
+ h.checkbox = (CheckBox) v.findViewById(R.id.checkbox);
+ h.description = (TextView) v.findViewById(R.id.description);
v.setTag(h);
return v;
}
@@ -391,7 +341,7 @@
private void addDeviceAdminBroadcastReceiversForProfile(
Collection<ComponentName> alreadyAddedComponents, final int profileId) {
final PackageManager pm = getActivity().getPackageManager();
- List<ResolveInfo> enabledForProfile = pm.queryBroadcastReceivers(
+ List<ResolveInfo> enabledForProfile = pm.queryBroadcastReceiversAsUser(
new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
profileId);
@@ -399,10 +349,6 @@
enabledForProfile = Collections.emptyList();
}
final int n = enabledForProfile.size();
- ArrayList<DeviceAdminInfo> deviceAdmins = mAdminsByProfile.get(profileId);
- if (deviceAdmins == null) {
- deviceAdmins = new ArrayList<DeviceAdminInfo>(n);
- }
for (int i = 0; i < n; ++i) {
ResolveInfo resolveInfo = enabledForProfile.get(i);
ComponentName riComponentName =
@@ -410,16 +356,18 @@
resolveInfo.activityInfo.name);
if (alreadyAddedComponents == null
|| !alreadyAddedComponents.contains(riComponentName)) {
- DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolveInfo);
+ DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolveInfo);
// add only visible ones (note: active admins are added regardless of visibility)
if (deviceAdminInfo != null && deviceAdminInfo.isVisible()) {
- deviceAdmins.add(deviceAdminInfo);
+ DeviceAdminListItem item = new DeviceAdminListItem();
+ item.info = deviceAdminInfo;
+ item.name = deviceAdminInfo.loadLabel(pm).toString();
+ // Active ones already added.
+ item.active = false;
+ mAdmins.add(item);
}
}
}
- if (!deviceAdmins.isEmpty()) {
- mAdminsByProfile.put(profileId, deviceAdmins);
- }
}
/**
@@ -433,10 +381,9 @@
if (activeAdmins != null) {
final PackageManager packageManager = getActivity().getPackageManager();
final int n = activeAdmins.size();
- ArrayList<DeviceAdminInfo> deviceAdmins = new ArrayList<DeviceAdminInfo>(n);
for (int i = 0; i < n; ++i) {
ComponentName activeAdmin = activeAdmins.get(i);
- List<ResolveInfo> resolved = packageManager.queryBroadcastReceivers(
+ List<ResolveInfo> resolved = packageManager.queryBroadcastReceiversAsUser(
new Intent().setComponent(activeAdmin), PackageManager.GET_META_DATA
| PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS, profileId);
if (resolved != null) {
@@ -444,14 +391,15 @@
for (int j = 0; j < resolvedMax; ++j) {
DeviceAdminInfo deviceAdminInfo = createDeviceAdminInfo(resolved.get(j));
if (deviceAdminInfo != null) {
- deviceAdmins.add(deviceAdminInfo);
+ DeviceAdminListItem item = new DeviceAdminListItem();
+ item.info = deviceAdminInfo;
+ item.name = deviceAdminInfo.loadLabel(packageManager).toString();
+ item.active = true;
+ mAdmins.add(item);
}
}
}
}
- if (!deviceAdmins.isEmpty()) {
- mAdminsByProfile.put(profileId, deviceAdmins);
- }
}
}
diff --git a/src/com/android/settings/RestrictedPreferenceHelper.java b/src/com/android/settings/RestrictedPreferenceHelper.java
index 0918887..385a8a2 100644
--- a/src/com/android/settings/RestrictedPreferenceHelper.java
+++ b/src/com/android/settings/RestrictedPreferenceHelper.java
@@ -53,10 +53,7 @@
mContext = context;
mPreference = preference;
- mRestrictedPadlock = mContext.getDrawable(R.drawable.ic_settings_lock_outline);
- final int iconSize = mContext.getResources().getDimensionPixelSize(
- R.dimen.restricted_lock_icon_size);
- mRestrictedPadlock.setBounds(0, 0, iconSize, iconSize);
+ mRestrictedPadlock = getRestrictedPadlock(mContext);
mRestrictedPadlockPadding = mContext.getResources().getDimensionPixelSize(
R.dimen.restricted_lock_icon_padding);
@@ -192,4 +189,15 @@
public boolean isDisabledByAdmin() {
return mDisabledByAdmin;
}
+
+ /**
+ * @return drawables for displaying with settings that are locked by a device admin.
+ */
+ public static Drawable getRestrictedPadlock(Context context) {
+ Drawable restrictedPadlock = context.getDrawable(R.drawable.ic_settings_lock_outline);
+ final int iconSize = context.getResources().getDimensionPixelSize(
+ R.dimen.restricted_lock_icon_size);
+ restrictedPadlock.setBounds(0, 0, iconSize, iconSize);
+ return restrictedPadlock;
+ }
}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index fbe0f1c..4ce76ce 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -214,7 +214,8 @@
mOwnerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
if (mOwnerInfoPref != null) {
- mOwnerInfoPref.setEnabled(!mLockPatternUtils.isDeviceOwnerInfoEnabled());
+ mOwnerInfoPref.setEnabled(!mLockPatternUtils.isLockScreenDisabled(MY_USER_ID)
+ && !mLockPatternUtils.isDeviceOwnerInfoEnabled());
if (mOwnerInfoPref.isEnabled()) {
mOwnerInfoPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 4d9e2f0..ba975a2 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -50,7 +50,6 @@
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.SearchView;
-import com.android.internal.logging.MetricsLogger;
import com.android.internal.util.ArrayUtils;
import com.android.settings.Settings.WifiSettingsActivity;
import com.android.settings.accessibility.AccessibilitySettings;
@@ -111,7 +110,7 @@
import com.android.settings.wifi.WifiSettings;
import com.android.settings.wifi.p2p.WifiP2pSettings;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.DashboardTile;
+import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.SettingsDrawerActivity;
import java.util.ArrayList;
@@ -199,6 +198,8 @@
private static final String EMPTY_QUERY = "";
+ private static final int REQUEST_SUGGESTION = 42;
+
private String mFragmentClass;
private CharSequence mInitialTitle;
@@ -365,6 +366,7 @@
private int mHomeActivitiesCount = 1;
private Intent mResultIntentData;
+ private ComponentName mCurrentSuggestion;
public SwitchBar getSwitchBar() {
return mSwitchBar;
@@ -1031,7 +1033,7 @@
// When on restricted users, disable all extra categories (but only the settings ones).
List<DashboardCategory> categories = getDashboardCategories();
for (DashboardCategory category : categories) {
- for (DashboardTile tile : category.tiles) {
+ for (Tile tile : category.tiles) {
ComponentName component = tile.intent.getComponent();
if (packageName.equals(component)&& !ArrayUtils.contains(
SETTINGS_FOR_RESTRICTED, component.getClassName())) {
@@ -1146,7 +1148,7 @@
}
@Override
- protected void onTileClicked(DashboardTile tile) {
+ protected void onTileClicked(Tile tile) {
if (mIsShowingDashboard) {
// If on dashboard, don't finish so the back comes back to here.
openTile(tile);
@@ -1200,4 +1202,20 @@
public void setResultIntentData(Intent resultIntentData) {
mResultIntentData = resultIntentData;
}
+
+ public void startSuggestion(Intent intent) {
+ mCurrentSuggestion = intent.getComponent();
+ startActivityForResult(intent, REQUEST_SUGGESTION);
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == REQUEST_SUGGESTION && mCurrentSuggestion != null
+ && resultCode != RESULT_CANCELED) {
+ getPackageManager().setComponentEnabledSetting(mCurrentSuggestion,
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP);
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
}
diff --git a/src/com/android/settings/ShowAdminSupportDetailsDialog.java b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
index 42e8f05..85e90cf 100644
--- a/src/com/android/settings/ShowAdminSupportDetailsDialog.java
+++ b/src/com/android/settings/ShowAdminSupportDetailsDialog.java
@@ -17,24 +17,57 @@
package com.android.settings;
import android.app.Activity;
+import android.app.ActivityManagerNative;
import android.app.AlertDialog;
+import android.app.AppGlobals;
+import android.app.IActivityManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
import android.content.DialogInterface;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.ImageView;
import android.widget.TextView;
public class ShowAdminSupportDetailsDialog extends Activity
implements DialogInterface.OnDismissListener {
+ private final String TAG = "AdminSupportDialog";
+
+ private DevicePolicyManager mDpm;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mDpm = getSystemService(DevicePolicyManager.class);
+ ComponentName admin = null;
+ int userId = UserHandle.myUserId();
+ Intent intent = getIntent();
+ if (intent != null) {
+ IActivityManager am = ActivityManagerNative.getDefault();
+ try {
+ int uid = am.getLaunchedFromUid(getActivityToken());
+ // Only allow system to specify admin and user.
+ if (UserHandle.isSameApp(uid, android.os.Process.myUid())) {
+ admin = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
+ userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Could not talk to activity manager.", e);
+ }
+ }
+
View rootView = LayoutInflater.from(this).inflate(
R.layout.admin_support_details_dialog, null);
- setAdminSupportDetails(rootView);
+ setAdminSupportDetails(rootView, admin, userId);
new AlertDialog.Builder(this)
.setView(rootView)
@@ -43,24 +76,47 @@
.show();
}
- private void setAdminSupportDetails(View root) {
- CharSequence adminDisabledMsg = getString(R.string.disabled_by_admin_msg,
- getString(R.string.default_organisation_name));
- TextView textView = (TextView) root.findViewById(R.id.disabled_by_admin_msg);
- textView.setText(adminDisabledMsg);
+ private void setAdminSupportDetails(View root, final ComponentName admin, final int userId) {
+ if (admin != null) {
+ CharSequence supportMessage = mDpm.getShortSupportMessageForUser(admin, userId);
+ if (supportMessage != null) {
+ TextView textView = (TextView) root.findViewById(R.id.admin_support_msg);
+ textView.setText(supportMessage);
+ }
- CharSequence adminSupportDetails = getString(R.string.default_admin_support_msg);
- textView = (TextView) root.findViewById(R.id.admin_support_msg);
- textView.setText(adminSupportDetails);
+ ActivityInfo ai = null;
+ try {
+ ai = AppGlobals.getPackageManager().getReceiverInfo(admin, 0 /* flags */, userId);
+ } catch (RemoteException e) {
+ Log.w(TAG, "Missing reciever info" , e);
+ }
+ if (ai != null) {
+ Drawable icon = ai.loadIcon(getPackageManager());
+ Drawable badgedIcon = getPackageManager().getUserBadgedIcon(
+ icon, new UserHandle(userId));
+ ((ImageView) root.findViewById(R.id.admin_support_icon)).setImageDrawable(
+ badgedIcon);
+ }
+ }
root.findViewById(R.id.admins_policies_list).setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent intent = new Intent();
- intent.setClass(ShowAdminSupportDetailsDialog.this,
- Settings.DeviceAdminSettingsActivity.class);
- startActivity(intent);
+ if (admin != null) {
+ intent.setClass(ShowAdminSupportDetailsDialog.this,
+ DeviceAdminAdd.class);
+ intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, admin);
+ // DeviceAdminAdd class may need to run as managed profile.
+ startActivityAsUser(intent, new UserHandle(userId));
+ } else {
+ intent.setClass(ShowAdminSupportDetailsDialog.this,
+ Settings.DeviceAdminSettingsActivity.class);
+ // Activity merges both managed profile and parent users
+ // admins so show as same user as this activity.
+ startActivity(intent);
+ }
finish();
}
});
@@ -70,4 +126,4 @@
public void onDismiss(DialogInterface dialog) {
finish();
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 672582d..fdf01e9 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -554,6 +554,7 @@
}
mToggleLargeTextPreference.setChecked(mCurConfig.fontScale == LARGE_FONT_SCALE);
+ // Text contrast.
mToggleHighTextContrastPreference.setChecked(
Settings.Secure.getInt(getContentResolver(),
Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0) == 1);
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
new file mode 100644
index 0000000..ac12005
--- /dev/null
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2015 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.accessibility;
+
+import android.os.Bundle;
+import android.provider.Settings;
+import android.support.v7.preference.Preference;
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+/**
+ * Activity with the accessibility settings specific to Setup Wizard.
+ */
+public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragment
+ implements DialogCreatable, Preference.OnPreferenceChangeListener {
+
+ // Preferences.
+ private static final String DISPLAY_MAGNIFICATION_PREFERENCE =
+ "screen_magnification_preference";
+ private static final String DISPLAY_DALTONIZER_PREFERENCE = "daltonizer_preference";
+ private static final String TALKBACK_PREFERENCE = "talkback_preference";
+
+ private static final String TALKBACK_NAME = "Talkback";
+
+ // Preference controls.
+ private Preference mDisplayMagnificationPreference;
+ private Preference mDisplayDaltonizerPreference;
+ private Preference mTalkbackPreference;
+
+ @Override
+ protected int getMetricsCategory() {
+ return MetricsLogger.ACCESSIBILITY;
+ }
+
+ @Override
+ protected int getHelpResource() {
+ return R.string.help_uri_accessibility;
+ }
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ addPreferencesFromResource(R.xml.accessibility_settings_for_setup_wizard);
+
+ mDisplayMagnificationPreference = findPreference(DISPLAY_MAGNIFICATION_PREFERENCE);
+ mDisplayDaltonizerPreference = findPreference(DISPLAY_DALTONIZER_PREFERENCE);
+
+ mTalkbackPreference = findPreference(TALKBACK_PREFERENCE);
+ mTalkbackPreference.setTitle(TALKBACK_NAME);
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ setHasOptionsMenu(false);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ updatePreferences();
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ return false;
+ }
+
+ @Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+ if (mDisplayMagnificationPreference == preference) {
+ Bundle extras = mDisplayMagnificationPreference.getExtras();
+ extras.putString(AccessibilitySettings.EXTRA_TITLE,
+ getString(R.string.accessibility_screen_magnification_title));
+ extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY,
+ getActivity().getResources().getText(
+ R.string.accessibility_screen_magnification_summary));
+ extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED,
+ Settings.Secure.getInt(getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1);
+ }
+
+ return super.onPreferenceTreeClick(preference);
+ }
+
+ private void updatePreferences() {
+ updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
+ mDisplayMagnificationPreference);
+ updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
+ mDisplayDaltonizerPreference);
+ }
+
+ private void updateFeatureSummary(String prefKey, Preference pref) {
+ final boolean enabled = Settings.Secure.getInt(getContentResolver(), prefKey, 0) == 1;
+ pref.setSummary(enabled ? R.string.accessibility_feature_state_on
+ : R.string.accessibility_feature_state_off);
+ }
+}
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
index ae711f7..91523ee 100644
--- a/src/com/android/settings/applications/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -139,7 +139,7 @@
// Present 'undefined' as 'ask' because the OS treats them identically for
// purposes of the UI (and does the right thing around pending domain
// verifications that might arrive after the user chooses 'ask' in this UI).
- final int state = mPm.getIntentVerificationStatus(mPackageName, UserHandle.myUserId());
+ final int state = mPm.getIntentVerificationStatusAsUser(mPackageName, UserHandle.myUserId());
mAppLinkState.setValue(
Integer.toString((state == INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED)
? INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK
@@ -164,16 +164,16 @@
}
final int userId = UserHandle.myUserId();
- final int priorState = mPm.getIntentVerificationStatus(mPackageName, userId);
+ final int priorState = mPm.getIntentVerificationStatusAsUser(mPackageName, userId);
if (priorState == newState) {
return false;
}
- boolean success = mPm.updateIntentVerificationStatus(mPackageName, newState, userId);
+ boolean success = mPm.updateIntentVerificationStatusAsUser(mPackageName, newState, userId);
if (success) {
// Read back the state to see if the change worked
- final int updatedState = mPm.getIntentVerificationStatus(mPackageName, userId);
+ final int updatedState = mPm.getIntentVerificationStatusAsUser(mPackageName, userId);
success = (newState == updatedState);
} else {
Log.e(TAG, "Couldn't update intent verification status!");
diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java
index 3a63a66..e9c5a0e 100644
--- a/src/com/android/settings/applications/ClearDefaultsPreference.java
+++ b/src/com/android/settings/applications/ClearDefaultsPreference.java
@@ -95,7 +95,7 @@
final int userId = UserHandle.myUserId();
mPm.clearPackagePreferredActivities(mPackageName);
if (isDefaultBrowser(mPackageName)) {
- mPm.setDefaultBrowserPackageName(null, userId);
+ mPm.setDefaultBrowserPackageNameAsUser(null, userId);
}
try {
mUsbManager.clearDefaults(mPackageName, userId);
@@ -163,7 +163,7 @@
}
private boolean isDefaultBrowser(String packageName) {
- final String defaultBrowser = mPm.getDefaultBrowserPackageName(UserHandle.myUserId());
+ final String defaultBrowser = mPm.getDefaultBrowserPackageNameAsUser(UserHandle.myUserId());
return packageName.equals(defaultBrowser);
}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index a01e18d..dd63e21 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -1097,7 +1097,7 @@
private CharSequence getDomainsSummary(String packageName) {
// If the user has explicitly said "no" for this package, that's the
// string we should show.
- int domainStatus = mPm.getIntentVerificationStatus(packageName, UserHandle.myUserId());
+ int domainStatus = mPm.getIntentVerificationStatusAsUser(packageName, UserHandle.myUserId());
if (domainStatus == PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER) {
return mContext.getString(R.string.domain_urls_summary_none);
}
diff --git a/src/com/android/settings/applications/ManageDefaultApps.java b/src/com/android/settings/applications/ManageDefaultApps.java
index cbba122..73bf837 100644
--- a/src/com/android/settings/applications/ManageDefaultApps.java
+++ b/src/com/android/settings/applications/ManageDefaultApps.java
@@ -98,7 +98,7 @@
final PackageManager pm = getPackageManager();
- String packageName = pm.getDefaultBrowserPackageName(UserHandle.myUserId());
+ String packageName = pm.getDefaultBrowserPackageNameAsUser(UserHandle.myUserId());
if (!TextUtils.isEmpty(packageName)) {
// Check if the default Browser package is still there
Intent intent = new Intent();
@@ -142,7 +142,7 @@
if (TextUtils.isEmpty(packageName)) {
return false;
}
- boolean result = mPm.setDefaultBrowserPackageName(
+ boolean result = mPm.setDefaultBrowserPackageNameAsUser(
packageName.toString(), myUserId);
if (result) {
mDefaultBrowserPreference.setValue(packageName.toString());
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index a53d8b6..b564a27 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -16,10 +16,14 @@
package com.android.settings.dashboard;
import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.v7.widget.PopupMenu;
import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.TypedValue;
+import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
+import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -30,14 +34,21 @@
import com.android.settings.dashboard.conditional.Condition;
import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.DashboardTile;
+import com.android.settingslib.drawer.Tile;
import java.util.ArrayList;
import java.util.List;
-public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder> implements View.OnClickListener {
+public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder>
+ implements View.OnClickListener {
public static final String TAG = "DashboardAdapter";
+ private static int SUGGESTION_MODE_DEFAULT = 0;
+ private static int SUGGESTION_MODE_COLLAPSED = 1;
+ private static int SUGGESTION_MODE_EXPANDED = 2;
+
+ private static final int DEFAULT_SUGGESTION_COUNT = 2;
+
private final List<Object> mItems = new ArrayList<>();
private final List<Integer> mTypes = new ArrayList<>();
private final List<Integer> mIds = new ArrayList<>();
@@ -46,11 +57,14 @@
private List<DashboardCategory> mCategories;
private List<Condition> mConditions;
+ private List<Tile> mSuggestions;
private boolean mIsShowingAll;
// Used for counting items;
private int mId;
+ private int mSuggestionMode = SUGGESTION_MODE_DEFAULT;
+
private Condition mExpandedCondition = null;
public DashboardAdapter(Context context) {
@@ -59,6 +73,11 @@
setHasStableIds(true);
}
+ public void setSuggestions(List<Tile> suggestions) {
+ mSuggestions = suggestions;
+ recountItems();
+ }
+
public void setCategories(List<DashboardCategory> categories) {
mCategories = categories;
@@ -68,7 +87,7 @@
tintColor, true);
for (int i = 0; i < categories.size(); i++) {
for (int j = 0; j < categories.get(i).tiles.size(); j++) {
- DashboardTile tile = categories.get(i).tiles.get(j);
+ Tile tile = categories.get(i).tiles.get(j);
if (!mContext.getPackageName().equals(
tile.intent.getComponent().getPackageName())) {
@@ -78,34 +97,53 @@
}
}
}
- setShowingAll(mIsShowingAll);
+ recountItems();
}
public void setConditions(List<Condition> conditions) {
mConditions = conditions;
- setShowingAll(mIsShowingAll);
+ recountItems();
}
public boolean isShowingAll() {
return mIsShowingAll;
}
- public void notifyChanged(DashboardTile tile) {
+ public void notifyChanged(Tile tile) {
notifyDataSetChanged();
}
public void setShowingAll(boolean showingAll) {
mIsShowingAll = showingAll;
+ recountItems();
+ }
+
+ private void recountItems() {
reset();
+ boolean hasConditions = false;
for (int i = 0; mConditions != null && i < mConditions.size(); i++) {
- countItem(mConditions.get(i), R.layout.condition_card, mConditions.get(i).shouldShow());
+ boolean shouldShow = mConditions.get(i).shouldShow();
+ hasConditions |= shouldShow;
+ countItem(mConditions.get(i), R.layout.condition_card, shouldShow);
+ }
+ boolean hasSuggestions = mSuggestions != null && mSuggestions.size() != 0;
+ countItem(null, R.layout.dashboard_spacer, hasConditions && hasSuggestions);
+ countItem(null, R.layout.suggestion_header, hasSuggestions);
+ if (mSuggestions != null) {
+ int maxSuggestions = mSuggestionMode == SUGGESTION_MODE_DEFAULT
+ ? Math.min(DEFAULT_SUGGESTION_COUNT, mSuggestions.size())
+ : mSuggestionMode == SUGGESTION_MODE_EXPANDED ? mSuggestions.size()
+ : 0;
+ for (int i = 0; i < mSuggestions.size(); i++) {
+ countItem(mSuggestions.get(i), R.layout.suggestion_tile, i < maxSuggestions);
+ }
}
countItem(null, R.layout.dashboard_spacer, true);
for (int i = 0; mCategories != null && i < mCategories.size(); i++) {
DashboardCategory category = mCategories.get(i);
countItem(category, R.layout.dashboard_category, mIsShowingAll);
for (int j = 0; j < category.tiles.size(); j++) {
- DashboardTile tile = category.tiles.get(j);
+ Tile tile = category.tiles.get(j);
countItem(tile, R.layout.dashboard_tile, mIsShowingAll
|| ArrayUtils.contains(DashboardSummary.INITIAL_ITEMS,
tile.intent.getComponent().getClassName()));
@@ -126,6 +164,7 @@
if (add) {
mItems.add(object);
mTypes.add(type);
+ // TODO: Counting namespaces for handling of suggestions/conds appearing/disappearing.
mIds.add(mId);
}
mId++;
@@ -144,7 +183,7 @@
onBindCategory(holder, (DashboardCategory) mItems.get(position));
break;
case R.layout.dashboard_tile:
- final DashboardTile tile = (DashboardTile) mItems.get(position);
+ final Tile tile = (Tile) mItems.get(position);
onBindTile(holder, tile);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
@@ -153,14 +192,28 @@
}
});
break;
- case R.layout.see_all:
- onBindSeeAll(holder);
+ case R.layout.suggestion_header:
+ onBindSuggestionHeader(holder);
+ break;
+ case R.layout.suggestion_tile:
+ final Tile suggestion = (Tile) mItems.get(position);
+ onBindTile(holder, suggestion);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- setShowingAll(!mIsShowingAll);
+ ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
}
});
+ holder.itemView.findViewById(R.id.overflow).setOnClickListener(
+ new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ showRemoveOption(v, suggestion);
+ }
+ });
+ break;
+ case R.layout.see_all:
+ onBindSeeAll(holder);
break;
case R.layout.condition_card:
ConditionAdapterUtils.bindViews((Condition) mItems.get(position), holder,
@@ -175,11 +228,53 @@
}
}
- private void onBindTile(DashboardItemHolder holder, DashboardTile dashboardTile) {
- holder.icon.setImageIcon(dashboardTile.icon);
- holder.title.setText(dashboardTile.title);
- if (!TextUtils.isEmpty(dashboardTile.summary)) {
- holder.summary.setText(dashboardTile.summary);
+ private void showRemoveOption(View v, final Tile suggestion) {
+ PopupMenu popup = new PopupMenu(
+ new ContextThemeWrapper(mContext, R.style.Theme_AppCompat_DayNight), v);
+ popup.getMenu().add(R.string.suggestion_remove).setOnMenuItemClickListener(
+ new MenuItem.OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ mContext.getPackageManager().setComponentEnabledSetting(
+ suggestion.intent.getComponent(),
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+ PackageManager.DONT_KILL_APP);
+ mSuggestions.remove(suggestion);
+ recountItems();
+ return true;
+ }
+ });
+ popup.show();
+ }
+
+ private void onBindSuggestionHeader(final DashboardItemHolder holder) {
+ holder.icon.setImageResource(hasMoreSuggestions() ? R.drawable.ic_expand_more
+ : R.drawable.ic_expand_less);
+ holder.title.setText(mContext.getString(R.string.suggestions_title, mSuggestions.size()));
+ holder.itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (hasMoreSuggestions()) {
+ mSuggestionMode = SUGGESTION_MODE_EXPANDED;
+ } else {
+ mSuggestionMode = SUGGESTION_MODE_COLLAPSED;
+ }
+ recountItems();
+ }
+ });
+ }
+
+ private boolean hasMoreSuggestions() {
+ return mSuggestionMode == SUGGESTION_MODE_COLLAPSED
+ || (mSuggestionMode == SUGGESTION_MODE_DEFAULT
+ && mSuggestions.size() > DEFAULT_SUGGESTION_COUNT);
+ }
+
+ private void onBindTile(DashboardItemHolder holder, Tile tile) {
+ holder.icon.setImageIcon(tile.icon);
+ holder.title.setText(tile.title);
+ if (!TextUtils.isEmpty(tile.summary)) {
+ holder.summary.setText(tile.summary);
holder.summary.setVisibility(View.VISIBLE);
} else {
holder.summary.setVisibility(View.GONE);
@@ -193,6 +288,12 @@
private void onBindSeeAll(DashboardItemHolder holder) {
holder.title.setText(mIsShowingAll ? R.string.see_less
: R.string.see_all);
+ holder.itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ setShowingAll(!mIsShowingAll);
+ }
+ });
}
@Override
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 95170a4..cbb1549 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -33,6 +33,7 @@
import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
import com.android.settings.dashboard.conditional.ConditionManager;
import com.android.settings.dashboard.conditional.FocusRecyclerView;
+import com.android.settingslib.SuggestionParser;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity;
@@ -58,6 +59,7 @@
private DashboardAdapter mAdapter;
private SummaryLoader mSummaryLoader;
private ConditionManager mConditionManager;
+ private SuggestionParser mSuggestionParser;
@Override
protected int getMetricsCategory() {
@@ -76,6 +78,7 @@
if (DEBUG_TIMING) Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime)
+ " ms");
mConditionManager = ConditionManager.get(getContext());
+ mSuggestionParser = new SuggestionParser(getContext(), R.xml.suggestion_ordering);
}
@Override
@@ -135,6 +138,7 @@
mDashboard.setListener(this);
mAdapter = new DashboardAdapter(getContext());
mAdapter.setConditions(mConditionManager.getConditions());
+ mAdapter.setSuggestions(mSuggestionParser.getSuggestions());
mSummaryLoader.setAdapter(mAdapter);
ConditionAdapterUtils.addDismiss(mDashboard);
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index a9dd43a..a94ae83 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -25,7 +25,7 @@
import android.util.Log;
import com.android.settings.SettingsActivity;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.DashboardTile;
+import com.android.settingslib.drawer.Tile;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -38,8 +38,8 @@
public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";
private final Activity mActivity;
- private final ArrayMap<SummaryProvider, DashboardTile> mSummaryMap = new ArrayMap<>();
- private final List<DashboardTile> mTiles = new ArrayList<>();
+ private final ArrayMap<SummaryProvider, Tile> mSummaryMap = new ArrayMap<>();
+ private final List<Tile> mTiles = new ArrayList<>();
private final Worker mWorker;
private final Handler mHandler;
@@ -54,9 +54,9 @@
mWorker = new Worker(mWorkerThread.getLooper());
mActivity = activity;
for (int i = 0; i < categories.size(); i++) {
- List<DashboardTile> tiles = categories.get(i).tiles;
+ List<Tile> tiles = categories.get(i).tiles;
for (int j = 0; j < tiles.size(); j++) {
- DashboardTile tile = tiles.get(j);
+ Tile tile = tiles.get(j);
mWorker.obtainMessage(Worker.MSG_GET_PROVIDER, tile).sendToTarget();
}
}
@@ -71,7 +71,7 @@
}
public void setSummary(SummaryProvider provider, final CharSequence summary) {
- final DashboardTile tile = mSummaryMap.get(provider);
+ final Tile tile = mSummaryMap.get(provider);
mHandler.post(new Runnable() {
@Override
public void run() {
@@ -85,7 +85,7 @@
mWorker.obtainMessage(Worker.MSG_SET_LISTENING, listening ? 1 : 0, 0).sendToTarget();
}
- private SummaryProvider getSummaryProvider(DashboardTile tile) {
+ private SummaryProvider getSummaryProvider(Tile tile) {
if (!mActivity.getPackageName().equals(tile.intent.getComponent().getPackageName())) {
// Not within Settings, can't load Summary directly.
// TODO: Load summary indirectly.
@@ -118,7 +118,7 @@
return null;
}
- private Bundle getMetaData(DashboardTile tile) {
+ private Bundle getMetaData(Tile tile) {
return tile.metaData;
}
@@ -142,7 +142,7 @@
public void handleMessage(Message msg) {
switch (msg.what) {
case MSG_GET_PROVIDER:
- DashboardTile tile = (DashboardTile) msg.obj;
+ Tile tile = (Tile) msg.obj;
SummaryProvider provider = getSummaryProvider(tile);
if (provider != null) {
if (DEBUG) Log.d(TAG, "Creating " + tile);
diff --git a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
index ba1b378..46e0cfe 100644
--- a/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
+++ b/src/com/android/settings/notification/ZenModeVisualInterruptionSettings.java
@@ -38,9 +38,11 @@
private static final String KEY_PEEK = "peek";
private static final String KEY_LIGHTS = "lights";
+ private static final String KEY_SCREEN_ON = "screen_on";
private SwitchPreference mPeek;
private SwitchPreference mLights;
+ private SwitchPreference mScreenOn;
private boolean mDisableListeners;
private NotificationManager.Policy mPolicy;
@@ -78,6 +80,19 @@
return true;
}
});
+
+ mScreenOn = (SwitchPreference) root.findPreference(KEY_SCREEN_ON);
+ mScreenOn.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (mDisableListeners) return true;
+ final boolean val = (Boolean) newValue;
+ MetricsLogger.action(mContext, MetricsLogger.ACTION_ZEN_ALLOW_SCREEN_ON, val);
+ if (DEBUG) Log.d(TAG, "onPrefChange suppressScreenOn=" + val);
+ savePolicy(getNewSuppressedEffects(val, Policy.SUPPRESSED_EFFECT_SCREEN_ON));
+ return true;
+ }
+ });
}
@Override
@@ -100,6 +115,7 @@
mDisableListeners = true;
mPeek.setChecked(isEffectSuppressed(Policy.SUPPRESSED_EFFECT_PEEK));
mLights.setChecked(isEffectSuppressed(Policy.SUPPRESSED_EFFECT_LIGHTS));
+ mScreenOn.setChecked(isEffectSuppressed(Policy.SUPPRESSED_EFFECT_SCREEN_ON));
mDisableListeners = false;
}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 722be0e..5d20f65 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -191,13 +191,13 @@
private void onPreferenceToggled(String preferenceKey, boolean enabled) {
ComponentName service = ComponentName.unflattenFromString(preferenceKey);
- List<ComponentName> services = PrintSettingsUtils.readEnabledPrintServices(getActivity());
+ List<ComponentName> services = PrintSettingsUtils.readDisabledPrintServices(getActivity());
if (enabled) {
- services.add(service);
- } else {
services.remove(service);
+ } else {
+ services.add(service);
}
- PrintSettingsUtils.writeEnabledPrintServices(getActivity(), services);
+ PrintSettingsUtils.writeDisabledPrintServices(getActivity(), services);
}
private ListView getBackupListView() {
@@ -253,8 +253,9 @@
}
private void updateUiForServiceState() {
- List<ComponentName> services = PrintSettingsUtils.readEnabledPrintServices(getActivity());
- mServiceEnabled = services.contains(mComponentName);
+ List<ComponentName> disabledServices = PrintSettingsUtils
+ .readDisabledPrintServices(getActivity());
+ mServiceEnabled = !disabledServices.contains(mComponentName);
if (mServiceEnabled) {
mSwitchBar.setCheckedInternal(true);
mPrintersAdapter.enable();
@@ -431,7 +432,7 @@
public void register(ContentResolver contentResolver) {
contentResolver.registerContentObserver(android.provider.Settings.Secure.getUriFor(
- android.provider.Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
+ android.provider.Settings.Secure.DISABLED_PRINT_SERVICES), false, this);
}
public void unregister(ContentResolver contentResolver) {
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index c2d3ac2..d5cd9c5 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -16,6 +16,7 @@
package com.android.settings.print;
+import android.app.Activity;
import android.app.LoaderManager.LoaderCallbacks;
import android.content.ActivityNotFoundException;
import android.content.AsyncTaskLoader;
@@ -56,11 +57,13 @@
import android.widget.Button;
import android.widget.Spinner;
import android.widget.TextView;
+
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.MetricsLogger;
import com.android.settings.DialogCreatable;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
@@ -204,8 +207,8 @@
mPrintServicesCategory.removeAll();
}
- List<ComponentName> enabledServices = PrintSettingsUtils
- .readEnabledPrintServices(getActivity());
+ List<ComponentName> disabledServices = PrintSettingsUtils
+ .readDisabledPrintServices(getActivity());
final PackageManager pm = getActivity().getPackageManager();
@@ -233,7 +236,7 @@
preference.setFragment(PrintServiceSettingsFragment.class.getName());
preference.setPersistent(false);
- final boolean serviceEnabled = enabledServices.contains(componentName);
+ final boolean serviceEnabled = !disabledServices.contains(componentName);
if (serviceEnabled) {
preference.setSummary(getString(R.string.print_feature_state_on));
} else {
@@ -385,7 +388,7 @@
public void register(ContentResolver contentResolver) {
contentResolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.ENABLED_PRINT_SERVICES), false, this);
+ Settings.Secure.DISABLED_PRINT_SERVICES), false, this);
}
public void unregister(ContentResolver contentResolver) {
@@ -587,20 +590,88 @@
}
return printJobInfos;
}
+ }
- private static boolean shouldShowToUser(PrintJobInfo printJob) {
- switch (printJob.getState()) {
- case PrintJobInfo.STATE_QUEUED:
- case PrintJobInfo.STATE_STARTED:
- case PrintJobInfo.STATE_BLOCKED:
- case PrintJobInfo.STATE_FAILED: {
- return true;
+ /**
+ * Should the print job the shown to the user in the settings app.
+ *
+ * @param printJob The print job in question.
+ * @return true iff the print job should be shown.
+ */
+ private static boolean shouldShowToUser(PrintJobInfo printJob) {
+ switch (printJob.getState()) {
+ case PrintJobInfo.STATE_QUEUED:
+ case PrintJobInfo.STATE_STARTED:
+ case PrintJobInfo.STATE_BLOCKED:
+ case PrintJobInfo.STATE_FAILED: {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Provider for the print settings summary
+ */
+ private static class PrintSummaryProvider
+ implements SummaryLoader.SummaryProvider, PrintJobStateChangeListener {
+ private final Context mContext;
+ private final PrintManager mPrintManager;
+ private final SummaryLoader mSummaryLoader;
+
+ /**
+ * Create a new {@link PrintSummaryProvider}.
+ *
+ * @param context The context this provider is for
+ * @param summaryLoader The summary load using this provider
+ */
+ public PrintSummaryProvider(Context context, SummaryLoader summaryLoader) {
+ mContext = context;
+ mSummaryLoader = summaryLoader;
+ mPrintManager = ((PrintManager) context.getSystemService(Context.PRINT_SERVICE))
+ .getGlobalPrintManagerForUser(context.getUserId());
+ }
+
+ @Override
+ public void setListening(boolean isListening) {
+ if (isListening) {
+ mPrintManager.addPrintJobStateChangeListener(this);
+ onPrintJobStateChanged(null);
+ } else {
+ mPrintManager.removePrintJobStateChangeListener(this);
+ }
+ }
+
+ @Override
+ public void onPrintJobStateChanged(PrintJobId printJobId) {
+ List<PrintJob> printJobs = mPrintManager.getPrintJobs();
+
+ int numActivePrintJobs = 0;
+ final int numPrintJobs = printJobs.size();
+ for (int i = 0; i < numPrintJobs; i++) {
+ if (shouldShowToUser(printJobs.get(i).getInfo())) {
+ numActivePrintJobs++;
}
}
- return false;
+
+ mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
+ R.plurals.print_settings_title, numActivePrintJobs, numActivePrintJobs));
}
}
+ /**
+ * A factory for {@link PrintSummaryProvider providers} the settings app can use to read the
+ * print summary.
+ */
+ public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
+ = new SummaryLoader.SummaryProviderFactory() {
+ @Override
+ public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
+ SummaryLoader summaryLoader) {
+ return new PrintSummaryProvider(activity, summaryLoader);
+ }
+ };
+
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
diff --git a/src/com/android/settings/print/PrintSettingsUtils.java b/src/com/android/settings/print/PrintSettingsUtils.java
index d09f345..87f26be 100644
--- a/src/com/android/settings/print/PrintSettingsUtils.java
+++ b/src/com/android/settings/print/PrintSettingsUtils.java
@@ -30,50 +30,50 @@
*/
public class PrintSettingsUtils {
- private static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
+ private static final char DISABLED_PRINT_SERVICES_SEPARATOR = ':';
private PrintSettingsUtils() {
/* do nothing */
}
- public static List<ComponentName> readEnabledPrintServices(Context context) {
- List<ComponentName> enabledServices = new ArrayList<ComponentName>();
+ public static List<ComponentName> readDisabledPrintServices(Context context) {
+ List<ComponentName> disabledServices = new ArrayList<ComponentName>();
- String enabledServicesSetting = Settings.Secure.getString(context
- .getContentResolver(), Settings.Secure.ENABLED_PRINT_SERVICES);
- if (TextUtils.isEmpty(enabledServicesSetting)) {
- return enabledServices;
+ String disabledServicesSetting = Settings.Secure.getString(context
+ .getContentResolver(), Settings.Secure.DISABLED_PRINT_SERVICES);
+ if (TextUtils.isEmpty(disabledServicesSetting)) {
+ return disabledServices;
}
SimpleStringSplitter colonSplitter = new SimpleStringSplitter(
- ENABLED_PRINT_SERVICES_SEPARATOR);
- colonSplitter.setString(enabledServicesSetting);
+ DISABLED_PRINT_SERVICES_SEPARATOR);
+ colonSplitter.setString(disabledServicesSetting);
while (colonSplitter.hasNext()) {
String componentNameString = colonSplitter.next();
- ComponentName enabledService = ComponentName.unflattenFromString(
+ ComponentName disabledService = ComponentName.unflattenFromString(
componentNameString);
- if (enabledService != null) {
- enabledServices.add(enabledService);
+ if (disabledService != null) {
+ disabledServices.add(disabledService);
}
}
- return enabledServices;
+ return disabledServices;
}
- public static void writeEnabledPrintServices(Context context,
+ public static void writeDisabledPrintServices(Context context,
List<ComponentName> services) {
StringBuilder builder = new StringBuilder();
final int serviceCount = services.size();
for (int i = 0; i < serviceCount; i++) {
ComponentName service = services.get(i);
if (builder.length() > 0) {
- builder.append(ENABLED_PRINT_SERVICES_SEPARATOR);
+ builder.append(DISABLED_PRINT_SERVICES_SEPARATOR);
}
builder.append(service.flattenToString());
}
Settings.Secure.putString(context.getContentResolver(),
- Settings.Secure.ENABLED_PRINT_SERVICES,
+ Settings.Secure.DISABLED_PRINT_SERVICES,
builder.toString());
}
}
diff --git a/src/com/android/settings/users/UserDialogs.java b/src/com/android/settings/users/UserDialogs.java
index 23012b3..3ed383a 100644
--- a/src/com/android/settings/users/UserDialogs.java
+++ b/src/com/android/settings/users/UserDialogs.java
@@ -55,13 +55,7 @@
AlertDialog.Builder builder = new AlertDialog.Builder(context)
.setPositiveButton(R.string.user_delete_button, onConfirmListener)
.setNegativeButton(android.R.string.cancel, null);
- if (UserHandle.myUserId() == removingUserId) {
- builder.setTitle(R.string.user_confirm_remove_self_title);
- builder.setMessage(R.string.user_confirm_remove_self_message);
- } else if (userInfo.isRestricted()) {
- builder.setTitle(R.string.user_profile_confirm_remove_title);
- builder.setMessage(R.string.user_profile_confirm_remove_message);
- } else if (userInfo.isManagedProfile()) {
+ if (userInfo.isManagedProfile()) {
builder.setTitle(R.string.work_profile_confirm_remove_title);
View view = createRemoveManagedUserDialogView(context, removingUserId);
if (view != null) {
@@ -69,6 +63,12 @@
} else {
builder.setMessage(R.string.work_profile_confirm_remove_message);
}
+ } else if (UserHandle.myUserId() == removingUserId) {
+ builder.setTitle(R.string.user_confirm_remove_self_title);
+ builder.setMessage(R.string.user_confirm_remove_self_message);
+ } else if (userInfo.isRestricted()) {
+ builder.setTitle(R.string.user_profile_confirm_remove_title);
+ builder.setMessage(R.string.user_profile_confirm_remove_message);
} else {
builder.setTitle(R.string.user_confirm_remove_title);
builder.setMessage(R.string.user_confirm_remove_message);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 3e2ac87..7e0711e 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -39,6 +39,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceGroup;
@@ -97,7 +98,6 @@
private static final String KEY_ADD_USER = "user_add";
private static final int MENU_REMOVE_USER = Menu.FIRST;
- private static final int MENU_ADD_ON_LOCKSCREEN = Menu.FIRST + 1;
private static final int DIALOG_CONFIRM_REMOVE = 1;
private static final int DIALOG_ADD_USER = 2;
@@ -126,8 +126,9 @@
private PreferenceGroup mUserListCategory;
private UserPreference mMePreference;
- private SelectableEditTextPreference mNicknamePreference;
private Preference mAddUser;
+ private PreferenceGroup mLockScreenSettings;
+ private SwitchPreference mAddUserWhenLocked;
private int mRemovingUserId = -1;
private int mAddedUserId = 0;
private boolean mAddingUser;
@@ -221,6 +222,8 @@
mAddUser.setTitle(R.string.user_add_user_menu);
}
}
+ mLockScreenSettings = (PreferenceGroup) findPreference("lock_screen_settings");
+ mAddUserWhenLocked = (SwitchPreference) findPreference("add_users_when_locked");
loadProfile();
setHasOptionsMenu(true);
IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -272,13 +275,6 @@
getResources().getString(R.string.user_remove_user_menu, nickname));
removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
}
- if (mUserCaps.mIsAdmin && !um.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
- MenuItem allowAddOnLockscreen = menu.add(0, MENU_ADD_ON_LOCKSCREEN, pos++,
- R.string.user_add_on_lockscreen_menu);
- allowAddOnLockscreen.setCheckable(true);
- allowAddOnLockscreen.setChecked(Settings.Global.getInt(getContentResolver(),
- Settings.Global.ADD_USERS_WHEN_LOCKED, 0) == 1);
- }
super.onCreateOptionsMenu(menu, inflater);
}
@@ -288,12 +284,6 @@
if (itemId == MENU_REMOVE_USER) {
onRemoveUserClicked(UserHandle.myUserId());
return true;
- } else if (itemId == MENU_ADD_ON_LOCKSCREEN) {
- final boolean isChecked = item.isChecked();
- Settings.Global.putInt(getContentResolver(), Settings.Global.ADD_USERS_WHEN_LOCKED,
- isChecked ? 0 : 1);
- item.setChecked(!isChecked);
- return true;
} else {
return super.onOptionsItemSelected(item);
}
@@ -809,6 +799,13 @@
mAddUser.setSummary(null);
}
}
+ if (mUserCaps.mIsAdmin && !mUserCaps.mDisallowAddUser) {
+ mLockScreenSettings.setOrder(Preference.DEFAULT_ORDER);
+ preferenceScreen.addPreference(mLockScreenSettings);
+ mAddUserWhenLocked.setChecked(Settings.Global.getInt(getContentResolver(),
+ Settings.Global.ADD_USERS_WHEN_LOCKED, 0) == 1);
+ mAddUserWhenLocked.setOnPreferenceChangeListener(this);
+ }
}
private int getMaxRealUsers() {
@@ -871,12 +868,6 @@
}
}
- private void setUserName(String name) {
- mUserManager.setUserName(UserHandle.myUserId(), name);
- mNicknamePreference.setSummary(name);
- getActivity().invalidateOptionsMenu();
- }
-
@Override
public boolean onPreferenceClick(Preference pref) {
if (pref == mMePreference) {
@@ -974,14 +965,13 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (preference == mNicknamePreference) {
- String value = (String) newValue;
- if (preference == mNicknamePreference && value != null
- && value.length() > 0) {
- setUserName(value);
- }
+ if (preference == mAddUserWhenLocked) {
+ Boolean value = (Boolean) newValue;
+ Settings.Global.putInt(getContentResolver(), Settings.Global.ADD_USERS_WHEN_LOCKED,
+ value != null && value ? 1 : 0);
return true;
}
+
return false;
}
@@ -1007,6 +997,7 @@
boolean mIsAdmin;
boolean mIsGuest;
boolean mCanAddGuest;
+ boolean mDisallowAddUser;
private UserCapabilities() {}
@@ -1021,11 +1012,11 @@
final UserInfo myUserInfo = userManager.getUserInfo(UserHandle.myUserId());
caps.mIsGuest = myUserInfo.isGuest();
caps.mIsAdmin = myUserInfo.isAdmin();
- final boolean disallowAddUser = userManager.hasUserRestriction(
+ caps.mDisallowAddUser = userManager.hasUserRestriction(
UserManager.DISALLOW_ADD_USER);
if (!caps.mIsAdmin || UserManager.getMaxSupportedUsers() < 2
|| !UserManager.supportsMultipleUsers()
- || disallowAddUser) {
+ || caps.mDisallowAddUser) {
caps.mCanAddUser = false;
}
DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
@@ -1037,7 +1028,7 @@
final boolean canAddUsersWhenLocked = caps.mIsAdmin || Settings.Global.getInt(
context.getContentResolver(), Settings.Global.ADD_USERS_WHEN_LOCKED, 0) == 1;
- caps.mCanAddGuest = !caps.mIsGuest && !disallowAddUser && canAddUsersWhenLocked;
+ caps.mCanAddGuest = !caps.mIsGuest && !caps.mDisallowAddUser && canAddUsersWhenLocked;
return caps;
}
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index a6189a9..d145ba3 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -107,7 +107,7 @@
if (button == DialogInterface.BUTTON_POSITIVE) {
// Update KeyStore entry
KeyStore.getInstance().put(Credentials.VPN + profile.key, profile.encode(),
- KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
+ KeyStore.UID_SELF, /* flags */ 0);
// Flush out old version of profile
disconnect(profile);
diff --git a/src/com/android/settings/vpn2/LockdownConfigFragment.java b/src/com/android/settings/vpn2/LockdownConfigFragment.java
index 581b55d..d60cebc 100644
--- a/src/com/android/settings/vpn2/LockdownConfigFragment.java
+++ b/src/com/android/settings/vpn2/LockdownConfigFragment.java
@@ -64,9 +64,6 @@
}
private static String getStringOrNull(KeyStore keyStore, String key) {
- if (!keyStore.isUnlocked()) {
- return null;
- }
final byte[] value = keyStore.get(key);
return value == null ? null : new String(value);
}
@@ -122,7 +119,7 @@
return;
}
keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes(),
- KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
+ KeyStore.UID_SELF, /* flags */ 0);
}
// kick profiles since we changed them
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 00f6a12..40b05c5 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -456,13 +456,6 @@
protected static List<VpnProfile> loadVpnProfiles(KeyStore keyStore, int... excludeTypes) {
final ArrayList<VpnProfile> result = Lists.newArrayList();
- // This might happen if the user does not yet have a keystore. Quietly short-circuit because
- // no keystore means no VPN configs.
- if (!keyStore.isUnlocked()) {
- return result;
- }
-
- // We are the only user of profiles in KeyStore so no locks are needed.
for (String key : keyStore.list(Credentials.VPN)) {
final VpnProfile profile = VpnProfile.decode(key, keyStore.get(Credentials.VPN + key));
if (profile != null && !ArrayUtils.contains(excludeTypes, profile.type)) {
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 87f72f5..403d12a 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -990,7 +990,7 @@
if (deviceOwner != null) {
final int deviceOwnerUserId = dpm.getDeviceOwnerUserId();
try {
- final int deviceOwnerUid = pm.getPackageUid(deviceOwner.getPackageName(),
+ final int deviceOwnerUid = pm.getPackageUidAsUser(deviceOwner.getPackageName(),
deviceOwnerUserId);
isConfigEligibleForLockdown = deviceOwnerUid == config.creatorUid;
} catch (NameNotFoundException e) {