Merge "Wifi details: minor ordering fixes." into oc-dev
diff --git a/Android.mk b/Android.mk
index eeaad0c..349b79c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,10 +22,9 @@
 LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v13 \
-    android-support-v7-appcompat \
-    android-support-v7-cardview \
-    android-support-v7-preference \
     android-support-v7-recyclerview \
+    android-support-v7-preference \
+    android-support-v7-appcompat \
     android-support-v14-preference
 
 LOCAL_JAVA_LIBRARIES := \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6e076a2..c596152 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -213,8 +213,7 @@
         <activity android:name=".search2.SearchActivity"
                   android:label="@string/search_settings"
                   android:icon="@drawable/ic_search_history"
-                  android:parentActivityName="Settings"
-                  android:theme="@style/Theme.Settings.NoActionBar">
+                  android:parentActivityName="Settings">
         </activity>
 
         <!-- Top-level settings -->
diff --git a/res/drawable-hdpi/empty_search_results.png b/res/drawable-hdpi/empty_search_results.png
index 290f0ed..6202a33 100644
--- a/res/drawable-hdpi/empty_search_results.png
+++ b/res/drawable-hdpi/empty_search_results.png
Binary files differ
diff --git a/res/drawable-mdpi/empty_search_results.png b/res/drawable-mdpi/empty_search_results.png
index 9ef49a6..e418d7c 100644
--- a/res/drawable-mdpi/empty_search_results.png
+++ b/res/drawable-mdpi/empty_search_results.png
Binary files differ
diff --git a/res/drawable-xhdpi/empty_search_results.png b/res/drawable-xhdpi/empty_search_results.png
index 92a9392..a92f000 100644
--- a/res/drawable-xhdpi/empty_search_results.png
+++ b/res/drawable-xhdpi/empty_search_results.png
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_search_results.png b/res/drawable-xxhdpi/empty_search_results.png
index 894ed7b..4c549bc 100644
--- a/res/drawable-xxhdpi/empty_search_results.png
+++ b/res/drawable-xxhdpi/empty_search_results.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/empty_search_results.png b/res/drawable-xxxhdpi/empty_search_results.png
index 8f12e96..1aed6ad 100644
--- a/res/drawable-xxxhdpi/empty_search_results.png
+++ b/res/drawable-xxxhdpi/empty_search_results.png
Binary files differ
diff --git a/res/layout/dashboard_header_spacer.xml b/res/layout/dashboard_header_spacer.xml
deleted file mode 100644
index 442ae48..0000000
--- a/res/layout/dashboard_header_spacer.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/search_bar_margin">
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"/>
-</LinearLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index d858697..2ac3dc1 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -20,9 +20,9 @@
               android:layout_height="wrap_content"
               android:gravity="center_vertical"
               android:orientation="horizontal"
-              android:layout_marginBottom="16dp"
               android:paddingStart="?android:attr/listPreferredItemPaddingStart"
               android:paddingTop="16dp"
+              android:paddingBottom="16dp"
               android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
     <LinearLayout
@@ -56,6 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="16dip"
+        android:minWidth="32dp"
         android:text="@string/progress_scanning"/>
 
 </LinearLayout>
diff --git a/res/layout/search_main.xml b/res/layout/search_main.xml
index 6de344d..ab728cd 100644
--- a/res/layout/search_main.xml
+++ b/res/layout/search_main.xml
@@ -18,6 +18,7 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main_content"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"/>
+             android:id="@+id/main_content"
+             android:layout_height="match_parent"
+             android:layout_width="match_parent"
+             android:background="@color/material_grey_300"/>
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index d097cfe..9445e0c 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -15,80 +15,71 @@
 -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/search_panel"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/search_panel_list_background">
 
-    <FrameLayout
-        android:id="@+id/layout_results"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/feedback_popup"
-        android:orientation="vertical">
+    <LinearLayout android:id="@+id/layout_recent_searches"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center"
+                  android:orientation="vertical"
+                  android:layout_alignParentTop="true">
 
         <!-- Padding is included in the background -->
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/list_results"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/dashboard_padding_start"
-            android:paddingEnd="@dimen/dashboard_padding_end"
-            android:paddingTop="@dimen/dashboard_padding_top"
-            android:paddingBottom="@dimen/dashboard_padding_bottom"
-            android:scrollbarStyle="outsideOverlay"
-            android:scrollbars="vertical"/>
+        <android.support.v7.widget.RecyclerView android:id="@+id/list_recent_searches"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent"
+                  android:paddingStart="@dimen/dashboard_padding_start"
+                  android:paddingEnd="@dimen/dashboard_padding_end"
+                  android:paddingTop="@dimen/dashboard_padding_top"
+                  android:paddingBottom="@dimen/dashboard_padding_bottom"
+                  android:scrollbarStyle="outsideOverlay"
+                  android:headerDividersEnabled="false"
+                  android:elevation="@dimen/search_panel_elevation"/>
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/layout_results"
+                  android:layout_width="match_parent"
+                  android:layout_height="fill_parent"
+                  android:layout_above="@id/feedback_popup"
+                  android:orientation="vertical">
+
+        <!-- Padding is included in the background -->
+        <android.support.v7.widget.RecyclerView android:id="@+id/list_results"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:paddingStart="@dimen/dashboard_padding_start"
+                  android:paddingEnd="@dimen/dashboard_padding_end"
+                  android:paddingTop="@dimen/dashboard_padding_top"
+                  android:paddingBottom="@dimen/dashboard_padding_bottom"
+                  android:scrollbarStyle="outsideOverlay"
+                  android:scrollbars="vertical"/>
 
         <LinearLayout
             android:id="@+id/no_results_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="96dp"
+            android:paddingTop="80dp"
             android:orientation="vertical"
             android:visibility="gone">
 
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="?android:attr/actionBarSize"/>
-
             <ImageView
-                android:layout_height="160dp"
-                android:layout_width="160dp"
-                android:layout_gravity="center_horizontal"
-                android:src="@drawable/empty_search_results"/>
+            android:layout_height="160dp"
+            android:layout_width="160dp"
+            android:layout_gravity="center_horizontal"
+            android:src="@drawable/empty_search_results"/>
 
             <TextView
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:paddingTop="24dp"
-                android:textSize="18sp"
-                android:text="@string/search_settings_no_results"
-                android:gravity="center"/>
-
-        </LinearLayout>
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/search_bar"
-            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/search_bar_margin"
-            app:cardCornerRadius="2dp"
-            app:cardBackgroundColor="?android:attr/colorBackground"
-            app:cardElevation="2dp">
-
-            <SearchView
-                android:id="@+id/search_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:iconifiedByDefault="false"
-                android:imeOptions="actionSearch|flagNoExtractUi"
-                android:theme="?android:attr/actionBarTheme"/>
-
-        </android.support.v7.widget.CardView>
-
-    </FrameLayout>
+            android:layout_width="match_parent"
+            android:paddingTop="24dp"
+            android:textSize="18sp"
+            android:text="@string/search_settings_no_results"
+            android:gravity="center"/>
+        </LinearLayout>
+    </LinearLayout>
 
     <include layout="@layout/search_feedback"/>
-
 </RelativeLayout>
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index 1a3b133..c10193c 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -18,31 +18,7 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent">
-    <FrameLayout
-        android:id="@+id/main_content"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"/>
-    <android.support.v7.widget.CardView
-        android:id="@+id/search_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/search_bar_margin"
-        app:cardCornerRadius="2dp"
-        app:cardBackgroundColor="?android:attr/colorBackground"
-        app:cardElevation="2dp">
-        <Toolbar
-            android:id="@+id/search_action_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/search_bar_negative_margin"
-            android:background="?android:attr/selectableItemBackground"
-            android:navigationIcon="@drawable/ic_search_24dp"
-            android:title="@string/search_menu"
-            android:titleTextAppearance="?android:attr/subtitleTextAppearance"
-            android:titleTextColor="?android:attr/textColorHint"
-            android:theme="?android:attr/actionBarTheme"/>
-    </android.support.v7.widget.CardView>
-</FrameLayout>
+             android:id="@+id/main_content"
+             android:layout_height="match_parent"
+             android:layout_width="match_parent"
+             />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ee8850b..5970062 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Weier"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Maak toe"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Skakel oor"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Nog net <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappe oor voordat jy \'n ontwikkelaar is.</item>
       <item quantity="one">Nog net <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> stap oor voordat jy \'n ontwikkelaar is.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Kennisgewings"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Gevorderd"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Werkkennisgewings"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Laat kennisgewingkolle toe"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Flikkerende lig"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op die sluitskerm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Moet nooit hierdie kennisgewings wys nie"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Wys kennisgewings"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Moet nooit kennisgewings in die skadu of op randtoestelle wys nie"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Laat kennisgewingkol toe"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Wys kennisgewingkol"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoreer Moenie Steur Nie"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Laat hierdie kennisgewings steeds onderbreek wanneer Moenie Steur Nie na \'Net prioriteit\' gestel is"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op die sluitskerm"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 561ec4f..b71e341 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"ይከልክሉ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ዝጋ"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"ቀይር"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"ያልታወቀ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።</item>
       <item quantity="other">አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 32aa721..e2d89de 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"رفض"</string>
     <string name="dlg_close" msgid="7471087791340790015">"إغلاق"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"تبديل"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"غير معروف"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="zero">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج أية خطوة (<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>).</item>
       <item quantity="two">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج سوى خطوتين (<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>).</item>
@@ -2886,8 +2885,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"الإشعارات"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"متقدمة"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"إشعارات العمل"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"السماح بنقاط الإشعار"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"وميض الضوء"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"على شاشة التأمين"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"عرض كل محتوى الإشعارات"</string>
@@ -2980,10 +2978,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"عدم عرض هذه الإشعارات"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"عرض الإشعارات"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"‏عدم عرض الإشعارات في مركز الإشعارات أو على الأجهزة المرتبطة بحساب Google"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"السماح بنقطة الإشعار"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"إظهار نقطة الإشعار"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"إلغاء وضع \"عدم الإزعاج\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"السماح لهذه الإشعارات بمتابعة المقاطعة عند تعيين وضع \"عدم الإزعاج\" على \"ذات الأولوية فقط\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"على شاشة التأمين"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 14b5370..8f15640 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Rədd edin"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Qapadın"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Keçid"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Naməlum"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Tərtibatçı olmaqdan <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> addım uzaqsınız.</item>
       <item quantity="one">Tərtibatçı olmaqdan <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> addım uzaqsınız.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Bildirişlər"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Qabaqcıl"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"İş bildirişləri"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Bildiriş nöqtələrinə icazə verin"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Parıltı işığı"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Ekran kilidində"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bütün bildiriş məzmunlarını göstər"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirişlər heç vaxt göstərilməsin"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bildirişləri göstərin"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Bildirişləri heç vaxt ekranda və ya periferik cihazlarda göstərməyin."</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Bildiriş nöqtəsinə icazə verin"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildiriş nöqtəsini göstərin"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Narahat etməyin\" seçimini əvəzləyin"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Narahat Etməyin seçimi Yalnız Prioritet üçün ayarlandıqda bildirişlərin mane olmasına imkan verin"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekran kilidində"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 1d047df..6dd15e5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prebaci na"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Treba da obavite još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak da biste postali programer.</item>
       <item quantity="few">Treba da obavite još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka da biste postali programer.</item>
@@ -2805,8 +2804,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obaveštenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredna"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obaveštenja za Work"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Dozvoli tačke za obaveštenja"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Uključi treperenje lampice"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obaveštenja"</string>
@@ -2890,10 +2888,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obaveštenja"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikazuj obaveštenja"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Obaveštenja se nikada ne prikazuju na traci ili periferijskim uređajima"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Dozvoli tačku za obaveštenja"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Prikazuj tačku za obaveštenja"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zameni režim Ne uznemiravaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Omogućava da ova obaveštenja nastave da se prikazuju kada je režim Ne uznemiravaj podešen na opciju Samo prioritetni prekidi"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0b9f0ec..c613c67 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Адмовіць"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Закрыць"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Пераключыць"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Невядома"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Зараз вы ў <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроку ад таго, каб стаць распрацоўшчыкам.</item>
       <item quantity="few">Зараз вы ў <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроках ад таго, каб стаць распрацоўшчыкам.</item>
@@ -2833,8 +2832,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Апавяшчэнні"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Пашыраныя"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Апавяшчэнні працоўнага профілю"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Паказваць значкі апавяшчэнняў"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Мігценне святла"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На экране блакіроўкі"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Паказваць усё змесціва ў апавяшчэннях"</string>
@@ -2921,10 +2919,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ніколі не паказваць гэтыя апавяшчэнні"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Паказваць апавяшчэнні"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколі не паказваць апавяшчэнні на \"шторцы\" або на перыферыйных прыладах"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Паказваць значок апавяшчэнняў"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Паказваць значок апавяшчэнняў"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ігнараваць рэжым «Не турбаваць»"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Паказваць гэтыя апавяшчэнні, калі ў рэжыме «Не турбаваць» выбрана «Толькі прыярытэтныя»"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На экране блакіроўкі"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3ce80a1..e86f031 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Отказ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Затваряне"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Превключване"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Вече сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> стъпки от това, да бъдете програмист.</item>
       <item quantity="one">Вече сте на <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> стъпка от това, да бъдете програмист.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Известия"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Разширени"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Служебни известия"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Точки за известия: Разрешаване"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Премигваща светлина"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Върху заключения екран"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Цялото съдържание от известията"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Без показване на тези известия"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Показване на известията"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Без показване на известия в падащия панел или на периферни устройства"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Разрешаване на точката за известия"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Показване на точката за известия"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отмяна на „Не безпокойте“"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешаване на тези известия да продължат да ви прекъсват, когато за режим „Не безпокойте“ е зададено „Само с приоритет“."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Върху заключения екран"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 6311d3f..accc6f7 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"আস্বীকার করুন"</string>
     <string name="dlg_close" msgid="7471087791340790015">"বন্ধ করুন"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"পাল্টান"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"অজানা"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
       <item quantity="other">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"বিজ্ঞপ্তি"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"উন্নত"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"কর্মস্থলের বিজ্ঞপ্তিগুলি"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"একাধিক বিজ্ঞপ্তি ডট দেখাতে দিন"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"মিটমিট করা আলো"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"লক স্ক্রীনে"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"সমস্ত বিজ্ঞপ্তির সামগ্রীগুলি দেখান"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"এই বিজ্ঞপ্তিগুলি কখনোই দেখানো হবে না"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"বিজ্ঞপ্তিগুলি দেখান"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ছায়া বা পেরিফেরাল ডিভাইসে কখনও বিজ্ঞপ্তিগুলি দেখায় না"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"বিজ্ঞপ্তির ডট দেখানোর অনুমতি দিন"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"বিজ্ঞপ্তির ডট দেখান"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'বিরক্ত করবেন না\' ওভাররাইড করুন"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"যখন শুধুমাত্র অগ্রাধিকার সাপেক্ষে \'বিরক্ত করবেন না\' সেট করা থাকবে তখন বাধাদানের ক্ষেত্রে এই বিজ্ঞপ্তিগুলিকে চালু থাকতে দিন"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"লক স্ক্রীনে"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 73e94ac..b921de6 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prebaci"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas dijeli od toga da postanete programer.</item>
       <item quantity="few">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka vas dijele od toga da postanete programer.</item>
@@ -2818,8 +2817,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obavještenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obavještenja za posao"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Dozvoli tačke za obavještenja"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Trepćuće svjetlo"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikazuj sav sadržaj obavještenja"</string>
@@ -2903,10 +2901,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obavještenja"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikaži obavještenja"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikad ne prikazuj obavještenja u nijansi ili na perifernim uređajima"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Dozvoli tačku za obavještenja"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Prikaži tačku za obavještenja"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Premosti podešenja usluge Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Dozvolite da se ova obavještenja i dalje čuju kada je opcija Ne ometaj podešena na Samo prioritetna obavještenja"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4ce526d..627b064 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Denega"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Tanca"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Canvia"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Ara només et queden <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos per convertir-te en desenvolupador.</item>
       <item quantity="one">Ara només et queda <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> pas per convertir-te en desenvolupador.</item>
@@ -156,7 +155,7 @@
     <string name="bluetooth_map_request" msgid="4595727689513143902">"Sol·licitud d\'accés al missatge"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s vol accedir als teus missatges. Vols donar-li accés a %2$s?"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"Sol·licitud d\'accés a la SIM"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vol accedir a la targeta SIM. Si hi concedeixes accés, es desactivarà la connectivitat de dades al dispositiu mentre duri la connexió. Dóna accés a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> vol accedir a la targeta SIM. Si hi concedeixes accés, es desactivarà la connectivitat de dades al dispositiu mentre duri la connexió. Dona accés a <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
     <string name="date_and_time" msgid="9062980487860757694">"Data i hora"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -1471,7 +1470,7 @@
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Defineix el patró de desbloqueig"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Canvia el patró de desbloqueig"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Com crear un patró de desbloqueig"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Massa intents incorrectes. Torna-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Has superat el nombre d\'intents incorrectes permesos. Torna-ho a provar d\'aquí a <xliff:g id="NUMBER">%d</xliff:g> segons."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"L\'aplicació no està instal·lada al telèfon."</string>
     <string name="lock_settings_profile_title" msgid="2121876391814535295">"Seguretat del perfil professional"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Bloqueig de pantalla del perfil professional"</string>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacions"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacions de la feina"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permet els punts de notificació"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Llum intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"A la pantalla de bloqueig"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostris mai aquestes notificacions"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notificacions"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostris mai notificacions a l\'àrea de notificacions ni en dispositius perifèrics"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permet el punt de notificació"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostra el punt de notificació"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Fes prioritària"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permet que aquestes notificacions continuïn interrompent quan el mode No molestis estigui configurat com a Només amb prioritat"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A la pantalla de bloqueig"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ab02210..b19f921 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odmítnout"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zavřít"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Přepnout"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroky a bude z vás vývojář.</item>
       <item quantity="many">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroku a bude z vás vývojář.</item>
@@ -2832,8 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Oznámení"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Rozšířená nastavení"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pracovní oznámení"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Povolit puntíky s oznámeními"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blikání kontrolky"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na obrazovce uzamčení"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazit veškerý obsah oznámení"</string>
@@ -2920,10 +2918,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Tato oznámení nikdy nezobrazovat"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Zobrazovat oznámení"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nezobrazovat oznámení na panelu ani v periferních zařízeních"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Povolit puntík s oznámením"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Zobrazit puntík s oznámením"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Přepsat nastavení Nerušit"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožnit těmto oznámením vyrušit mě, pokud je v nastavení Nerušit vybrána možnost Pouze prioritní"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na obrazovce uzamčení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b5ff8e1..83a205a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Afvis"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Luk"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Skift"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Du er nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skridt fra at være udvikler.</item>
       <item quantity="other">Du er nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skridt fra at være udvikler.</item>
@@ -2143,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Loginlageret kan ikke ryddes."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Lager for loginoplysninger er aktiveret."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du skal angive en pinkode eller adgangskode til skærmlåsen, før du kan bruge lageret til loginoplysninger."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Apps med brugsadgang"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apps med adgang til forbrug"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sikkerhedskopiering"</string>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Underretninger"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanceret"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Arbejdsunderretninger"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Tillad underretningscirkler"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinkende lys"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låseskærmen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt indhold i underretninger"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Vis aldrig disse underretninger"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Vis underretninger"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Vis aldrig underretninger i underretningspanelet eller på eksterne enheder"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Tillad underretningscirkel"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Vis underretningscirkel"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Tilsidesæt Forstyr ikke"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lad disse underretninger fortsætte med at afbryde, når Forstyr ikke er slået til med angivelsen Kun prioritet"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskærmen"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f6bab5d..339133a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Ablehnen"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Schließen"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Wechseln"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">In <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> Schritten bist du Entwickler.</item>
       <item quantity="one">In <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> Schritt bist du Entwickler.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Benachrichtigungen"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Erweitert"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Geschäftliche Benachrichtigungen"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Benachrichtigungspunkte erlauben"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinklicht"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Auf dem Sperrbildschirm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Benachrichtigungsinhalt anzeigen"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen niemals anzeigen"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Benachrichtigungen anzeigen"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Benachrichtigungspunkt erlauben"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Benachrichtigungspunkt anzeigen"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann empfangen werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Auf dem Sperrbildschirm"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 5ffe66d..c8f0a6d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Απόρριψη"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Κλείσιμο"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Εναλλαγή"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Απομένουν <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής.</item>
       <item quantity="one">Απομένει<xliff:g id="STEP_COUNT_0">%1$d</xliff:g> βήμα για να γίνετε προγραμματιστής.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Ειδοποιήσεις"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Σύνθετες ρυθμίσεις"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Ειδοποιήσεις εργασίας"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Να επιτρέπονται οι κουκκίδες ειδοποίησης"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Φως που αναβοσβήνει"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Στο κλείδωμα οθόνης"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Εμφάνιση όλου του περιεχ. ειδοπ."</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Να μην εμφανίζονται ποτέ αυτές οι ειδοποιήσεις"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Εμφάνιση ειδοποιήσεων"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Να μην εμφανίζονται ποτέ ειδοποιήσεις στο πλαίσιο σκίασης ειδοποιήσεων ή σε περιφερειακές συσκευές"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Να επιτρέπεται η κουκκίδα ειδοποίησης"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Εμφάνιση κουκκίδας ειδοποίησης"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Παράκαμψη λειτουργίας \"Μην ενοχλείτε\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Να επιτραπεί σε αυτές τις ειδοποιήσεις να εξακολουθήσουν να διακόπτουν τη λειτουργία \"Μην ενοχλείτε\" όταν έχει οριστεί σε Μόνο προτεραιότητας"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Στο κλείδωμα οθόνης"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 4ee6ff5..700fd42 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="one">You are now <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> step away from being a developer.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Allow notification dot"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Show notification dot"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 4ee6ff5..700fd42 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="one">You are now <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> step away from being a developer.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Allow notification dot"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Show notification dot"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 4ee6ff5..700fd42 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Deny"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="one">You are now <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> step away from being a developer.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work notifications"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Allow notification dots"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blink light"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"On the lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Never show these notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Show notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Never show notifications in the shade or on peripheral devices"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Allow notification dot"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Show notification dot"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Override Do Not Disturb"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Let these notifications continue to interrupt when Do Not Disturb is set to Priority Only"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"On the lock screen"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 9f8a191..88dd648 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Rechazar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Cerrar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
       <item quantity="one">Estás a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser programador.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanzada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Activar puntos de notificación"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla bloqueada"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas las notificaciones"</string>
@@ -2858,10 +2856,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar estas notificaciones"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar notificaciones en el panel ni en dispositivos periféricos"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir punto de notificación"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar punto de notificación"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular No molestar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificaciones sigan interrumpiendo cuando No molestar esté configurado como Solo prioridad"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla bloqueada"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a3f0fbe..93d6b15 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,13 +23,12 @@
     <string name="deny" msgid="6947806159746484865">"Denegar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Cerrar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Solo te quedan <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser un desarrollador.</item>
       <item quantity="one">Solo te queda <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser un desarrollador.</item>
     </plurals>
-    <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora están activadas las opciones de desarrollo!"</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"Las opciones de desarrollo ya están activadas."</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora están activadas las opciones para desarrolladores!"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"Las opciones para desarrolladores ya están activadas."</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"Conexiones inalámbricas y redes"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"Conexiones"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificaciones"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Opciones avanzadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir puntos notificación"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz parpadeante"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla de bloqueo"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de las notificaciones"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar nunca estas notificaciones"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar nunca notificaciones en el panel de notificaciones ni en dispositivos periféricos"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir punto de notificación"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar punto de notificación"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Priorizar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"No bloquear notificaciones cuando la opción No molestar esté establecida en Solo prioritarias"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla de bloqueo"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index b1b40e4..23dfaa6 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Keela"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Sule"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Lüliti"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Olete nüüd <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> sammu kaugusel arendajastaatusest.</item>
       <item quantity="one">Olete nüüd <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> sammu kaugusel arendajastaatusest.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Märguanded"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Täpsemad"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Töö märguanded"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Luba märguandetäpid"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Vilkuv tuli"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Lukustuskuval"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Kuva kogu märguande sisu"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ära kunagi näita neid märguandeid"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Kuva märguanded"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ära kuva märguandeid kunagi märguandealal ega välisseadmetes"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Luba märguandetäpp"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Kuva märguandetäpp"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Funktsiooni Mitte segada alistamine"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lubage nendel märguannetel teid jätkuvalt katkestada, kui funktsioon Mitte segada on määratud valikule Ainult prioriteetsed"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukustuskuval"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 5739964..2927410 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Ukatu"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Itxi"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Aldatu"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ezezaguna"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> urrats falta zaizkizu garatzaile izateko.</item>
       <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g> urrats falta zaizu garatzaile izateko.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Jakinarazpenak"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Ezarpen aurreratuak"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Laneko jakinarazpenak"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Baimendu jakinarazteko biribiltxoak erakustea"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Argi keinukaria"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pantaila blokeatuan"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Erakutsi jakinarazpenen eduki guztia"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ez erakutsi jakinarazpen hauek inoiz"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Erakutsi jakinarazpenak"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ez erakutsi inoiz jakinarazpenak edo ilundutako eremuetan edo gailu osagarrietan"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Baimendu jakinarazteko biribiltxoa erakustea"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Erakutsi jakinarazteko biribiltxoa"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Ez molestatu\" moduaren salbuespenak"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Baimendu jakinarazpenek jarduera etenaraztea \"Ez molestatu\" aukera Lehentasunezkoak soilik gisa ezarrita dagoenean"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pantaila blokeatuan"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e87a53c..a48a2cb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"اجازه ندارد"</string>
     <string name="dlg_close" msgid="7471087791340790015">"بستن"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"تغییر حالت"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"ناشناس"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">اکنون <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم با برنامه‌نویس شدن فاصله دارید.</item>
       <item quantity="other">اکنون <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم با برنامه‌نویس شدن فاصله دارید.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"اعلان‌ها"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"پیشرفته"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"اعلان‌های کار"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"اجازه به نقطه‌های اعلان"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"نور چشمک‌زن"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"روی قفل صفحه"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"نمایش همه محتوای اعلان"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"هرگز این اعلان‌ها نشان داده نشوند"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"نمایش اعلان‌ها"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"هرگز اعلان‌ها در کشوی اعلانات یا در دستگاه‌های جانبی نشان داده نشوند"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"اجازه به نقطه اعلان"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"نمایش نقطه اعلان"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"لغو «مزاحم نشوید»"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"به این اعلان‌ها اجازه داده شود در شرایطی که «مزاحم نشوید» روی «فقط اولویت‌دار» تنظیم شده است، همچنان وقفه ایجاد کنند"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"در قفل صفحه"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index e599689..0b19e73 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Hylkää"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Sulje"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Vaihda"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Enää <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> vaihetta, niin sinusta tulee kehittäjä.</item>
       <item quantity="one">Enää <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> vaihe, niin sinusta tulee kehittäjä.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Ilmoitukset"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Lisäasetukset"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Työilmoitukset"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Salli pistemerkit"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Vilkuta valoa"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Lukitusnäytöllä"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Näytä ilmoitusten koko sisältö."</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Älä koskaan näytä näitä ilmoituksia"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Näytä ilmoitukset"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Älä näytä ilmoituksia ilmoitusalueella tai lisälaitteissa"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Salli pistemerkki"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Näytä pistemerkki"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ohita Älä häiritse -asetus"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Salli ilmoituksien näyttö, vaikka Älä häiritse -asetus on Vain tärkeät."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Lukitusnäytöllä"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 61a2a2d..db43b66 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Refusers"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fermer"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Changer"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Plus qu’<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir un développeur.</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir un développeur.</item>
@@ -274,7 +273,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Mode avion"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Plus"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sans fil et réseaux"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les RPV"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"Données cellulaires"</string>
     <string name="calls_title" msgid="3544471959217176768">"Appels"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"Messages texte"</string>
@@ -2395,7 +2394,7 @@
     <string name="vpn_save" msgid="4233484051644764510">"Enregistrer"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Connexion"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"Remplacer"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"Modifier le profil VPN"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Modifier le profil RPV"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Supprimer"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Se connecter à <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Déconnecter ce RPV?"</string>
@@ -2412,19 +2411,19 @@
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> n\'est pas en mesure de se connecter"</string>
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Cette application ne prend pas en charge le RPV permanent"</string>
     <string name="vpn_title" msgid="6317731879966640551">"RPV"</string>
-    <string name="vpn_create" msgid="5628219087569761496">"Ajouter un profil VPN"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Ajouter un profil RPV"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modifier le profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Supprimer le profil"</string>
-    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN permanent"</string>
+    <string name="vpn_menu_lockdown" msgid="7863024538064268139">"RPV permanent"</string>
     <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Aucun RPV ajouté"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"Rester connecté au RPV en permanence"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Non compatible avec cette application"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"RPV toujours actif : activé"</string>
     <string name="vpn_require_connection" msgid="8388183166574269666">"Bloquer les connexions sans RPV"</string>
     <string name="vpn_require_connection_title" msgid="159053539340576331">"Exiger une connexion RPV?"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil VPN auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce VPN."</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Sélectionnez un profil RPV auquel rester connecté en permanence. Le trafic réseau ne sera autorisé que lorsque vous serez connecté à ce RPV."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Aucun"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Le VPN permanent nécessite une adresse IP pour le serveur et le DNS."</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Le RPV permanent nécessite une adresse IP pour le serveur et le DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Aucune connexion réseau. Veuillez réessayer plus tard."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"Déconnecté du RPV"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Aucun"</string>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifications professionnelles"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Autoriser points de notification"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Faire clignoter le voyant"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"À l\'écran de verrouillage"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ne jamais afficher ces notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afficher les notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ne jamais afficher les notifications dans l\'ombre ou sur des appareils périphériques"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Autoriser le point de notification"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Afficher le point de notification"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer le mode « Ne pas déranger »"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Activer les notifications de cette application même lorsque l\'option « Ne pas déranger » est définie sur « Prioritaires uniquement »"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"À l\'écran de verrouillage"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cce11c9..094b684 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Refuser"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fermer"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Changer"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir développeur</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir développeur</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifications profil pro"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Autoriser pastilles notification"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Clignotement"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sur l\'écran de verrouillage"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ne jamais afficher ces notifications"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afficher les notifications"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ne jamais afficher les notifications dans le volet ou sur les périphériques"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Autoriser la pastille de notification"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Afficher la pastille de notification"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorer l\'option \"Ne pas déranger\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Autoriser les interruptions par ces notifications lorsque l\'option \"Ne pas déranger\" est définie sur \"Prioritaires uniquement\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sur l\'écran de verrouillage"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index b7a2391..f6f5d07 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Rexeitar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Pechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Descoñecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Agora estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
       <item quantity="one">Agora estás a <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> paso de ser programador.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacións"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Configuración avanzada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacións do traballo"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir punto de notificación"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na pantalla de bloqueo"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o contido das notificacións"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Non mostrar nunca estas notificacións"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificacións"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Non mostra nunca as notificacións no menú despregable da parte superior da pantalla nin en dispositivos periféricos"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir punto de notificacións"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar punto de notificacións"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular opción Non molestar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificacións sigan interrompendo cando a opción Non molestar estea configurada como Só prioridade"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na pantalla de bloqueo"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index a6775c8..9bebeb9 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"નકારો"</string>
     <string name="dlg_close" msgid="7471087791340790015">"બંધ કરો"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"સ્વિચ કરો"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"અજાણ્યું"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">તમે હવે એક વિકાસકર્તા બનવાથી <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> પગલાં દૂર છો.</item>
       <item quantity="other">તમે હવે એક વિકાસકર્તા બનવાથી <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> પગલાં દૂર છો.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"સૂચનાઓ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"વિગતવાર"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"કાર્યની સૂચનાઓ"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"સૂચના બિંદુઓને મંજૂરી આપો"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"લાઇટ ઝબકવી"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"લૉક સ્ક્રીન પર"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"તમામ સૂચના સામગ્રી બતાવો"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"આ સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"સૂચનાઓ બતાવો"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"સૂચનાઓ ક્યારેય શૅડમાં અથવા પેરિફેરલ ઉપકરણો પર બતાવશો નહીં"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"સૂચના બિંદુને મંજૂરી આપો"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"સૂચના બિંદુ બતાવો"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ખલેલ પાડશો નહીં ને ઓવરરાઇડ કરો"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"જયારે ખલેલ પાડશો નહીં ને માત્ર પ્રાધાન્યતા પર સેટ કરેલું હોય ત્યારે આ સૂચનાઓને દખલગીરી કરવા દો"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"લૉક સ્ક્રીન પર"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8292e5a..fc28216 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"अस्वीकार करें"</string>
     <string name="dlg_close" msgid="7471087791340790015">"बंद करें"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"स्‍विच करें"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">अब आप डेवलपर बननेे से <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर हैं.</item>
       <item quantity="other">अब आप डेवलपर बननेे से <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर हैं.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"नोटिफ़िकेशन"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"उन्नत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्य नोटिफ़िकेशन"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"नोटिफ़िकेशन बिंदुओं की अनुमति दें"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीन पर"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी नोटिफ़िकेशन सामग्री दिखाएं"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ये नोटिफिकेशन कभी ना दिखाएं"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"नोटिफ़िकेशन दिखाएं"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"नोटिफ़िकेशन कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"नोटिफ़िकेशन बिंदु की अनुमति दें"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"नोटिफ़िकेशन बिंदु दिखाएं"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान ना करें को ओवरराइड करें"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब परेशान ना करें को केवल प्राथमिकता पर सेट किया गया हो, तब इन नोटिफिकेशन को बाधित करते रहने दें"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीन पर"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0e245d4..e2f4857 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Promijeni"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak i postat ćete razvojni programer.</item>
       <item quantity="few">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka i postat ćete razvojni programer.</item>
@@ -2805,8 +2804,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obavijesti"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obavijesti s radnog profila"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Dopusti točke obavijesti"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Trepereće svjetlo"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom zaslonu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavijesti"</string>
@@ -2890,10 +2888,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikad ne prikazuj te obavijesti"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikaži obavijesti"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikad ne prikazuj obavijesti na zaslonu obavijesti ili na perifernim uređajima"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Dopusti točku obavijesti"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Prikaži točku obavijesti"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nadjačaj Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Neka te obavijesti nastave prekidati kada je način Ne ometaj postavljen na Samo prioritetno"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom zaslonu"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 27ed2be..b35d2a2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Elutasítás"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Bezárás"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Váltás"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen.</item>
       <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen.</item>
@@ -2780,8 +2779,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Értesítések"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Speciális"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Munkahelyi profil értesítései"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Értesítési pöttyök engedélyezése"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Villogó fény"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"A lezárási képernyőn"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Az összes értesítés jelenjen meg"</string>
@@ -2862,10 +2860,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Soha ne jelenjenek meg ezek az értesítések"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Értesítések megjelenítése"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Soha ne jelenjen meg értesítés az értesítési felületen és a perifériás eszközökön"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Értesítési pötty engedélyezése"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Értesítési pötty megjelenítése"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"A Ne zavarjanak mód felülbírálása"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"A Ne zavarjanak mód „Csak prioritásos” beállítása esetén ezek az értesítések továbbra is zavarhatnak"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"A lezárási képernyőn"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 002766b..8cf4136 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Մերժել"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Փակել"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Փոխարկել"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Անհայտ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Ծրագրավորող դառնալու համար ձեզ մնացել է կատարել <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> քայլ:</item>
       <item quantity="other">Ծրագրավորող դառնալու համար ձեզ մնացել է կատարել <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> քայլ:</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Ծանուցումներ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Լրացուցիչ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Աշխատանքային ծանուցումներ"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Ծանուցուման կետերի թույլատրում"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Թարթող լույս"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Կողպէկրանին"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ամբողջ ծանուցումը"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Երբեք չցուցադրել այս ծանուցումները"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Ցուցադրել ծանուցումները"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Երբեք չցուցադրել ծանուցումները ստվերում կամ արտաքին սարքերի վրա"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Ծանուցուման կետի թույլատրում"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Ծանուցուման կետի ցուցադրում"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Վրագրել «Չանհանգստացնել» պարամետրը"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Թույլ տալ այս ծանուցումների կողմից ընդհատումները, երբ «Չանհանգստացնել» պարամետրի համար նշանակված է «Միայն կարևորները» արժեքը"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Կողպէկրանին"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 05aebe4..ccd609d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Tolak"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Tutup"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Beralih"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Tinggal <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah untuk menjadi pengembang.</item>
       <item quantity="one">Tinggal <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> langkah untuk menjadi pengembang.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifikasi"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Lanjutan"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifikasi kerja"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Izinkan titik notifikasi"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Cahaya kedip"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Di layar kunci"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Menampilkan semua konten notifikasi"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Jangan pernah tampilkan notifikasi ini"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Tampilkan notifikasi"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Jangan pernah tampilkan notifikasi di bayangan atau di perangkat periferal"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Izinkan titik notifikasi"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Tampilkan titik notifikasi"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ganti mode Jangan Ganggu"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Izinkan notifikasi ini terus mengganggu jika mode Jangan Ganggu disetel ke Hanya Prioritas"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Di layar kunci"</string>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 73cd12f..b452229 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Hafna"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Loka"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Skipta"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Óþekkt"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Nú ertu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skrefi frá því að gerast þróunaraðili.</item>
       <item quantity="other">Nú ertu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skrefum frá því að gerast þróunaraðili.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Tilkynningar"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Ítarlegt"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Vinnutilkynningar"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Leyfa tilkynningapunkta"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blikkandi ljós"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Á lásskjá"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Sýna allt innihald tilkynninga"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Aldrei sýna þessar tilkynningar"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Sýna tilkynningar"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Aldrei sýna tilkynningar í skugga eða á jaðartækjum"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Leyfa tilkynningapunkt"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Sýna tilkynningapunkt"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Hnekkja „Ónáðið ekki“"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Láta þessar tilkynningar halda áfram að trufla þegar „Ónáðið ekki“ er stillt á „Aðeins forgangur“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Á lásskjá"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3ac27fc..b3753c6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Rifiuta"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Chiudi"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Cambia"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Ora ti mancano <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passaggi per diventare uno sviluppatore.</item>
       <item quantity="one">Ora ti manca <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> passaggio per diventare uno sviluppatore.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifiche"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanzate"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifiche di lavoro"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Consenti indicatori notifica"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luce lampeggiante"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sulla schermata di blocco"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti delle notifiche"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Non mostrare mai queste notifiche"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notifiche"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Non mostrare mai notifiche nella relativa area o su dispositivi periferici"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Consenti indicatore di notifica"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostra indicatore di notifica"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignora Non disturbare"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Consenti notifiche quando l\'opzione Non disturbare è impostata su Solo con priorità"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sulla schermata di blocco"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f452830..86f4ec6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"דחה"</string>
     <string name="dlg_close" msgid="7471087791340790015">"סגור"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"עבור אל"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="two">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
       <item quantity="many">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
@@ -2834,8 +2833,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"הודעות"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"אפשרויות מתקדמות"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"הודעות עבודה"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"הצגה של סימני הודעות"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"אור מהבהב"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"במסך הנעילה"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"תוכן ההודעות יופיע במלואו"</string>
@@ -2922,10 +2920,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"לעולם אל תציג את ההודעות האלה"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"הצג הודעות"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"אף פעם אל תציג הודעות בהצללה או במכשירים היקפיים"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"הצגה של סימן ההודעות"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"הצגה של סימן ההודעות"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ביטול / שינוי של \'נא לא להפריע\'"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"אפשר להודעות אלה להמשיך ולהפריע כאשר \'נא לא להפריע\' מוגדר כ\'עדיפות בלבד\'"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"במסך הנעילה"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 41b3704..288d22c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"許可しない"</string>
     <string name="dlg_close" msgid="7471087791340790015">"閉じる"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"切り替え"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">デベロッパーになるまであと<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>ステップです。</item>
       <item quantity="one">デベロッパーになるまであと<xliff:g id="STEP_COUNT_0">%1$d</xliff:g>ステップです。</item>
@@ -2782,8 +2781,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"詳細設定"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"仕事用プロファイルの通知"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"通知ドットの許可"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"点滅"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ロック画面の通知"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"すべての通知内容を表示する"</string>
@@ -2864,10 +2862,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"今後はこの通知を表示しない"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"通知の表示"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"シェードにも周辺端末にも通知を表示しない"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"通知ドットの許可"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"通知ドットの表示"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"マナーモードをオーバーライドする"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"[マナーモード] が [優先する通知のみ] に設定されているとき、この通知を引き続き表示する"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ロック画面"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index f7ea697..20b31fb 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"უარყოფა"</string>
     <string name="dlg_close" msgid="7471087791340790015">"დახურვა"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"გადართვა"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"უცნობი"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">დეველოპერობამდე <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ნაბიჯი დაგრჩათ.</item>
       <item quantity="one">დეველოპერობამდე <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ნაბიჯი დაგრჩათ.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"შეტყობინებები"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"გაფართოებული"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"სამსახურის შეტყობინებები"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"შეტყობინების ნიშნულების დაშვება"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"სინათლის ციმციმი"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ჩაკეტილ ეკრანზე"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"შეტყობინების მთელი შინაარსის ჩვენება"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ამ შეტყობინებების ჩვენების შეწყვეტა"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"შეტყობინებების ჩვენება"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"შეტყობინებების ჩრდილოვნად ან პერიფერიულ მოწყობილობებზე ჩვენების აღკვეთა"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"შეტყობინების ნიშნულის დაშვება"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"შეტყობინების ნიშნულის ჩვენება"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"„არ შემაწუხოთ“-ის უგულებელყოფა"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ამ შეტყობინებების ჩვენება მაშინაც კი, როცა რეჟიმისთვის „არ შემაწუხოთ“ არჩეულია „მხოლოდ პრიორიტეტული“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ჩაკეტილ ეკრანზე"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index ff0d227..cdcee20 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Бас тарту"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Жабу"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Ауысу"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Белгісіз"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Сіз қазір әзірлеуші болудан <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> қадам қашықсыз.</item>
       <item quantity="one">Сіз қазір әзірлеуші болудан <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> қадам қашықсыз.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Хабарландырулар"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Кеңейтілген"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Жұмыс хабарландырулары"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Хабарландыру белгілеріне рұқсат беру"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Жыпылықтаған жарық"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Құлып экранында"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүкіл хабарландыру мазмұнын көрсету"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Бұл хабарландыруларды ешқашан көрсетпеу"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Хабарландыруларды көрсету"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Тақтада немесе перифериялық құрылғыларда хабарландыруларды ешқашан көрсетпеу"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Хабарландыру белгісіне рұқсат беру"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Хабарландыру белгісін көрсету"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Мазаламау\" режимін қайта анықтау"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Мазаламау\" режимі \"Тек маңызды\" күйіне орнатылған кезде, осы хабарландыруларға рұқсат беру"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Құлып экранында"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 9f43eca..18e8b7c 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"បដិសេធ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"បិទ"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"បិទ/បើក"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"មិន​ស្គាល់"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">ឥឡូវនេះអ្នកនៅសល់ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ជំហានទៀតដើម្បីក្លាយជាអ្នកអភិវឌ្ឍន៍។</item>
       <item quantity="one">ឥឡូវនេះអ្នកនៅសល់ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ជំហានទៀតដើម្បីក្លាយជាអ្នកអភិវឌ្ឍន៍។</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ការ​ជូនដំណឹង"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"កម្រិតខ្ពស់"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ការជូនដំណឹងពីកន្លែងធ្វើការ"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"អនុញ្ញាតស្លាកជូនដំណឹង"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ភ្លើងលោត"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"នៅលើអេក្រង់ជាប់សោ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញ​ខ្លឹមសារនៃការ​ជូនដំណឹង​ទាំងអស់"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង​ទាំង​នេះ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"បង្ហាញ​ការ​ជូន​ដំណឹង"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"កុំ​បង្ហាញ​ការ​ជូន​ដំណឹង​នៅក្នុង​ផ្ទាំង​ទម្លាក់ ឬ​នៅលើ​ឧបករណ៍​ភ្ជាប់​ជាមួយ​កុំព្យូទ័រ"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"អនុញ្ញាតស្លាកជូនដំណឹង"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"បង្ហាញស្លាកជូនដំណឹង"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"បដិសេធរបៀបកុំរំខាន"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"អនុញ្ញាតឲ្យការជូនដំណឹងទាំងនេះបន្តរំខាន នៅពេលដែលរបៀបកុំរំខានត្រូវបានកំណត់ទៅ របៀបអាទិភាពប៉ុណ្ណោះ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"នៅលើអេក្រង់ជាប់សោ"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 120d6ff..b3c2a20 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"ನಿರಾಕರಿಸಿ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ಮುಚ್ಚು"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"ಸ್ವಿಚ್"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"ಅಪರಿಚಿತ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">ಡೆವಲಪರ್‌ ಆಗಲು ಇದೀಗ ನೀವು ಕೇವಲ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ಹೆಜ್ಜೆಗಳು ದೂರದಲ್ಲಿರುವಿರಿ.</item>
       <item quantity="other">ಡೆವಲಪರ್‌ ಆಗಲು ಇದೀಗ ನೀವು ಕೇವಲ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ಹೆಜ್ಜೆಗಳು ದೂರದಲ್ಲಿರುವಿರಿ.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"ಸುಧಾರಿತ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ಕೆಲಸದ ಅಧಿಸೂಚನೆಗಳು"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"ಅಧಿಸೂಚನೆ ಡಾಟ್‌ಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ಮಿನುಗುವ ಬೆಳಕು"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ಅಧಿಸೂಚನೆ ವಿಷಯವನ್ನು ಪೂರ್ತಿ ತೋರಿಸು"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಎಂದಿಗೂ ತೋರಿಸಬೇಡ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸು"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ಶೇಡ್ ಅಥವಾ ಪೆರಿಪೆರಲ್ ಸಾಧನಗಳಲ್ಲಿ ಎಂದಿಗೂ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡಿ"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"ಅಧಿಸೂಚನೆ ಡಾಟ್‌ಗೆ ಅನುಮತಿಸಿ"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"ಅಧಿಸೂಚನೆ ಡಾಟ್‌ ತೋರಿಸಿ"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅತಿಕ್ರಮಿಸು"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಅನ್ನು ಆದ್ಯತೆಗೆ ಹೊಂದಿಸಿದಾಗ ಮಾತ್ರ ಅಡ್ಡಿಪಡಿಸಲು ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ಮುಂದುವರಿಸಲು ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9bfb632..1e53ae2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"거부"</string>
     <string name="dlg_close" msgid="7471087791340790015">"닫기"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"전환"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g>단계만 더 완료하면 개발자가 될 수 있습니다.</item>
       <item quantity="one"><xliff:g id="STEP_COUNT_0">%1$d</xliff:g>단계만 더 완료하면 개발자가 될 수 있습니다.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"알림"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"고급"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"직장 알림"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"알림 표시 점 허용"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"표시등이 깜박거림"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"잠금 화면에서"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"모든 알림 내용 표시"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"이러한 알림을 다시 표시하지 않음"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"알림 표시"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"알림을 창이나 주변기기에 표시하지 않음"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"알림 표시 점 허용"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"알림 표시 점 보기"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"알림 일시중지 무시"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"알림 일시중지가 중요 알림만으로 설정된 경우 이러한 알림을 계속 받도록 허용"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"잠금 화면에서"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 83f4382..0722014 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Тыюу салуу"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Жабуу"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Которуштуруу"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Белгисиз"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Сиздин иштеп чыгуучу болушуңузга <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кадам калды.</item>
       <item quantity="one">Сиздин иштеп чыгуучу болушуңузга <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> кадам калды.</item>
@@ -2781,8 +2780,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Эскертмелер"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Өркүндөтүлгөн"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Жумуш боюнча эскертмелер"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Эскертме белгилерине уруксат"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Жарык индикатору"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Кулпуланган экранда"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Эскертме толугу менен көрүнсүн"</string>
@@ -2863,10 +2861,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Бул эскертмелер эч качан көрсөтүлбөсүн"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Эскертмелерди көрсөтүү"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Эскертмелер эч качан көлөкөдө же сырткы түзмөктөрдө көрсөтүлбөсүн"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Эскертме белгисине уруксат берүү"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Эскертме белгисин көрсөтүү"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Тынчымды албаны өзгөртүп коюу"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Тынчымды алба режиминде\" \"Шашылыш эскертмелер гана\" деп белгиленсе ушул эскертмелер көрүнөт"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Кулпуланган экранда"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1701144..4b2961b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"ປະ​ຕິ​ເສດ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ປິດ"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"ສັບປ່ຽນ"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"ບໍ່ຮູ້ຈັກ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">ປະຈຸບັນທ່ານຍັງຢູ່ຫ່າງ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ຂັ້ນຕອນຈາກການເປັນຜູ້ພັດທະນາ.</item>
       <item quantity="one">ປະຈຸບັນທ່ານຍັງຢູ່ຫ່າງ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ຂັ້ນຕອນຈາກການເປັນຜູ້ພັດທະນາ.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ການແຈ້ງເຕືອນ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"​ຂັ້ນ​ສູງ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ການແຈ້ງເຕືອນວຽກ"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"ອະນຸຍາດຈຸດການແຈ້ງເຕືອນ"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ກະພິບໄຟ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ຢູ່ໜ້າຈໍລັອກ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ສະແດງ​ເນື້ອຫາ​ການແຈ້ງເຕືອນ​ທັງໝົດ"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ຢ່າສະແດງການແຈ້ງເຕືອນເຫຼົ່ານີ້ອີກ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"ສະແດງການແຈ້ງເຕືອນ"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ຢ່າສະແດງການແຈ້ງເຕືອນໃນເງົາ ຫຼື ອຸປະກອນຕໍ່ພ່ວງອີກ."</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"ອະນຸຍາດຈຸດການແຈ້ງເຕືອນ"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"ສະແດງຈຸດການແຈ້ງເຕືອນ"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ຍົກເລີກຫ້າມລົບກວນ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ອະນຸຍາດ​ໃຫ້ການ​ແຈ້ງ​ເຕືອນ​​ເຫຼົ່າ​ນີ້​ສືບ​ຕໍ່​ຂັດ​ຈັງຫວະ ​ເມື່ອຄຸນສົມບັດ ຫ້າມ​ລົບ​ກວນ ຖືກ​ຕັ້ງ​ເປັນແບບບຸລິ​ມະ​ສິດ​ເທົ່າ​ນັ້ນ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ຢູ່ໜ້າຈໍລັອກ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4ab9f0b..436466b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Atmesti"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Uždaryti"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Perjungti"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmą ir būsite kūrėjas.</item>
       <item quantity="few">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmus ir būsite kūrėjas.</item>
@@ -2832,8 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Pranešimai"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Išplėstiniai"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Darbo profilio pranešimai"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Leisti pranešimų taškus"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Mirksinti šviesa"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Užrakinimo ekrane"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rodyti visą pranešimo turinį"</string>
@@ -2920,10 +2918,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Niekada nerodyti šių pranešimų"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Rodyti pranešimus"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Niekada nerodyti pranešimų skydelyje ar išoriniuose įrenginiuose"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Leisti pranešimo tašką"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Rodyti pranešimo tašką"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Nepaisyti netrukdymo režimo"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Leisti ir toliau teikti šiuos pranešimus, kai netrukdymo režimas nustatytas į „Tik prioritetiniai“"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Užrakinimo ekrane"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0c236b3..ab07399 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Aizliegt"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Aizvērt"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Pārslēgt"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="zero">Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbības.</item>
       <item quantity="one">Lai jūs kļūtu par izstrādātāju, atlikusi <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbība.</item>
@@ -2805,8 +2804,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Paziņojumi"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Papildu"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Darba paziņojumi"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Atļaut paziņojumu punktus"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Mirgojošs gaismas signāls"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Bloķēšanas ekrānā"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rādīt visu saturu paziņojumos"</string>
@@ -2890,10 +2888,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nekad nerādīt šos paziņojumus"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Rādīt paziņojumus"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nekad nerādīt paziņojumus panelī vai perifērijas ierīcēs"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Atļaut paziņojuma punktu"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Rādīt paziņojuma punktu"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorēt režīmu “Netraucēt”"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ļaut šiem paziņojumiem pārtraukt arī turpmāk, ja režīms “Netraucēt” ir iestatīts uz “Tikai prioritārie”"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Bloķēšanas ekrānā"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 18d967f..2ffdd20 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Одбиј"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Затвори"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Префрли"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Непозната"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Сега сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> чекор поблиску да станете програмер.</item>
       <item quantity="other">Сега сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> чекори поблиску да станете програмер.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Известувања"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Напредни"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Известувања за работен профил"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Дозволи точки за известување"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Трепкај со сијаличката"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заклучениот екран"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи ја целата содржина од известувањето"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Никогаш не прикажувај ги известувањава"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Прикажувај известувања"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Никогаш не прикажувај известувања во сенка или на периферни уреди"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Дозволи точка за известување"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Прикажи точка за известување"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отфрли го Не вознемирувај"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Оставете ги известувањава да продолжат да прекинуваат кога опцијата Не вознемирувај е поставена на Само приоритетни"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заклучениот екран"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 0e12e48..6e7714f 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"നിരസിക്കുക"</string>
     <string name="dlg_close" msgid="7471087791340790015">"അടയ്‌ക്കുക"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"സ്വിച്ച്"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"അജ്ഞാതം"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">ഒരു ഡവലപ്പറാകുന്നതിൽ നിന്നും നിങ്ങൾ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്.</item>
       <item quantity="one">ഒരു ഡവലപ്പറാകുന്നതിൽ നിന്നും നിങ്ങൾ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"അറിയിപ്പുകൾ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"വിപുലമായത്"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ഔദ്യോഗിക അറിയിപ്പുകൾ"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"അറിയിപ്പ് ഡോട്ടുകൾ അനുവദിക്കുക"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ലൈറ്റ് മിന്നുക"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ലോക്ക് സ്ക്രീനിൽ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"എല്ലാ അറിയിപ്പുകളും കാണിക്കുക"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ഈ അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"അറിയിപ്പുകൾ കാണിക്കുക"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ഷെയ്‌ഡിലോ പെരിഫെറൽ ഉപകരണങ്ങളിലോ ഒരിക്കലും അറിയിപ്പുകൾ കാണിക്കരുത്"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"അറിയിപ്പ് ഡോട്ട് അനുവദിക്കുക"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"അറിയിപ്പ് ഡോട്ട് കാണിക്കുക"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'ശല്യപ്പെടുത്തരുത്\' അസാധുവാക്കുക"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\'മുൻഗണനയുള്ളവ മാത്രം\' എന്നതിലേക്ക് \'ശല്യപ്പെടുത്തരുത്\' സജ്ജമാക്കിയിട്ടുള്ളപ്പോൾ തടസ്സപ്പെടുത്തുന്നത് തുടരാൻ ഈ അറിയിപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ലോക്ക് സ്ക്രീനിൽ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 98d52ea..7efd900 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Татгалзах"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Хаах"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Шилжих"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Тодорхойгүй"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> алхам дутуу байна.</item>
       <item quantity="one">Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> алхам дутуу байна.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Мэдэгдэл"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Нарийвчилсан"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Ажлын мэдэгдэл"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Мэдэгдлийн цэгийг зөвшөөрөх"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Анивчих гэрэл"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Түгжигдсэн дэлгэц дээр"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
@@ -2858,10 +2856,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Эдгээр мэдэгдлийг хэзээ ч харуулахгүй"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Мэдэгдэл харуулах"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Мэдэгдлийг сүүдэрт, эсвэл захын төхөөрөмжид хэзээ ч харуулахгүй"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Мэдэгдлийн цэгийг зөвшөөрөх"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Мэдэгдлийн цэгийг харуулах"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Бүү саад бол\"-г дарах"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Бүү саад бол\" горимыг \"Зөвхөн Тэргүүлэх ач холбогдолтой\" болгон тохируулсан үед эдгээр мэдэгдэл үргэлжлэн саад болохыг зөвшөөрнө үү."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Түгжигдсэн дэлгэц дээр"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0253537..c31de7b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"नकार द्या"</string>
     <string name="dlg_close" msgid="7471087791340790015">"बंद करा"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"स्विच"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">आपण आता विकासक बनण्यापासून <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर आहात.</item>
       <item quantity="other">आपण आता विकासक बनण्यापासून <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरणे दूर आहात.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"सूचना"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"प्रगत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्य सूचना"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"सूचना बिंदूंना अनुमती द्या"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"लुकलुकता प्रकाश"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीनवर"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सर्व सूचना सामग्री दर्शवा"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"या सूचना कधीही दर्शवू नका"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"सूचना दर्शवा"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"सूचना कधीही रंगछटांंमध्ये किंवा डिव्हाइसच्या किनारीवर दर्शवू नका"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"सूचना बिंदूला अनुमती द्या"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"सूचना बिंदू दाखवा"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"व्यत्यय आणू नका अधिशून्य करा"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"व्यत्यय आणू नका केवळ प्राधान्यावर सेट केले असते तेव्‍हा या सूचनांना व्यत्यय आणणे सुरु ठेवू द्या"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीनवर"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index c78726b..4084f7d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Nafikan"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Tutup"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Tukar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Anda kini <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah daripada menjadi pembangun.</item>
       <item quantity="one">Anda kini <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> langkah daripada menjadi pembangun.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Pemberitahuan"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Terperinci"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pemberitahuan kerja"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Benarkan titik pemberitahuan"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Lampu berkelip"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pada skrin kunci"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tunjukkan semua kandungan pemberitahuan"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Jangan sekali-kali tunjukkan pemberitahuan ini"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Tunjukkan pemberitahuan"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Jangan sekali-kali tunjukkan pemberitahuan dalam bidai atau pada peranti persisian"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Benarkan titik pemberitahuan"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Tunjukkan titik pemberitahuan"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Atasi Jangan Ganggu"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Benarkan pemberitahuan ini terus mengganggu apabila tetapan Jangan Ganggu ditetapkan kepada Keutamaan Sahaja"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pada skrin kunci"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 98a632b..6968e35 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"ငြင်းပယ်ခြင်း"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ပိတ်ရန်"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"အကြောင်းအရာ မသိရှိ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> အဆင့်အကွာအဝေးတွင် ရှိနေပါသည်။</item>
       <item quantity="one">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> အဆင့် အကွာအဝေးတွင်ရှိနေပါသည်။</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"အကြောင်းကြားချက်များ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"အဆင့်မြင့်"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"အလုပ်သတိပေးချက်များ"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"အကြောင်းကြားချက်အမှတ်အသားများကို ခွင့်ပြုရန်"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အကြောင်းကြားချက်ပါ အကြောင်းအရာအားလုံးကို ပြမည်"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ဤအကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"အကြောင်းကြားချက်များ ပြပါ"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"အရိပ်ထဲ သို့မဟုတ် တွဲချိတ်ထားသည့် စက်ပစ္စည်းများပေါ်တွင် အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"အကြောင်းကြားချက်အမှတ်အသားကို ခွင့်ပြုရန်"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"အကြောင်းကြားချက်အမှတ်အသားကို ပြသရန်"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"မနှောင်ယှက်ပါနှင့် ကို အပေါ်မှဖျက်ရေးပါ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"မနှောင်ယှက်ပါနှင့် ကို ဦးစားပေးမှု အတွက်သာ ဆိုပြီး သတ်မှတ်ထားလျှင် ဤသတိပေးချက်များအား ဆက်လက်ပြီး စွက်ဖက်ခွင့် ပြုပါ"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d2d0da3..0143465 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Avslå"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Lukk"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Bytt"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Nå er du <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg fra å bli utvikler.</item>
       <item quantity="one">Nå er du <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> steg fra å bli utvikler.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Varsler"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avansert"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Jobbvarsler"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Tillat varselprikker"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinkende lys"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låseskjermen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt innhold i varsler"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Vis aldri disse varslene"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Vis varsler"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Vis aldri varlser i panelet eller på eksterne enheter"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Tillat varselprikk"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Vis varselprikk"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Overstyr Ikke forstyrr"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"La disse varslene fortsette å forstyrre når Ikke forstyrr er angitt til Bare prioriterte"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låseskjermen"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index cd11544..b736e5b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"अस्वीकार गर्नुहोस्"</string>
     <string name="dlg_close" msgid="7471087791340790015">"बन्द गर्नुहोस्"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"स्विच गर्नुहोस्"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">अहिले तपाईं विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
       <item quantity="one">अहिले तपाईं विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"सूचनाहरू"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"उन्‍नत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्यका सूचनाहरू"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"सूचनाको प्रतीक जनाउने थोप्लोहरूलाई अनुमति दिनुहोस्"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"झिम झिम गर्ने बत्ती"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लक स्क्रिनमा"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सबै सूचना सामग्री देखाउनुहोस्"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"यी सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"सूचनाहरू देखाउनुहोस्"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ओझेलमा वा पेरिफेरल यन्त्रहरूमा कहिल्यै सूचनाहरू नदेखाउनुहोस्"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"सूचनाको प्रतीक जनाउने थोप्लोलाई अनुमति दिनुहोस्"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"सूचनाको प्रतीक जनाउने थोप्लो देखाउनुहोस्"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"बाधा नपुर्याउनुहोस् मा ओभरराइड गर्नुहोस्"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"बाधा नपुर्याउनुहोस् प्राथमिकतामा मात्र सेट भएको बेला यी सूचनाहरूबाट हुने अवरोधका लागि अनुमति दिनुहोस्।"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लक स्क्रिनमा"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b551f01..84bf8f7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Weigeren"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Sluiten"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Overschakelen"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Je moet nog <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden.</item>
       <item quantity="one">Je moet nog <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> stap uitvoeren om ontwikkelaar te worden.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Meldingen"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Geavanceerd"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Werkmeldingen"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Meldingsstipjes toestaan"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Knipperlicht"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Op het vergrendelingsscherm"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Content van alle meldingen weergeven"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Deze meldingen nooit weergeven"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Meldingen weergeven"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nooit meldingen weergeven in het meldingenpaneel of op randapparaten"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Meldingsstipje toestaan"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Meldingsstipje weergeven"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'Niet storen\' overschrijven"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Deze meldingen nog steeds laten onderbreken wanneer \'Niet storen\' is ingesteld op \'Alleen prioriteit\'"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Op het vergrendelingsscherm"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 35f72ea..316528d 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ਬੰਦ ਕਰੋ"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"ਸਵਿਚ ਕਰੋ"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"ਅਗਿਆਤ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">ਤੁਸੀਂ ਹੁਣ ਇੱਕ ਵਿਕਾਸਕਾਰ ਬਣਨ ਤੋਂ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ਕਦਮ ਦੂਰ ਹੋ।</item>
       <item quantity="other">ਤੁਸੀਂ ਹੁਣ ਇੱਕ ਵਿਕਾਸਕਾਰ ਬਣਨ ਤੋਂ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ਕਦਮ ਦੂਰ ਹੋ।</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"ਉੱਨਤ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ਕੰਮ ਸਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਦਿਖਾਓ"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕਦੇ ਨਾ ਵਿਖਾਓ"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"ਸੂਚਨਾਵਾਂ ਵਿਖਾਓ"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਪਰਛਾਵੇਂ ਵਿੱਚ ਜਾਂ ਪੈਰੀਫਿਰਲ ਡੀਵਾਈਸਾਂ \'ਤੇ ਨਾ ਵਿਖਾਓ"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"ਸੂਚਨਾ ਬਿੰਦੂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"ਸੂਚਨਾ ਬਿੰਦੂ ਦਿਖਾਓ"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੇ ਰਹਿਣਾ ਜਾਰੀ ਰਹਿਣ ਦਿਓ ਜਦੋਂ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਸਿਰਫ਼ ਤਰਜੀਹ \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਹੋਵੇ।"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0a806e1..d671094 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odmów"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zamknij"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Przełącz"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nieznane"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Od zostania programistą dzielą Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroki.</item>
       <item quantity="many">Od zostania programistą dzieli Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroków.</item>
@@ -2832,8 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Powiadomienia"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Zaawansowane"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Powiadomienia związane z pracą"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Zezwól na plakietki z powiadomieniami"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Migająca dioda"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na ekranie blokady"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokazuj wszystkie powiadomienia"</string>
@@ -2920,10 +2918,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nigdy nie pokazuj tych powiadomień"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Pokazuj powiadomienia"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nigdy nie pokazuj powiadomień w obszarze powiadomień ani na urządzeniach peryferyjnych"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Zezwól na plakietkę z powiadomieniem"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Pokaż plakietkę z powiadomieniem"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zastąp Nie przeszkadzać"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Zezwól na działanie tych powiadomień, gdy Nie przeszkadzać ma ustawienie Tylko priorytetowe"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na ekranie blokady"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 1ed281f..e9c753d 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
       <item quantity="other">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir pontos de notificação"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Piscar a luz"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na tela de bloqueio"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar essas notificações"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir ponto de notificação"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar ponto de notificação"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 664b09c..bc812f1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir pontos de notificação"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Emitir luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"No ecrã de bloqueio"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas as notificações"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar estas notificações"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações no painel ou nos dispositivos periféricos"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir ponto de notificação"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar ponto de notificação"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Substituir o modo Não incomodar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificações continuem a interrompê-lo quando o modo Não incomodar estiver definido como Apenas prioridade"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"No ecrã de bloqueio"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1ed281f..e9c753d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Recusar"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
       <item quantity="other">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificações"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avançadas"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificações de trabalho"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permitir pontos de notificação"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Piscar a luz"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na tela de bloqueio"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nunca mostrar essas notificações"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificações"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações na aba ou em dispositivos periféricos"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permitir ponto de notificação"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar ponto de notificação"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Modificar \"Não perturbe\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que essas notificações continuem a interromper quando \"Não perturbe\" estiver definido para \"Somente prioridade\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na tela de bloqueio"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 55f0c34..52d8d1d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Refuzați"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Închideți"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Comutați"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Necunoscut"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Mai aveți <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pași pentru a deveni dezvoltator.</item>
       <item quantity="other">Mai aveți <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> de pași pentru a deveni dezvoltator.</item>
@@ -2805,8 +2804,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificări"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avansate"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificări profil de serviciu"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Permiteți puncte de notificare"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Lumină intermitentă"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pe ecranul de blocare"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișează integral conținutul notificărilor"</string>
@@ -2890,10 +2888,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Aceste notificări nu se afișează niciodată"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Afișați notificările"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nu afișați niciodată notificările în umbră sau pe dispozitive periferice"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Permiteți punct de notificare"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Afișați punctul de notificare"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignoră Nu deranja"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permiteți acestor notificări să vă întrerupă când modul Nu deranja este setat la Numai cu prioritate"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Pe ecranul de blocare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c337372..f2e65c5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Отклонить"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Закрыть"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Сменить аккаунт"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Вы почти у цели. Остался <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> шаг.</item>
       <item quantity="few">Вы почти у цели. Осталось <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> шага.</item>
@@ -2832,8 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Уведомления"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Расширенные настройки"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Рабочие уведомления"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Показывать значки уведомлений"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Световая индикация"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заблокированном экране"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показывать уведомления полностью"</string>
@@ -2920,10 +2918,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Не показывать эти уведомления"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Включить уведомления"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Не показывать уведомления на фоне или на периферийных устройствах"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Показывать значок уведомлений"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Показывать значок уведомлений"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Переопределить \"Не беспокоить\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешить эти уведомления, когда в режиме \"Не беспокоить\" выбрано \"Только важные\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокированном экране"</string>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 790062c..e68d726 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"ප්‍රතික්ෂේප කරන්න"</string>
     <string name="dlg_close" msgid="7471087791340790015">"වසන්න"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"මාරු වෙන්න"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"නොදනී"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">ඔබට දැන් සංවර්ධකයකු වීමට ඇත්තේ පියවර <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> කි.</item>
       <item quantity="other">ඔබට දැන් සංවර්ධකයකු වීමට ඇත්තේ පියවර <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> කි.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"දැනුම්දීම්"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"උසස්"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"වැඩ දැනුම්දීම්"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"දැනුම්දීම් තිත් සඳහා ඉඩ දෙන්න"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"නිවී නිවී දැල්වෙන එළිය"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"අගුලු තිරය මත"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"සියලුම දැනුම්දීමේ අන්තර්ගත පෙන්වන්න"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"මෙම දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"දැනුම්දීම් පෙන්වන්න"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"සෙවන තුළ හෝ පර්යන්ත උපාංග මත දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"දැනුම්දීම් තිත සඳහා ඉඩ දෙන්න"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"දැනුම්දීම් තිත පෙන්වන්න"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"බාධා නොකරන්න ඉක්මවන්න"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"බාධා නොකරන්න, ප්‍රමුඛතා පමණි වෙත සකසා ඇති විට මෙම දැනුම්දීම්වලට බාධා කිරීමට දිගටම ඉඩ දෙන්න"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"අගුලු තිරය මත"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a6d637f..17144ad 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odmietnuť"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zavrieť"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prepnúť"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="few">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> krok a bude z vás vývojár.</item>
       <item quantity="many">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroka a bude z vás vývojár.</item>
@@ -2832,8 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Upozornenia"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Rozšírené"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pracovné upozornenia"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Povoliť bodky upozornení"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blikanie"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na uzamknutej obrazovke"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazovať všetok obsah upozornení"</string>
@@ -2920,10 +2918,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Tieto upozornenia nikdy nezobrazovať"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Zobrazovať upozornenia"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikdy nezobrazovať upozornenia na paneli ani v periférnych zariadeniach"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Povoliť bodku upozornenia"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Zobrazovať bodku upozornenia"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Prepísať možnosť Nerušiť"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Umožniť týmto upozorneniam vyrušiť ma, ak je možnosť Nerušiť nastavená na možnosť Iba prioritné"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na uzamknutej obrazovke"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7cd178d..bd915d1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Zavrni"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zapri"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Preklopi"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas loči od tega, da postanete razvijalec.</item>
       <item quantity="two"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka vas ločita od tega, da postanete razvijalec.</item>
@@ -2832,8 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obvestila"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Dodatno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obvestila za delovni profil"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Dovoli obvestilne pike"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Utripajoča lučka"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaklenjenem zaslonu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
@@ -2920,10 +2918,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikoli ne prikaži teh obvestil"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Pokaži obvestila"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikoli ne pokaži obvestil na zaslonu z obvestili ali v zunanjih napravah."</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Dovoli obvestilno piko"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Pokaži obvestilno piko"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Preglasitev načina »Ne moti«"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Naj se ta obvestila prikazujejo tudi, ko je način »Ne moti« nastavljen na »Samo prednostno«"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaklenjenem zaslonu"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 795ad51..d5ada51 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Refuzo"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Mbyll"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Ndërro"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"E panjohur"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Tani je <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> hapa larg të qenët programues.</item>
       <item quantity="one">Tani je <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> hap larg të qenët programues.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Njoftime"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Të përparuara"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Njoftimet e punës"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Lejo pikat e njoftimeve"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Drita me pulsim"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Në ekranin e kyçjes"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Shfaq të gjithë përmbajtjen e njoftimit"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Mos i shfaq asnjëherë këto njoftime"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Shfaq njoftimet"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Mos shfaq asnjëherë njoftime në hije ose në pajisje periferike"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Lejo pikën e njoftimeve"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Shfaq pikën e njoftimeve"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anulo \"Mos shqetëso\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Lejo që këto njoftime të vazhdojnë të ndërpresin kur \"Mos shqetëso\" është vendosur në \"Vetëm prioritare\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Në ekranin e kyçjes"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 261ab5e..057c06c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Одбиј"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Затвори"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Пребаци на"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Треба да обавите још <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> корак да бисте постали програмер.</item>
       <item quantity="few">Треба да обавите још <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> корака да бисте постали програмер.</item>
@@ -2805,8 +2804,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Обавештења"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Напредна"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Обавештења за Work"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Дозволи тачке за обавештења"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Укључи треперење лампице"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На закључаном екрану"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи сав садржај обавештења"</string>
@@ -2890,10 +2888,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Никада не приказуј ова обавештења"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Приказуј обавештења"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Обавештења се никада не приказују на траци или периферијским уређајима"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Дозволи тачку за обавештења"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Приказуј тачку за обавештења"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Замени режим Не узнемиравај"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Омогућава да ова обавештења наставе да се приказују када је режим Не узнемиравај подешен на опцију Само приоритетни прекиди"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На закључаном екрану"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 65b8646..81fbae7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Neka"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Stäng"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Byt"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Du är nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg från att bli utvecklare.</item>
       <item quantity="one">Du är nu <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> steg från att bli utvecklare.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Meddelanden"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avancerat"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Jobbaviseringar"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Tillåt aviseringsprickar"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Blinkande ljus"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låsskärmen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Visa allt aviseringsinnehåll"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Visa aldrig de här aviseringarna"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Visa aviseringar"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Visa aldrig aviseringar i panelen eller på perifera enheter"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Tillåt aviseringsprick"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Visa aviseringsprick"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Åsidosätt Stör ej"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Fortsätt att få dessa aviseringar när Endast prioriterade har angetts för Stör ej"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"På låsskärmen"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b9c958d..f75255a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Kana"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Funga"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Swichi"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Umebakisha hatua <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ili uwe msanidi programu.</item>
       <item quantity="one">Umebakisha hatua <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ili uwe msanidi programu.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Arifa"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Mipangilio ya kina"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Arifa za kazini"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Ruhusu vitone vya arifa"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Mwangaza umemeteke"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Skrini inapofungwa"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Onyesha arifa za maudhui yote"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Usionyeshe arifa hizi kamwe"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Onyesha arifa"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Usiwahi kuonyesha arifa kwenye vifaa vya kando au katika kivuli"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Ruhusu kitone cha arifa"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Onyesha kitone cha arifa"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Batilisha hali ya \'Usinisumbue\'"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Ruhusu arifa hizi ziendelee kukatiza wakati hali ya Usinisumbue imewekwa katika Kipaumbele Pekee"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Skrini inapofungwa"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index b62c408..015d21d 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"நிராகரி"</string>
     <string name="dlg_close" msgid="7471087791340790015">"மூடு"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"மாறு"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"அறியப்படாத"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">டெவெலப்பராவதற்கு இப்போது <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> படிகளே உள்ளன.</item>
       <item quantity="one">டெவெலப்பராவதற்கு இப்போது <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> படியே உள்ளது.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"அறிவிப்புகள்"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"மேம்பட்டவை"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"பணி அறிவிப்புகள்"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"அறிவிப்புப் புள்ளிகளை அனுமதி"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ஒளியைச் சிமிட்டு"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"பூட்டுத் திரையில்"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"எல்லா அறிவிப்பு விவரத்தையும் காட்டு"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"இந்த அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"அறிவிப்புகளைக் காட்டு"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ஷேட்டில் அல்லது துணைச் சாதனங்களில் அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"அறிவிப்புப் புள்ளியை அனுமதி"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"அறிவிப்புப் புள்ளியைக் காட்டு"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"தொந்தரவு செய்ய வேண்டாம் அமைப்பை மாற்றவும்"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"தொந்தரவு செய்ய வேண்டாம் என்பது முன்னுரிமை மட்டும் என்பதாக அமைக்கப்படும் போது இந்த அறிவிப்புகளைத் தொடர்ந்து குறுக்கிட அனுமதிக்கவும்"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"பூட்டுத் திரையில்"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 2b11ad0..c12e7ad 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"తిరస్కరించు"</string>
     <string name="dlg_close" msgid="7471087791340790015">"మూసివేయి"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"మార్చు"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"తెలియదు"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> అడుగుల దూరంలో ఉన్నారు.</item>
       <item quantity="one">మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> అడుగు దూరంలో ఉన్నారు.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"నోటిఫికేషన్‌లు"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"అధునాతనం"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"కార్యాలయ నోటిఫికేషన్‌లు"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"నోటిఫికేషన్ డాట్‌లను అనుమతించండి"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"కాంతి మిణుకుమిణుకు అనేలా ఉంచు"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"లాక్ స్క్రీన్‌పై"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"మొత్తం నోటిఫికేషన్ కంటెంట్‌ను చూపు"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ఈ నోటిఫికేషన్‌లను ఎప్పుడూ చూపవద్దు"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"నోటిఫికేషన్‌లను చూపు"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"నోటిఫికేషన్‌లను ఎన్నడూ షేడ్‌లో లేదా అనుబంధ పరికరాల్లో చూపవద్దు"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"నోటిఫికేషన్ డాట్‌ను అనుమతించండి"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"నోటిఫికేషన్ డాట్‌ చూపించు"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"అంతరాయం వద్దుని భర్తీ చేయి"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"అంతరాయం కలిగించవద్దు లక్షణాన్ని ప్రాధాన్యత మాత్రమేకి సెట్ చేసినప్పుడు, అంతరాయం కలిగించడం కొనసాగించడానికి ఈ నోటిఫికేషన్‌లను అనుమతిస్తుంది"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"లాక్ స్క్రీన్‌పై"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2de8d9d..810a331 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"ปฏิเสธ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ปิด"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"เปลี่ยน"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"ไม่ทราบ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">คุณกำลังจะได้เป็นนักพัฒนาซอฟต์แวร์ในอีก <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ขั้นตอน</item>
       <item quantity="one">คุณกำลังจะได้เป็นนักพัฒนาซอฟต์แวร์ในอีก <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> ขั้นตอน</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"การแจ้งเตือน"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"ขั้นสูง"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"การแจ้งเตือนงาน"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"อนุญาตให้ใช้จุดการแจ้งเตือน"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ไฟกะพริบ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"บนหน้าจอล็อก"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"แสดงเนื้อหาการแจ้งเตือนทั้งหมด"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"ไม่ต้องแสดงการแจ้งเตือน"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"แสดงการแจ้งเตือน"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ไม่ต้องแสดงการแจ้งเตือนในแว่นตาหรืออุปกรณ์ต่อพ่วง"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"อนุญาตให้ใช้จุดการแจ้งเตือน"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"แสดงจุดการแจ้งเตือน"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ลบล้างห้ามรบกวน"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"อนุญาตให้แสดงการแจ้งเตือนต่อไปเมื่อตั้งค่าห้ามรบกวนเป็นเฉพาะเรื่องสำคัญเท่านั้น"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"บนหน้าจอล็อก"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b003a1f..4d05111 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Tanggihan"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Isara"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Lumipat"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> hakbang na lang, magiging developer ka na.</item>
       <item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> na hakbang na lang, magiging developer ka na.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Mga Notification"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Advanced"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Mga notification sa trabaho"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Payagan ang notification dots"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Patay-sinding ilaw"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sa lock screen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng content ng notification"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Huwag kailanman ipakita ang mga notification na ito"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Magpakita ng mga notification"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Huwag kailanman magpakita ng mga notification sa shade o sa mga peripheral na device"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Payagan ang notification dot"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Ipakita ang notification dot"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"I-override ang Huwag Istorbohin"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Pahintulutan ang mga notification na ito na lumabas kapag nakatakda sa Priyoridad Lang ang Huwag Istorbohin"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sa lock screen"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c8e65e8..82ab8e1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Reddet"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Kapat"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Değiştir"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Geliştirici olmanıza <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> adım kaldı.</item>
       <item quantity="one">Geliştirici olmanıza <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> adım kaldı.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Bildirimler"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Gelişmiş"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"İş bildirimleri"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Bildirim noktalarına izin ver"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Işığı yakıp söndür"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Kilit ekranında"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirim içeriğinin tamamını göster"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirimleri hiçbir zaman gösterme"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bildirim göster"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Bildirimleri hiçbir zaman gölgede veya çevre birimi cihazlarında gösterme"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Bildirim noktasına izin ver"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirim noktasını göster"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Rahatsız Etmeyin ayarını geçersiz kıl"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Rahatsız Etmeyin seçeneği \"Yalnızca Öncelikli\" olarak ayarlıyken, bu bildirimlerin kesmeye devam etmesine izin ver"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Kilit ekranında"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 414d989..28e74f0 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Заборонити"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Закрити"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Змінити користувача"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Невідомо"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Щоб стати розробником, залишився ще <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> крок.</item>
       <item quantity="few">Щоб стати розробником, залишилося ще <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроки.</item>
@@ -2832,8 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Сповіщення"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Розширені налаштування"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Робочі сповіщення"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Дозволити значки сповіщень"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Блимання"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заблокованому екрані"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показувати весь вміст сповіщень"</string>
@@ -2920,10 +2918,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ніколи не показувати ці сповіщення"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Показувати сповіщення"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколи не показувати сповіщення на панелі та периферійних пристроях"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Дозволити значок сповіщення"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Показувати значок сповіщення"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Заміна режиму \"Не турбувати\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Показувати ці сповіщення, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокованому екрані"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 00f6337..bf9fae2 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"رد کریں"</string>
     <string name="dlg_close" msgid="7471087791340790015">"بند کریں"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"تبدیل کریں"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"نامعلوم"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم دور ہیں۔</item>
       <item quantity="one">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> قدم دور ہیں۔</item>
@@ -2776,8 +2775,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"اطلاعات"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"جدید ترین"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"دفتری اطلاعات"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"اطلاعاتی ڈاٹس کی اجازت دیں"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"بلنک لائٹ"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"قفل اسکرین پر"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"سبھی اطلاعی مواد دکھائیں"</string>
@@ -2858,10 +2856,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"یہ اطلاعات کبھی مت دکھائیں"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"اطلاعات دکھائیں"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"شیڈ میں یا پیریفرل آلات پر کبھی بھی اطلاعات نہ دکھائیں"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"اطلاعاتی ڈاٹ کی اجازت دیں"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"اطلاعاتی ڈاٹ دکھائیں"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ڈسٹرب نہ کریں کو اوور رائیڈ کریں"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"جب \'ڈسٹرب نہ کریں\' صرف ترجیح پر سیٹ ہو تو ان اطلاعات کو مداخلت کرنے دیں"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"قفل اسکرین پر"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index f88d1c0..0dc81f1 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Rad etish"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Yopish"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Almashtirish"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Noma’lum"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> qadam qoldi.</item>
       <item quantity="one">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> qadam qoldi.</item>
@@ -2790,8 +2789,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Bildirishnomalar"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Kengaytirilgan sozlamalar"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Ishga oid bildirishnomalar"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Bildirishnoma nuqtalarini ko‘rsatish"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Indikator"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Qulflangan ekranda"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bildirishnomalar to‘liq chiqsin"</string>
@@ -2872,10 +2870,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Bu bildirishnomalar boshqa ko‘rsatilmasin"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bildirishnomalar ko‘rsatilsin"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Fonda yoki tashqi qurilmalarda bildirishnomalar hech qachon ko‘rsatilmasin"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Bildirishnoma nuqtasini ko‘rsatish"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirishnoma nuqtasini ko‘rsatish"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bezovta qilinmasin rejimi ustidan yozish"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Bezovta qilinmasin rejimida faqat muhim bildirishnomalarga ruxsat berilgan bo‘lsa, ushbu bildirishnomalarga ham ruxsat beriladi"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Qulflangan ekranda"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 812ca8a..52e814d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Từ chối"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Đóng"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Chuyển đổi"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">Bây giờ, bạn chỉ cần thực hiện <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> bước nữa là trở thành nhà phát triển.</item>
       <item quantity="one">Bây giờ, bạn chỉ cần thực hiện <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> bước nữa là trở thành nhà phát triển.</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Thông báo"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Nâng cao"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Thông báo công việc"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Cho phép dấu chấm thông báo"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Đèn nhấp nháy"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Trên màn hình khóa"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Hiển thị tất cả nội dung thông báo"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Không bao giờ hiển thị các thông báo này"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Hiển thị thông báo"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Không bao giờ hiển thị thông báo trong ngăn thông báo hoặc trên thiết bị ngoại vi"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Cho phép dấu chấm thông báo"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Hiển thị dấu chấm thống báo"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ghi đè Không làm phiền"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Cho phép các thông báo này tiếp tục làm gián đoạn khi tính năng Không làm phiền được đặt thành Chỉ ưu tiên."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Trên màn hình khóa"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4cbb7e6..c5678af 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"拒绝"</string>
     <string name="dlg_close" msgid="7471087791340790015">"关闭"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"切换"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">现在只需再执行 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 步操作即可进入开发者模式。</item>
       <item quantity="one">现在只需再执行 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 步操作即可进入开发者模式。</item>
@@ -2778,8 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"高级"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"工作通知"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"允许使用通知圆点"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"闪烁指示灯"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"屏幕锁定时"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"显示所有通知内容"</string>
@@ -2860,10 +2858,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"一律不显示这类通知"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"显示通知"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"一律不在通知栏或外围设备上显示通知"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"允许使用通知圆点"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"显示通知圆点"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆盖“勿扰”设置"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"当勿扰模式设为“仅限优先事项”时,允许继续接收这类通知"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"屏幕锁定时"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 52a5d15..4c09574 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"拒絕"</string>
     <string name="dlg_close" msgid="7471087791340790015">"關閉"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"切換"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"未知"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">您只需完成 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟,即可成為開發人員。</item>
       <item quantity="one">您只需完成 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟,即可成為開發人員。</item>
@@ -2781,8 +2780,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"工作通知"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"允許使用通知圓點"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"閃燈"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定畫面上"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
@@ -2863,10 +2861,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"永不顯示這些通知"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"顯示通知"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"永不在通知欄或周邊裝置上顯示通知"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"允許使用通知圓點"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"顯示通知圓點"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"取代「請勿騷擾」"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「請勿騷擾」設定為「只限優先」時,允許顯示這些通知"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定畫面上"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f02563e..a126af6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"拒絕"</string>
     <string name="dlg_close" msgid="7471087791340790015">"關閉"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"切換"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"不明"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="other">你只需完成剩餘的 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟,即可成為開發人員。</item>
       <item quantity="one">你只需完成剩餘的 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟,即可成為開發人員。</item>
@@ -2782,8 +2781,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"通知"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Work 通知"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"允許使用通知圓點"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"閃爍燈光"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定時"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
@@ -2864,10 +2862,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"一律不顯示這類通知"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"顯示通知"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"一律不在通知欄或週邊裝置上顯示通知"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"允許使用通知圓點"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"顯示通知圓點"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆寫「零打擾」模式設定"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「零打擾」模式設定為「僅限優先通知」時,允許這些通知繼續干擾"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定時"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 4d2304b..3e80213 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Nqaba"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Vala"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Shintshela"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Manje ususele ngamagxathu angu-<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ukuthi ube ngunjiniyela.</item>
       <item quantity="other">Manje ususele ngamagxathu angu-<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ukuthi ube ngunjiniyela.</item>
@@ -2779,8 +2778,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Izaziso"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Okuthuthukisiwe"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Izaziso zomsebenzi"</string>
-    <!-- no translation found for notification_badging_title (5938709971403474078) -->
-    <skip />
+    <string name="notification_badging_title" msgid="5938709971403474078">"Vumela amachashazi esaziso"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Cwabizisa ukukhanya"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Ekukhiyeni kwesikrini"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bonisa konke okuqukethwe kwesaziso"</string>
@@ -2861,10 +2859,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ungalokothi ubonise lezi zaziso"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Bonisa izaziso"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ungalokothi ubonise izaziso kumthunzi noma kumadivayisi alawulwa ikhompuyutha"</string>
-    <!-- no translation found for notification_badge_title (6370122441168519809) -->
-    <skip />
-    <!-- no translation found for notification_channel_badge_title (2240827899882847087) -->
-    <skip />
+    <string name="notification_badge_title" msgid="6370122441168519809">"Vumela ichashazi lesaziso"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bonisa ichashazi lesaziso"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bhala ngaphezulu okuthi ungaphazamisi"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Vumela lezi zaziso ziqhubeke nokuphazamisa uma okuthi ungaphazamisi kusethelwe okuphezulu kuphela"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Ekukhiyeni kwesikrini"</string>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2c7a2e8..c8737b9 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -140,12 +140,6 @@
     <dimen name="search_suggestion_item_image_margin_start">32dp</dimen>
     <dimen name="search_suggestion_item_image_margin_end">32dp</dimen>
 
-    <!-- The following two margins need to match, with the caveat that
-         the second should be negative. The second one ensures that the icons and text
-         align despite the additional padding caused by the search bar's card background. -->
-    <dimen name="search_bar_margin">8dp</dimen>
-    <dimen name="search_bar_negative_margin">-8dp</dimen>
-
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
     <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
@@ -316,6 +310,12 @@
 
     <!-- Padding between the donut and the storage summary. -->
     <dimen name="storage_summary_padding_end">16dp</dimen>
+    <!-- Text size of the big number in the donut. -->
+    <dimen name="storage_donut_view_percent_text_size">30sp</dimen>
+    <!-- Text size of the label text in the donut. -->
+    <dimen name="storage_donut_view_label_text_size">14sp</dimen>
+    <!-- Text size of the label text in the donut if the label text is long. -->
+    <dimen name="storage_donut_view_shrunken_label_text_size">10sp</dimen>
 
     <!-- Battery meter view size -->
     <dimen name="battery_meter_width">66dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2f7aa64..e234892 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -31,6 +31,8 @@
     <string name="dlg_switch">Switch</string>
 
     <!-- Device Info --> <skip />
+    <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+    <string name="device_info_default">Unknown</string>
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
     <plurals name="show_dev_countdown">
         <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item>
@@ -3609,8 +3611,6 @@
     <!-- Text for filter option in ManageApps screen to display list of
     packages installed on sdcard. -->
     <string name="filter_apps_onsdcard" product="default">On SD card</string>
-    <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
-    <string name="disabled">Disabled</string>
     <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
     <string name="not_installed">Not installed for this user</string>
     <!-- [CHAR LIMIT=30] App details, text telling an application is installed. -->
@@ -7671,8 +7671,6 @@
     <!-- Summary of app not allowed to display over other apps [CHAR LIMIT=60] -->
     <string name="system_alert_window_off">No</string>
 
-    <!-- Title for settings screen for controlling apps that can install other apps on device [CHAR LIMIT=50] -->
-    <string name="install_other_apps">Install unknown apps</string>
     <!-- Keywords for setting screen for controlling apps that can install other apps on device -->
     <string name="keywords_install_other_apps">install apps unknown sources</string>
 
@@ -7702,10 +7700,6 @@
     <string name="write_settings_on">Yes</string>
     <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
     <string name="write_settings_off">No</string>
-    <!-- Summary of app trusted to install apps [CHAR LIMIT=45] -->
-    <string name="external_source_trusted">Allowed</string>
-    <!-- Summary of app not trusted to install apps [CHAR LIMIT=45] -->
-    <string name="external_source_untrusted">Not allowed</string>
     <!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] -->
     <string name="external_source_switch_title">Allow from this source</string>
 
@@ -8685,4 +8679,8 @@
     <!-- Title for the installed app info storage page. The total storage space taken up by this app. [CHAR LIMIT=40]-->
     <string name="app_info_storage_title">Space used</string>
 
+    <!-- The divider symbol between different parts of the notification header including spaces. not translatable [CHAR LIMIT=3] -->
+    <string name="notification_header_divider_symbol_with_spaces" translatable="false">" • "</string>
+
+
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8d1320b..3dbaa8b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -165,12 +165,6 @@
         <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.SubSettings</item>
     </style>
 
-    <!-- Variant of the settings theme with no action bar. -->
-    <style name="Theme.Settings.NoActionBar">
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
     <style name="Theme.ProvisioningActivity" parent="@android:style/Theme.Translucent.NoTitleBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowIsTranslucent">true</item>
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 52f6793..1720c73 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -22,6 +22,6 @@
     <DropDownPreference
             android:key="turn_on_automatically"
             android:title="@string/battery_saver_turn_on_automatically_title"
-            android:summary="@string/summary_placeholder" />
+            android:summary="%s" />
 
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 230f612..7482031 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -74,7 +74,7 @@
         <!-- Security patch level -->
         <Preference android:key="security_patch"
                 android:title="@string/security_patch"
-                android:summary="@string/summary_placeholder">
+                android:summary="@string/device_info_default">
                 <intent android:action="android.intent.action.VIEW"
                         android:data="https://source.android.com/security/bulletin/" />
         </Preference>
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index 45c784e..2d07fa2 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -45,7 +45,8 @@
                     android:selectable="false"/>
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category">
+    <PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category"
+                        android:key="exposure_changes_category">
         <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages"
                     android:key="number_enterprise_installed_packages"
                     android:title="@string/enterprise_privacy_enterprise_installed_packages"/>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 33c1b0a..d288a9d 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -124,7 +124,7 @@
         <DropDownPreference
           android:key="dock_audio_media"
           android:title="@string/dock_audio_media_title"
-          android:summary="@string/summary_placeholder" />
+          android:summary="%s" />
 
         <!-- Boot sounds -->
         <SwitchPreference
@@ -135,7 +135,7 @@
         <DropDownPreference
           android:key="emergency_tone"
           android:title="@string/emergency_tone_title"
-          android:summary="@string/summary_placeholder" />
+          android:summary="%s" />
 
         <com.android.settingslib.RestrictedPreference
           android:key="cell_broadcast_settings"
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 9956f71..4045fd2 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -50,7 +50,6 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.Toolbar;
 
 import com.android.internal.util.ArrayUtils;
 import com.android.settings.Settings.WifiSettingsActivity;
@@ -63,7 +62,6 @@
 import com.android.settings.development.DevelopmentSettings;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.DynamicIndexableContentMonitor;
-import com.android.settings.search2.SearchActivity;
 import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.wfd.WifiDisplaySettings;
 import com.android.settings.widget.SwitchBar;
@@ -77,7 +75,7 @@
 public class SettingsActivity extends SettingsDrawerActivity
         implements PreferenceManager.OnPreferenceTreeClickListener,
         PreferenceFragment.OnPreferenceStartFragmentCallback,
-        ButtonBarHandler, FragmentManager.OnBackStackChangedListener, OnClickListener {
+        ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
 
     private static final String LOG_TAG = "Settings";
 
@@ -347,14 +345,6 @@
             launchSettingFragment(initialFragmentName, isSubSettings, intent);
         }
 
-        if (mIsShowingDashboard) {
-            findViewById(R.id.search_bar).setVisibility(View.VISIBLE);
-            findViewById(R.id.action_bar).setVisibility(View.GONE);
-            Toolbar toolbar = findViewById(R.id.search_action_bar);
-            toolbar.setOnClickListener(this);
-            setActionBar(toolbar);
-        }
-
         mActionBar = getActionBar();
         if (mActionBar != null) {
             mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
@@ -442,10 +432,10 @@
             switchToFragment(initialFragmentName, initialArguments, true, false,
                 mInitialTitleResId, mInitialTitle, false);
         } else {
-            // Show search icon as up affordance if we are displaying the main Dashboard
-            mDisplayHomeAsUpEnabled = true;
-            // toolbar is search affordance so don't show search
-            mDisplaySearch = false;
+            // No UP affordance if we are displaying the main Dashboard
+            mDisplayHomeAsUpEnabled = false;
+            // Show Search affordance
+            mDisplaySearch = true;
             mInitialTitleResId = R.string.dashboard_title;
 
             switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
@@ -949,10 +939,4 @@
 
         return bitmap;
     }
-
-    @Override
-    public void onClick(View v) {
-        Intent intent = new Intent(this, SearchActivity.class);
-        startActivity(intent);
-    }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 9655fd2..8a77fea 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -603,7 +603,8 @@
     }
 
     /**
-     * Returns the managed profile of the current user or null if none found.
+     * Returns the managed profile of the current user or {@code null} if none is found or a profile
+     * exists but it is disabled.
      */
     public static UserHandle getManagedProfile(UserManager userManager) {
         List<UserHandle> userProfiles = userManager.getUserProfiles();
@@ -622,6 +623,29 @@
     }
 
     /**
+     * Returns the managed profile of the current user or {@code null} if none is found. Unlike
+     * {@link #getManagedProfile} this method returns enabled and disabled managed profiles.
+     */
+    public static UserHandle getManagedProfileWithDisabled(UserManager userManager) {
+        // TODO: Call getManagedProfileId from here once Robolectric supports
+        // API level 24 and UserManager.getProfileIdsWithDisabled can be Mocked (to avoid having
+        // yet another implementation that loops over user profiles in this method). In the meantime
+        // we need to use UserManager.getProfiles that is available on API 23 (the one currently
+        // used for Settings Robolectric tests).
+        final int myUserId = UserHandle.myUserId();
+        List<UserInfo> profiles = userManager.getProfiles(myUserId);
+        final int count = profiles.size();
+        for (int i = 0; i < count; i++) {
+            final UserInfo profile = profiles.get(i);
+            if (profile.isManagedProfile()
+                    && profile.getUserHandle().getIdentifier() != myUserId) {
+                return profile.getUserHandle();
+            }
+        }
+        return null;
+    }
+
+    /**
      * Retrieves the id for the given user's managed profile.
      *
      * @return the managed profile id or UserHandle.USER_NULL if there is none.
diff --git a/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
index 1d08968..acf43aa 100644
--- a/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
+++ b/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceController.java
@@ -27,7 +27,7 @@
 
     public AutoSyncWorkDataPreferenceController(Context context, Fragment parent) {
         super(context, parent);
-        mUserHandle = Utils.getManagedProfile(mUserManager);
+        mUserHandle = Utils.getManagedProfileWithDisabled(mUserManager);
     }
 
     @Override
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 083681a..3ee3c50 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -144,7 +144,8 @@
 
     private static final int LOADER_CHART_DATA = 2;
     private static final int LOADER_STORAGE = 3;
-    private static final int LOADER_BATTERY = 4;
+    @VisibleForTesting
+    static final int LOADER_BATTERY = 4;
 
     private static final int DLG_FORCE_STOP = DLG_BASE + 1;
     private static final int DLG_DISABLE = DLG_BASE + 2;
@@ -207,7 +208,8 @@
     private AppStorageStats mLastResult;
     private String mBatteryPercent;
 
-    private final LoaderCallbacks<BatteryStatsHelper> mBatteryCallbacks =
+    @VisibleForTesting
+    final LoaderCallbacks<BatteryStatsHelper> mBatteryCallbacks =
             new LoaderCallbacks<BatteryStatsHelper>() {
 
                 @Override
@@ -415,11 +417,16 @@
                     mDataCallbacks);
             loaderManager.restartLoader(LOADER_STORAGE, Bundle.EMPTY, this);
         }
-        getLoaderManager().initLoader(LOADER_BATTERY, Bundle.EMPTY, mBatteryCallbacks);
+        restartBatteryStatsLoader();
         new MemoryUpdater().execute();
         updateDynamicPrefs();
     }
 
+    @VisibleForTesting
+    public void restartBatteryStatsLoader() {
+        getLoaderManager().restartLoader(LOADER_BATTERY, Bundle.EMPTY, mBatteryCallbacks);
+    }
+
     @Override
     public void onPause() {
         getLoaderManager().destroyLoader(LOADER_CHART_DATA);
diff --git a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
index 9323aa3..8d98b50 100644
--- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
+++ b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
@@ -29,6 +29,7 @@
 
     private Preference mPreference;
     private PreferenceScreen mScreen;
+    private PreferenceAvailabilityObserver mAvailabilityObserver = null;
 
     public DynamicAvailabilityPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
@@ -37,6 +38,14 @@
         }
     }
 
+    public void setAvailabilityObserver(PreferenceAvailabilityObserver observer) {
+        mAvailabilityObserver = observer;
+    }
+
+    public PreferenceAvailabilityObserver getAvailabilityObserver() {
+        return mAvailabilityObserver;
+    }
+
     @Override
     public void displayPreference(PreferenceScreen screen) {
         mScreen = screen;
@@ -56,4 +65,10 @@
             mScreen.addPreference(mPreference);
         }
     }
+
+    protected void notifyOnAvailabilityUpdate(boolean available) {
+        if (mAvailabilityObserver != null) {
+            mAvailabilityObserver.onPreferenceAvailabilityUpdated(getPreferenceKey(), available);
+        }
+    }
 }
diff --git a/src/com/android/settings/core/PreferenceAvailabilityObserver.java b/src/com/android/settings/core/PreferenceAvailabilityObserver.java
new file mode 100644
index 0000000..46ff3ba
--- /dev/null
+++ b/src/com/android/settings/core/PreferenceAvailabilityObserver.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.core;
+
+/**
+ * @deprecated This interface allows a {@link android.support.v7.preference.PreferenceGroup}'s
+ * controller to observe the availability of the {@link android.support.v7.preference.Preference}s
+ * inside it, hiding the group when all preferences become unavailable. In the future,
+ * {@link android.support.v7.preference.PreferenceGroup} will have native support for that
+ * functionality, removing the need for this interface.
+ */
+public interface PreferenceAvailabilityObserver {
+
+    /**
+     * Notifies the observer that the availability of the preference identified by {@code key} has
+     * been updated.
+     */
+    void onPreferenceAvailabilityUpdated(String key, boolean available);
+}
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
index dc67888..e3e95be 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -15,8 +15,6 @@
  */
 package com.android.settings.dashboard;
 
-import android.annotation.AttrRes;
-import android.annotation.ColorInt;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -57,7 +55,6 @@
     private static final String STATE_CATEGORY_LIST = "category_list";
     private static final String STATE_SUGGESTION_MODE = "suggestion_mode";
     private static final String STATE_SUGGESTIONS_SHOWN_LOGGED = "suggestions_shown_logged";
-    private static final int DONT_SET_BACKGROUND_ATTR = -1;
 
     private final IconCache mCache;
     private final Context mContext;
@@ -225,9 +222,6 @@
     public void onBindViewHolder(DashboardItemHolder holder, int position) {
         final int type = mDashboardData.getItemTypeByPosition(position);
         switch (type) {
-            case R.layout.dashboard_header_spacer:
-                onBindHeaderSpacer(holder, position);
-                break;
             case R.layout.dashboard_category:
                 onBindCategory(holder,
                         (DashboardCategory) mDashboardData.getItemEntityByPosition(position));
@@ -358,33 +352,6 @@
         notifyDashboardDataChanged(prevData);
     }
 
-    private void onBindHeaderSpacer(DashboardItemHolder holder, int position) {
-        if (mDashboardData.size() > (position + 1)) {
-            // The spacer that goes underneath the search bar needs to match the
-            // background of the first real view. That view is either a condition,
-            // a suggestion, or the dashboard item.
-            //
-            // If it's a dashboard item, set null background so it uses the parent's
-            // background like the other views. Otherwise, match the colors.
-            int nextType = mDashboardData.getItemTypeByPosition(position + 1);
-            int colorAttr = nextType == R.layout.suggestion_header
-                    ? android.R.attr.colorSecondary
-                    : nextType == R.layout.condition_card
-                            ? android.R.attr.colorAccent
-                            : DONT_SET_BACKGROUND_ATTR;
-
-            if (colorAttr != DONT_SET_BACKGROUND_ATTR) {
-                TypedArray array = holder.itemView.getContext()
-                        .obtainStyledAttributes(new int[]{colorAttr});
-                @ColorInt int color = array.getColor(0, 0);
-                array.recycle();
-                holder.itemView.setBackgroundColor(color);
-            } else {
-                holder.itemView.setBackground(null);
-            }
-        }
-    }
-
     @VisibleForTesting
     void onBindSuggestionHeader(final DashboardItemHolder holder, DashboardData
             .SuggestionHeaderData data) {
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
index 8625790..4e8c7a0 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -45,8 +45,7 @@
     public static final int DEFAULT_SUGGESTION_COUNT = 2;
 
     // id namespace for different type of items.
-    private static final int NS_HEADER_SPACER = 0;
-    private static final int NS_SPACER = 1000;
+    private static final int NS_SPACER = 0;
     private static final int NS_ITEMS = 2000;
     private static final int NS_CONDITION = 3000;
 
@@ -229,9 +228,6 @@
      * and mIsShowingAll, mSuggestionMode flag.
      */
     private void buildItemsData() {
-        // add the view that goes under the search bar
-        countItem(null, R.layout.dashboard_header_spacer, true, NS_HEADER_SPACER);
-        resetCount();
         boolean hasConditions = false;
         for (int i = 0; mConditions != null && i < mConditions.size(); i++) {
             boolean shouldShow = mConditions.get(i).shouldShow();
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index f0aca01..556baec 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -50,15 +50,15 @@
                 true /* async */,
                 (num) -> {
                     if (num == 0) {
-                        preference.setVisible(false);
                         mHasApps = false;
                     } else {
-                        preference.setVisible(true);
                         preference.setSummary(mContext.getResources().getQuantityString(
                                 R.plurals.enterprise_privacy_number_packages_lower_bound,
                                 num, num));
                         mHasApps = true;
                     }
+                    preference.setVisible(mHasApps);
+                    notifyOnAvailabilityUpdate(mHasApps);
                 });
     }
 
@@ -80,6 +80,7 @@
         mFeatureProvider.calculateNumberOfAppsWithAdminGrantedPermissions(mPermissions,
                 false /* async */, (num) -> haveAppsWithAdminGrantedPermissions[0] = num > 0);
         mHasApps = haveAppsWithAdminGrantedPermissions[0];
+        notifyOnAvailabilityUpdate(mHasApps);
         return mHasApps;
     }
 
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index e98ece8..32f2bbe 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -42,7 +42,9 @@
 
     @Override
     public boolean isAvailable() {
-        return mFeatureProvider.isAlwaysOnVpnSetInCurrentUser();
+        final boolean available = mFeatureProvider.isAlwaysOnVpnSetInCurrentUser();
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
index 4796b75..8486368 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
@@ -33,7 +33,9 @@
 
     @Override
     public boolean isAvailable() {
-        return mFeatureProvider.isAlwaysOnVpnSetInManagedProfile();
+        final boolean available = mFeatureProvider.isAlwaysOnVpnSetInManagedProfile();
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceController.java b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
index d020676..fc89dc8 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
@@ -44,8 +44,11 @@
 
     @Override
     public boolean isAvailable() {
-        return mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()
-                > 0;
+        final boolean available =
+                mFeatureProvider.getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()
+                        > 0;
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index acbcc2e..9876f71 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -42,14 +42,18 @@
     public void updateState(Preference preference) {
         mFeatureProvider.calculateNumberOfPolicyInstalledApps(true /* async */,
                 (num) -> {
+                    final boolean available;
                     if (num == 0) {
-                        preference.setVisible(false);
+                        available = false;
                     } else {
-                        preference.setVisible(true);
+                        available = true;
                         preference.setSummary(mContext.getResources().getQuantityString(
                                 R.plurals.enterprise_privacy_number_packages_lower_bound, num,
                                 num));
+
                     }
+                    preference.setVisible(available);
+                    notifyOnAvailabilityUpdate(available);
                 });
     }
 
@@ -68,7 +72,9 @@
         final Boolean[] haveEnterpriseInstalledPackages = { null };
         mFeatureProvider.calculateNumberOfPolicyInstalledApps(false /* async */,
                 (num) -> haveEnterpriseInstalledPackages[0] = num > 0);
-        return haveEnterpriseInstalledPackages[0];
+        final boolean available = haveEnterpriseInstalledPackages[0];
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
index 69e0416..372982f 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -45,7 +45,9 @@
 
     @Override
     public boolean isAvailable() {
-        return mFeatureProvider.hasDeviceOwner();
+        final boolean available = mFeatureProvider.hasDeviceOwner();
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index a80dec0..f7327c8 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -61,23 +61,32 @@
         controllers.add(new NetworkLogsPreferenceController(context));
         controllers.add(new BugReportsPreferenceController(context));
         controllers.add(new SecurityLogsPreferenceController(context));
-        controllers.add(new EnterpriseInstalledPackagesPreferenceController(context, lifecycle,
-                async));
-        controllers.add(new AdminGrantedLocationPermissionsPreferenceController(context, lifecycle,
-                async));
-        controllers.add(new AdminGrantedMicrophonePermissionPreferenceController(context, lifecycle,
-                async));
-        controllers.add(new AdminGrantedCameraPermissionPreferenceController(context, lifecycle,
-                async));
-        controllers.add(new EnterpriseSetDefaultAppsPreferenceController(context, lifecycle));
-        controllers.add(new AlwaysOnVpnCurrentUserPreferenceController(context, lifecycle));
-        controllers.add(new AlwaysOnVpnManagedProfilePreferenceController(context, lifecycle));
-        controllers.add(new GlobalHttpProxyPreferenceController(context, lifecycle));
-        controllers.add(new CaCertsPreferenceController(context, lifecycle));
+        final List exposureChangesCategoryControllers = new ArrayList<PreferenceController>();
+        exposureChangesCategoryControllers.add(new EnterpriseInstalledPackagesPreferenceController(
+                context, lifecycle, async));
+        exposureChangesCategoryControllers.add(
+                new AdminGrantedLocationPermissionsPreferenceController(context, lifecycle, async));
+        exposureChangesCategoryControllers.add(
+                new AdminGrantedMicrophonePermissionPreferenceController(context, lifecycle,
+                        async));
+        exposureChangesCategoryControllers.add(new AdminGrantedCameraPermissionPreferenceController(
+                context, lifecycle, async));
+        exposureChangesCategoryControllers.add(new EnterpriseSetDefaultAppsPreferenceController(
+                context, lifecycle));
+        exposureChangesCategoryControllers.add(new AlwaysOnVpnCurrentUserPreferenceController(
+                context, lifecycle));
+        exposureChangesCategoryControllers.add(new AlwaysOnVpnManagedProfilePreferenceController(
+                context, lifecycle));
+        exposureChangesCategoryControllers.add(new ImePreferenceController(context, lifecycle));
+        exposureChangesCategoryControllers.add(new GlobalHttpProxyPreferenceController(context,
+                lifecycle));
+        exposureChangesCategoryControllers.add(new CaCertsPreferenceController(context, lifecycle));
+        controllers.addAll(exposureChangesCategoryControllers);
+        controllers.add(new ExposureChangesCategoryPreferenceController(context, lifecycle,
+                exposureChangesCategoryControllers, async));
         controllers.add(new FailedPasswordWipeCurrentUserPreferenceController(context, lifecycle));
         controllers.add(new FailedPasswordWipeManagedProfilePreferenceController(context,
                 lifecycle));
-        controllers.add(new ImePreferenceController(context, lifecycle));
         return controllers;
     }
 
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index 2f43a61..35f6e41 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (C) 2017 The Android Open Source Project
  *
@@ -48,7 +49,9 @@
 
     @Override
     public boolean isAvailable() {
-        return getNumberOfEnterpriseSetDefaultApps() > 0;
+        final boolean available = getNumberOfEnterpriseSetDefaultApps() > 0;
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
new file mode 100644
index 0000000..4c89659
--- /dev/null
+++ b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
@@ -0,0 +1,111 @@
+
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceAvailabilityObserver;
+import com.android.settings.core.lifecycle.Lifecycle;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * A controller that hides a {@link android.support.v7.preference.PreferenceGroup} when none of the
+ * {@link Preference}s inside it are visible.
+ *
+ * TODO(b/62051162): Use {@link android.support.v7.preference.PreferenceGroup}'s native ability to
+ * hide itself when all {@link Preference}s inside it are invisible when that functionality becomes
+ * available. This custom controller will still be needed to remove the
+ * {@link android.support.v7.preference.PreferenceGroup} from the search index as required (by
+ * having {@link #isAvailable()} return {@code false} if the method returns {@code false} for all
+ * {@link Preference}s in the {@link android.support.v7.preference.PreferenceGroup}).
+ */
+public class ExposureChangesCategoryPreferenceController
+        extends DynamicAvailabilityPreferenceController implements PreferenceAvailabilityObserver {
+
+    private static final String KEY_EXPOSURE_CHANGES_CATEGORY = "exposure_changes_category";
+    private final Set<String> mAvailablePrefs = new HashSet<String>();
+    private Preference mPreference = null;
+    private boolean mControllingUi;
+
+    /**
+     * When {@code controllingUi} is {@code true}, some of the preferences may have their visibility
+     * determined asynchronously. In this case, {@link #isAvailable()} must always return {@code
+     * true} and the group should be hidden using {@link Preference#setVisible()} if all preferences
+     * report that they are invisible.
+     * When {@code controllingUi} is {@code false}, we are running on the search indexer thread and
+     * visibility must be determined synchronously. {@link #isAvailable()} can rely on all
+     * preferences having their visibility determined already and should return whether the group is
+     * visible or not.
+     */
+    public ExposureChangesCategoryPreferenceController(Context context, Lifecycle lifecycle,
+            List<DynamicAvailabilityPreferenceController> controllers, boolean controllingUi) {
+        super(context, lifecycle);
+        mControllingUi = controllingUi;
+        for (final DynamicAvailabilityPreferenceController controller : controllers) {
+            controller.setAvailabilityObserver(this);
+        }
+    }
+
+    @Override
+    public void onPreferenceAvailabilityUpdated(String key, boolean available) {
+        if (available) {
+            mAvailablePrefs.add(key);
+        } else {
+            mAvailablePrefs.remove(key);
+        }
+        available = haveAnyVisiblePreferences();
+        if (mControllingUi) {
+            notifyOnAvailabilityUpdate(available);
+        }
+        if (mPreference != null) {
+            mPreference.setVisible(available);
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mPreference = preference;
+        mPreference.setVisible(haveAnyVisiblePreferences());
+    }
+
+    @Override
+    public boolean isAvailable() {
+        if (mControllingUi) {
+            // When running on the main UI thread, some preferences determine their visibility
+            // asynchronously. Always return true here and determine the pref group's actual
+            // visibility as the other preferences report their visibility asynchronously via
+            // onPreferenceAvailabilityUpdated().
+            return true;
+        }
+        final boolean available = haveAnyVisiblePreferences();
+        notifyOnAvailabilityUpdate(available);
+        return available;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_EXPOSURE_CHANGES_CATEGORY;
+    }
+
+    private boolean haveAnyVisiblePreferences() {
+        return mAvailablePrefs.size() > 0;
+    }
+}
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index 2f35da6..7485fe2 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -46,6 +46,8 @@
 
     @Override
     public boolean isAvailable() {
-        return getMaximumFailedPasswordsBeforeWipe() > 0;
+        final boolean available = getMaximumFailedPasswordsBeforeWipe() > 0;
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 }
diff --git a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
index 6ee7fc4..76c49da 100644
--- a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
+++ b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
@@ -32,7 +32,9 @@
 
     @Override
     public boolean isAvailable() {
-        return mFeatureProvider.isGlobalHttpProxySet();
+        final boolean available = mFeatureProvider.isGlobalHttpProxySet();
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
index b090bed..b13aec7 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -43,7 +43,9 @@
 
     @Override
     public boolean isAvailable() {
-        return mFeatureProvider.getImeLabelIfOwnerSet() != null;
+        final boolean available = mFeatureProvider.getImeLabelIfOwnerSet() != null;
+        notifyOnAvailabilityUpdate(available);
+        return available;
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 45d0db2..6b7ddf9 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -99,6 +99,7 @@
             }
         };
         mTriggerPref.init(this);
+
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
     }
 
diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index f1c7455..12f28d2 100644
--- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -20,21 +20,27 @@
 import android.content.res.Resources;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.core.lifecycle.Lifecycle;
 
 public class DoubleTwistPreferenceController extends GesturePreferenceController {
 
     private static final String PREF_KEY_VIDEO = "gesture_double_twist_video";
     private final String mDoubleTwistPrefKey;
+    private final UserManager mUserManager;
 
     public DoubleTwistPreferenceController(Context context, Lifecycle lifecycle, String key) {
         super(context, lifecycle);
         mDoubleTwistPrefKey = key;
+        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
 
     @Override
@@ -55,9 +61,14 @@
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final boolean enabled = (boolean) newValue;
+        final int enabled = (boolean) newValue ? 1 : 0;
         Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled ? 1 : 0);
+                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled);
+        final int managedProfileUserId = getManagedProfileUserId();
+        if (managedProfileUserId != UserHandle.USER_NULL) {
+            Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled, managedProfileUserId);
+        }
         return true;
     }
 
@@ -68,6 +79,11 @@
         return doubleTwistEnabled != 0;
     }
 
+    @VisibleForTesting
+    int getManagedProfileUserId() {
+        return Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
+    }
+
     private boolean hasSensor(int nameResId, int vendorResId) {
         final Resources resources = mContext.getResources();
         final String name = resources.getString(nameResId);
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index efcb5a1..6c4f27c 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -95,7 +95,6 @@
         getPreferenceScreen().setOrderingAsAdded(true);
         setupBlock();
         addHeaderPref();
-        addAppLinkPref();
 
         mShowLegacyChannelConfig = mBackend.onlyHasDefaultChannel(mAppRow.pkg, mAppRow.uid);
         if (mShowLegacyChannelConfig) {
@@ -120,6 +119,7 @@
                         return;
                     }
                     populateChannelList();
+                    addAppLinkPref();
                 }
             }.execute();
         }
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index 8c43a3f..3ae0bfa 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -22,15 +22,17 @@
 
 import android.app.Activity;
 import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.content.Intent;
-import android.content.pm.UserInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.UserHandle;
+import android.os.AsyncTask;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
+import android.text.BidiFormatter;
+import android.text.SpannableStringBuilder;
 import android.util.ArrayMap;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -38,7 +40,6 @@
 import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
@@ -64,6 +65,8 @@
     private RestrictedSwitchPreference mVibrate;
     private NotificationSoundPreference mRingtone;
     private FooterPreference mFooter;
+    private NotificationChannelGroup mChannelGroup;
+    private AppHeaderController mHeaderPref;
 
     @Override
     public int getMetricsCategory() {
@@ -93,6 +96,27 @@
             mShowLegacyChannelConfig = true;
         } else {
             populateUpgradedChannelPrefs();
+
+            if (mChannel.getGroup() != null) {
+                // Go look up group name
+                new AsyncTask<Void, Void, Void>() {
+                    @Override
+                    protected Void doInBackground(Void... unused) {
+                        if (mChannel.getGroup() != null) {
+                            mChannelGroup = mBackend.getGroup(mChannel.getGroup(), mPkg, mUid);
+                        }
+                        return null;
+                    }
+
+                    @Override
+                    protected void onPostExecute(Void unused) {
+                        if (getHost() == null || mChannelGroup == null) {
+                            return;
+                        }
+                        setChannelGroupLabel(mChannelGroup.getName());
+                    }
+                }.execute();
+            }
         }
 
         updateDependents(mChannel.getImportance() == IMPORTANCE_NONE);
@@ -114,9 +138,10 @@
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(rows);
         final Activity activity = getActivity();
-        final Preference pref = FeatureFactory.getFactory(activity)
+        mHeaderPref = FeatureFactory.getFactory(activity)
                 .getApplicationFeatureProvider(activity)
-                .newAppHeaderController(this /* fragment */, null /* appHeader */)
+                .newAppHeaderController(this /* fragment */, null /* appHeader */);
+        final Preference pref = mHeaderPref
                 .setIcon(mAppRow.icon)
                 .setLabel(mChannel.getName())
                 .setSummary(mAppRow.label)
@@ -128,6 +153,20 @@
         getPreferenceScreen().addPreference(pref);
     }
 
+    private void setChannelGroupLabel(CharSequence groupName) {
+        final SpannableStringBuilder summary = new SpannableStringBuilder();
+        BidiFormatter bidi = BidiFormatter.getInstance();
+        summary.append(bidi.unicodeWrap(mAppRow.label.toString()));
+        if (groupName != null) {
+            summary.append(bidi.unicodeWrap(mContext.getText(
+                    R.string.notification_header_divider_symbol_with_spaces)));
+            summary.append(bidi.unicodeWrap(groupName.toString()));
+        }
+        final Activity activity = getActivity();
+        mHeaderPref.setSummary(summary.toString());
+        mHeaderPref.done(activity, getPrefContext());
+    }
+
     private void addFooterPref() {
         if (!TextUtils.isEmpty(mChannel.getDescription())) {
             FooterPreference descPref = new FooterPreference(getPrefContext());
@@ -175,6 +214,7 @@
     private void setupVibrate() {
         mVibrate = (RestrictedSwitchPreference) findPreference(KEY_VIBRATE);
         mVibrate.setDisabledByAdmin(mSuspendedAppsAdmin);
+        mVibrate.setEnabled(!(mAppRow.lockedImportance || mVibrate.isDisabledByAdmin()));
         mVibrate.setChecked(mChannel.shouldVibrate());
         mVibrate.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
@@ -191,6 +231,7 @@
     private void setupRingtone() {
         mRingtone = (NotificationSoundPreference) findPreference(KEY_RINGTONE);
         mRingtone.setRingtone(mChannel.getSound());
+        mRingtone.setEnabled(!(mAppRow.lockedImportance));
         mRingtone.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -246,12 +287,15 @@
         channelArgs.putBoolean(AppHeader.EXTRA_HIDE_INFO_BUTTON, true);
         channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME, mPkg);
         channelArgs.putString(Settings.EXTRA_CHANNEL_ID, mChannel.getId());
-        Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
-                ChannelImportanceSettings.class.getName(),
-                channelArgs, null, R.string.notification_importance_title, null,
-                false, getMetricsCategory());
-        mImportance.setIntent(channelIntent);
-        mImportance.setEnabled(mSuspendedAppsAdmin == null);
+        mImportance.setEnabled(mSuspendedAppsAdmin == null && !mAppRow.lockedImportance);
+        // Set up intent to show importance selection only if this setting is enabled.
+        if (mImportance.isEnabled()) {
+            Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+                    ChannelImportanceSettings.class.getName(),
+                    channelArgs, null, R.string.notification_importance_title, null,
+                    false, getMetricsCategory());
+            mImportance.setIntent(channelIntent);
+        }
         mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
     }
 
@@ -345,7 +389,7 @@
         if (mAppLink != null) {
             setVisible(mAppLink, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
         }
-        if (mFooter !=null) {
+        if (mFooter != null) {
             setVisible(mFooter, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
         }
     }
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 84d7e31..96737db 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -122,6 +122,19 @@
         }
     }
 
+
+    public NotificationChannelGroup getGroup(String groupId, String pkg, int uid) {
+        if (groupId == null) {
+            return null;
+        }
+        try {
+            return sINM.getNotificationChannelGroupForPackage(groupId, pkg, uid);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return null;
+        }
+    }
+
     public ParceledListSlice<NotificationChannelGroup> getChannelGroups(String pkg, int uid) {
         try {
             return sINM.getNotificationChannelGroupsForPackage(pkg, uid, false);
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index bfa9355..717cf08 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -263,7 +263,7 @@
     }
 
     protected void addAppLinkPref() {
-        if (mAppRow.settingsIntent != null) {
+        if (mAppRow.settingsIntent != null && mAppLink == null) {
             mAppLink = new Preference(getPrefContext());
             mAppLink.setKey(KEY_APP_LINK);
             mAppLink.setOrder(500);
@@ -293,6 +293,8 @@
     private void setupImportanceToggle() {
         mImportanceToggle = (RestrictedSwitchPreference) findPreference(KEY_ALLOW_SOUND);
         mImportanceToggle.setDisabledByAdmin(mSuspendedAppsAdmin);
+        mImportanceToggle.setEnabled(!(mAppRow.lockedImportance
+                || mImportanceToggle.isDisabledByAdmin()));
         mImportanceToggle.setChecked(mChannel.getImportance() >= IMPORTANCE_DEFAULT
                 || mChannel.getImportance() == IMPORTANCE_UNSPECIFIED);
         mImportanceToggle.setOnPreferenceChangeListener(
@@ -313,6 +315,7 @@
     protected void setupPriorityPref(boolean priority) {
         mPriority = (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
         mPriority.setDisabledByAdmin(mSuspendedAppsAdmin);
+        mPriority.setEnabled(!(mAppRow.lockedImportance || mPriority.isDisabledByAdmin()));
         mPriority.setChecked(priority);
         mPriority.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java
index cdbd5b3..18efc33 100644
--- a/src/com/android/settings/notification/SettingPref.java
+++ b/src/com/android/settings/notification/SettingPref.java
@@ -121,19 +121,6 @@
         if (mTwoState != null) {
             mTwoState.setChecked(val != 0);
         } else if (mDropDown != null) {
-            if (mValues != null) {
-                int index = 0;
-                for (int len = mValues.length; index < len; index++) {
-                    if (mValues[index] == val) {
-                        break;
-                    }
-                }
-
-                if (index < mValues.length) {
-                    CharSequence entry = mDropDown.getEntries()[index];
-                    mDropDown.setSummary(entry);
-                }
-            }
             mDropDown.setValue(Integer.toString(val));
         }
     }
diff --git a/src/com/android/settings/search2/HeaderDecorator.java b/src/com/android/settings/search2/HeaderDecorator.java
deleted file mode 100644
index 786692e..0000000
--- a/src/com/android/settings/search2/HeaderDecorator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search2;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import com.android.settings.R;
-
-public class HeaderDecorator extends RecyclerView.ItemDecoration {
-    @Override
-    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
-            RecyclerView.State state) {
-        super.getItemOffsets(outRect, view, parent, state);
-        if (parent.getChildAdapterPosition(view) > 0) {
-            return;
-        }
-
-        Context context = view.getContext();
-        TypedArray ta = context.obtainStyledAttributes(new int[]{android.R.attr.actionBarSize});
-        outRect.top = ta.getDimensionPixelSize(0, 0);
-        ta.recycle();
-
-        outRect.top += 2 * context.getResources().getDimensionPixelSize(R.dimen.search_bar_margin);
-    }
-}
diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
index 1179c51..4e47f9d 100644
--- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
@@ -54,10 +54,13 @@
         String menuTitle = activity.getString(R.string.search_menu);
         MenuItem menuItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, menuTitle)
                 .setIcon(R.drawable.ic_search_24dp)
-                .setOnMenuItemClickListener(item -> {
-                    Intent intent = new Intent(activity, SearchActivity.class);
-                    activity.startActivity(intent);
-                    return true;
+                .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem item) {
+                        Intent intent = new Intent(activity, SearchActivity.class);
+                        activity.startActivity(intent);
+                        return true;
+                    }
                 });
 
         menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search2/SearchFragment.java
index b4d443b..2a5c961 100644
--- a/src/com/android/settings/search2/SearchFragment.java
+++ b/src/com/android/settings/search2/SearchFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.search2;
 
+import android.app.ActionBar;
 import android.app.Activity;
 import android.app.LoaderManager;
 import android.content.Context;
@@ -31,6 +32,7 @@
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
 import android.widget.SearchView;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -58,6 +60,9 @@
         LoaderManager.LoaderCallbacks<List<? extends SearchResult>>, IndexingCallback {
     private static final String TAG = "SearchFragment";
 
+    @VisibleForTesting
+    static final int SEARCH_TAG = "SearchViewTag".hashCode();
+
     // State values
     private static final String STATE_QUERY = "state_query";
     private static final String STATE_SHOWING_SAVED_QUERY = "state_showing_saved_query";
@@ -90,12 +95,12 @@
     @VisibleForTesting
     SavedQueryController mSavedQueryController;
 
-    @VisibleForTesting
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     SearchFeatureProvider mSearchFeatureProvider;
 
     private SearchResultsAdapter mSearchAdapter;
 
-    @VisibleForTesting
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     RecyclerView mResultsRecyclerView;
     @VisibleForTesting
     SearchView mSearchView;
@@ -144,6 +149,13 @@
         }
 
         final Activity activity = getActivity();
+        final ActionBar actionBar = activity.getActionBar();
+        mSearchView = makeSearchView(actionBar, mQuery);
+        actionBar.setCustomView(mSearchView);
+        actionBar.setDisplayShowCustomEnabled(true);
+        actionBar.setDisplayShowTitleEnabled(false);
+        mSearchView.requestFocus();
+
         // Run the Index update only if we have some space
         if (!Utils.isLowStorage(activity)) {
             mSearchFeatureProvider.updateIndex(activity, this /* indexingCallback */);
@@ -160,14 +172,8 @@
         mResultsRecyclerView.setAdapter(mSearchAdapter);
         mResultsRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mResultsRecyclerView.addOnScrollListener(mScrollListener);
-        mResultsRecyclerView.addItemDecoration(new HeaderDecorator());
 
         mNoResultsView = view.findViewById(R.id.no_results_layout);
-
-        mSearchView = view.findViewById(R.id.search_view);
-        mSearchView.setQuery(mQuery, false /* submitQuery */);
-        mSearchView.setOnQueryTextListener(this);
-        mSearchView.requestFocus();
         return view;
     }
 
@@ -341,6 +347,19 @@
         onQueryTextChange(query);
     }
 
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    SearchView makeSearchView(ActionBar actionBar, String query) {
+        final SearchView searchView = new SearchView(actionBar.getThemedContext());
+        searchView.setIconifiedByDefault(false);
+        searchView.setQuery(query, false /* submitQuery */);
+        searchView.setOnQueryTextListener(this);
+        searchView.setTag(SEARCH_TAG, searchView);
+        final LayoutParams lp =
+                new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        searchView.setLayoutParams(lp);
+        return searchView;
+    }
+
     private void hideKeyboard() {
         final Activity activity = getActivity();
         if (activity != null) {
diff --git a/src/com/android/settings/search2/SearchViewHolder.java b/src/com/android/settings/search2/SearchViewHolder.java
index 1175fcb..ab13252 100644
--- a/src/com/android/settings/search2/SearchViewHolder.java
+++ b/src/com/android/settings/search2/SearchViewHolder.java
@@ -34,6 +34,8 @@
  */
 public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
 
+    private final String DYNAMIC_PLACEHOLDER = "%s";
+
     private final String mPlaceholderSummary;
 
     public final TextView titleView;
@@ -57,8 +59,10 @@
 
     public void onBind(SearchFragment fragment, SearchResult result) {
         titleView.setText(result.title);
+        // TODO (b/36101902) remove check for DYNAMIC_PLACEHOLDER
         if (TextUtils.isEmpty(result.summary)
-                || TextUtils.equals(result.summary, mPlaceholderSummary)) {
+                || TextUtils.equals(result.summary, mPlaceholderSummary)
+                || TextUtils.equals(result.summary, DYNAMIC_PLACEHOLDER)) {
             summaryView.setVisibility(View.GONE);
         } else {
             summaryView.setText(result.summary);
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 7a13a0e..506ada9 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -16,6 +16,7 @@
 package com.android.settings.widget;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
 import android.graphics.Paint;
@@ -34,6 +35,8 @@
  */
 public class DonutView extends View {
     private static final int TOP = -90;
+    // From manual testing, this is the longest we can go without visual errors.
+    private static final int LINE_CHARACTER_LIMIT = 10;
     private float mStrokeWidth;
     private float mDeviceDensity;
     private int mPercent;
@@ -73,16 +76,19 @@
         mFilledArc.setColor(Utils.getDefaultColor(mContext, R.color.meter_consumed_color));
         mFilledArc.setColorFilter(mAccentColorFilter);
 
+        Resources resources = context.getResources();
         mTextPaint = new TextPaint();
         mTextPaint.setColor(Utils.getColorAccent(getContext()));
         mTextPaint.setAntiAlias(true);
-        mTextPaint.setTextSize(14f * mDeviceDensity);
+        mTextPaint.setTextSize(
+                resources.getDimension(R.dimen.storage_donut_view_label_text_size));
         mTextPaint.setTextAlign(Paint.Align.CENTER);
 
         mBigNumberPaint = new TextPaint();
         mBigNumberPaint.setColor(Utils.getColorAccent(getContext()));
         mBigNumberPaint.setAntiAlias(true);
-        mBigNumberPaint.setTextSize(30f * mDeviceDensity);
+        mBigNumberPaint.setTextSize(
+                resources.getDimension(R.dimen.storage_donut_view_percent_text_size));
         mBigNumberPaint.setTextAlign(Paint.Align.CENTER);
     }
 
@@ -136,6 +142,13 @@
         mPercent = percent;
         mPercentString = Utils.formatPercentage(mPercent);
         mFullString = getContext().getString(R.string.storage_percent_full);
+        if (mFullString.length() > LINE_CHARACTER_LIMIT) {
+            mTextPaint.setTextSize(
+                    getContext()
+                            .getResources()
+                            .getDimension(
+                                    R.dimen.storage_donut_view_shrunken_label_text_size));
+        }
         invalidate();
     }
 
diff --git a/src/com/android/settings/widget/FooterPreference.java b/src/com/android/settings/widget/FooterPreference.java
index 9cb9e11..84e3ed8 100644
--- a/src/com/android/settings/widget/FooterPreference.java
+++ b/src/com/android/settings/widget/FooterPreference.java
@@ -50,11 +50,14 @@
         super.onBindViewHolder(holder);
         TextView title = holder.itemView.findViewById(android.R.id.title);
         title.setMovementMethod(new LinkMovementMethod());
+        title.setClickable(false);
+        title.setLongClickable(false);
     }
 
     private void init() {
         setIcon(R.drawable.ic_info_outline_24dp);
         setKey(KEY_FOOTER);
         setOrder(ORDER_FOOTER);
+        setSelectable(false);
     }
 }
diff --git a/src/com/android/settings/wifi/ConnectivityManagerWrapper.java b/src/com/android/settings/wifi/ConnectivityManagerWrapper.java
new file mode 100644
index 0000000..7317666
--- /dev/null
+++ b/src/com/android/settings/wifi/ConnectivityManagerWrapper.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.wifi;
+
+import android.net.ConnectivityManager;
+
+/**
+ * Wrapper around {@link ConnectivityManager} to facilitate unit testing.
+ */
+public class ConnectivityManagerWrapper {
+    private final ConnectivityManager mConnectivityManager;
+
+    public ConnectivityManagerWrapper(ConnectivityManager connectivityManager) {
+        mConnectivityManager = connectivityManager;
+    }
+
+    /**
+     * {@link ConnectivityManager#stopTethering}
+     */
+    public void stopTethering(int type) {
+        mConnectivityManager.stopTethering(type);
+    }
+}
diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index 1a60256..bf67565 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -38,7 +38,7 @@
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settingslib.wifi.AccessPoint;
 import com.android.settingslib.wifi.AccessPointPreference;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiSavedConfigUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -124,7 +124,8 @@
         PreferenceScreen preferenceScreen = getPreferenceScreen();
         final Context context = getPrefContext();
 
-        final List<AccessPoint> accessPoints = getSavedConfigs(context, mWifiManager);
+        final List<AccessPoint> accessPoints =
+                WifiSavedConfigUtils.getAllConfigs(context, mWifiManager);
         Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);
         preferenceScreen.removeAll();
 
@@ -142,39 +143,6 @@
         }
     }
 
-    /**
-     * Retrieved the list of saved network configurations from {@link WifiManager}.
-     * Each configuration is represented by {@link AccessPoint}.
-     *
-     * @param context The application context
-     * @param wifiManager An instance of {@link WifiManager}
-     * @return List of {@link AccessPoint}
-     */
-    private static List<AccessPoint> getSavedConfigs(Context context, WifiManager wifiManager) {
-        List<AccessPoint> savedConfigs = new ArrayList<>();
-        List<WifiConfiguration> savedNetworks = wifiManager.getConfiguredNetworks();
-        for (WifiConfiguration network : savedNetworks) {
-            // Configuration for Passpoint network is configured temporary by WifiService for
-            // connection attempt only.  The underlying configuration is saved as Passpoint
-            // configuration, which will be retrieved with WifiManager#getPasspointConfiguration
-            // call below.
-            if (network.isPasspoint()) {
-                continue;
-            }
-            savedConfigs.add(new AccessPoint(context, network));
-        }
-        try {
-            List<PasspointConfiguration> savedPasspointConfigs =
-                    wifiManager.getPasspointConfigurations();
-            for (PasspointConfiguration config : savedPasspointConfigs) {
-                savedConfigs.add(new AccessPoint(context, config));
-            }
-        } catch (UnsupportedOperationException e) {
-            // Passpoint not supported.
-        }
-        return savedConfigs;
-    }
-
     private void showDialog(LongPressAccessPointPreference accessPoint, boolean edit) {
         if (mDialog != null) {
             removeDialog(WifiSettings.WIFI_DIALOG_ID);
@@ -292,8 +260,8 @@
                 result.add(data);
 
                 // Add available Wi-Fi access points
-                final List<AccessPoint> accessPoints =
-                        getSavedConfigs(context, context.getSystemService(WifiManager.class));
+                final List<AccessPoint> accessPoints = WifiSavedConfigUtils.getAllConfigs(
+                        context, context.getSystemService(WifiManager.class));
 
                 final int accessPointsSize = accessPoints.size();
                 for (int i = 0; i < accessPointsSize; ++i){
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index abab154..7718898 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
@@ -27,6 +28,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.widget.Toast;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -43,6 +45,7 @@
 
     private final SwitchWidgetController mSwitchWidget;
     private final WifiManager mWifiManager;
+    private final ConnectivityManagerWrapper mConnectivityManager;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     private Context mContext;
@@ -76,12 +79,21 @@
     private static final int EVENT_UPDATE_INDEX = 0;
 
     public WifiEnabler(Context context, SwitchWidgetController switchWidget,
-            MetricsFeatureProvider metricsFeatureProvider) {
+        MetricsFeatureProvider metricsFeatureProvider) {
+        this(context, switchWidget, metricsFeatureProvider, new ConnectivityManagerWrapper(
+            (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)));
+    }
+
+    @VisibleForTesting
+    WifiEnabler(Context context, SwitchWidgetController switchWidget,
+            MetricsFeatureProvider metricsFeatureProvider,
+            ConnectivityManagerWrapper connectivityManagerWrapper) {
         mContext = context;
         mSwitchWidget = switchWidget;
         mSwitchWidget.setListener(this);
         mMetricsFeatureProvider = metricsFeatureProvider;
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mConnectivityManager = connectivityManagerWrapper;
 
         mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
         // The order matters! We really should not depend on this. :(
@@ -198,7 +210,7 @@
 
         // Disable tethering if enabling Wifi
         if (mayDisableTethering(isChecked)) {
-            mWifiManager.setWifiApEnabled(null, false);
+            mConnectivityManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
         }
         if (isChecked) {
             mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_WIFI_ON);
diff --git a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java b/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
index 3d39cdb..e6fe899 100644
--- a/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
+++ b/tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java
@@ -28,13 +28,11 @@
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
 import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withTagKey;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.core.AllOf.allOf;
 
-import com.android.settings.R;
-
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
@@ -45,7 +43,7 @@
 
     @Test
     public void test_OpenKeyboardOnSearchLaunch() {
-        onView(allOf(hasFocus(), withId(R.id.search_view)))
+        onView(allOf(hasFocus(), withTagKey(SearchFragment.SEARCH_TAG)))
                 .check(matches(withClassName(containsString(SearchView.class.getName()))));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index eecd88a..65e9708 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -20,15 +20,12 @@
 import android.app.ActivityManager;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 
 import android.os.Bundle;
 import android.view.Menu;
-
-import com.android.settings.search2.SearchActivity;
 import com.android.settings.testutils.FakeFeatureFactory;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +35,6 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -142,15 +138,4 @@
 
         assertThat(mActivity.mDisplaySearch).isTrue();
     }
-
-    @Test
-    public void testOnClick() {
-        doReturn("com.android.settings").when(mActivity).getPackageName();
-
-        mActivity.onClick(null);
-
-        Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
-        assertThat(intent.getComponent()).isEqualTo(
-                new ComponentName("com.android.settings", SearchActivity.class.getName()));
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
index 1daefc4..a991e7a 100644
--- a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
@@ -93,10 +93,6 @@
                         getPackageName(),
                         Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
                         null));
-                paths.add(new ResourcePath(
-                        getPackageName(),
-                        Fs.fileFromPath("./frameworks/support/v7/cardview/res"),
-                        null));
                 return paths;
             }
         };
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
index d93d3a7..cd66d5e 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
@@ -21,6 +21,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Answers.RETURNS_DEEP_STUBS;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
 import android.app.Fragment;
@@ -46,6 +47,8 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AutoSyncWorkDataPreferenceControllerTest {
 
+    private static int MANAGED_PROFILE_ID = 10;
+
     @Mock(answer = RETURNS_DEEP_STUBS)
     private UserManager mUserManager;
     @Mock(answer = RETURNS_DEEP_STUBS)
@@ -80,29 +83,30 @@
 
     @Test
     public void checkIsAvailable_singleUserProfile_shouldNotDisplay() {
-        final List<UserInfo> infos = new ArrayList<>();
-        infos.add(new UserInfo(1, "user 1", 0));
         when(mUserManager.isManagedProfile()).thenReturn(false);
         when(mUserManager.isLinkedUser()).thenReturn(false);
-        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
+
+        final List<UserInfo> infos = new ArrayList<>();
+        infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
+        when(mUserManager.getProfiles(eq(UserHandle.USER_SYSTEM))).thenReturn(infos);
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     public void multipleProfile_shouldInitWithWorkProfileUserHandle() {
-        final int id1 = 1;
-        final int id2 = 2;
-        final UserInfo managedUser = new UserInfo(id2, "user 2", FLAG_MANAGED_PROFILE);
-        final List<UserHandle> infos = new ArrayList<>();
-        infos.add(new UserHandle(id1));
-        infos.add(new UserHandle(id2));
-        when(mUserManager.getUserProfiles()).thenReturn(infos);
-        when(mUserManager.getUserHandle()).thenReturn(id1);
-        when(mUserManager.getUserInfo(id2)).thenReturn(managedUser);
+        when(mUserManager.isManagedProfile()).thenReturn(false);
+        when(mUserManager.isLinkedUser()).thenReturn(false);
+
+        final List<UserInfo> infos = new ArrayList<>();
+        infos.add(new UserInfo(UserHandle.USER_SYSTEM, "user 1", 0 /* flags */));
+        infos.add(new UserInfo(
+                MANAGED_PROFILE_ID, "work profile", UserInfo.FLAG_MANAGED_PROFILE));
+        when(mUserManager.getProfiles(eq(UserHandle.USER_SYSTEM))).thenReturn(infos);
 
         mController = new AutoSyncWorkDataPreferenceController(mContext, mFragment);
 
-        assertThat(mController.mUserHandle.getIdentifier()).isEqualTo(id2);
+        assertThat(mController.mUserHandle.getIdentifier()).isEqualTo(MANAGED_PROFILE_ID);
+        assertThat(mController.isAvailable()).isTrue();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index 98c28bf..2fbad13 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications;
 
 import android.app.AlertDialog;
+import android.app.LoaderManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
@@ -25,6 +26,7 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.os.BatteryStats;
+import android.os.Bundle;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
@@ -107,8 +109,10 @@
     private PackageManager mPackageManager;
     @Mock
     private BatteryUtils mBatteryUtils;
-    private FakeFeatureFactory mFeatureFactory;
+    @Mock
+    private LoaderManager mLoaderManager;
 
+    private FakeFeatureFactory mFeatureFactory;
     private InstalledAppDetails mAppDetail;
     private Context mShadowContext;
     private Preference mBatteryPreference;
@@ -528,6 +532,16 @@
         verify(button).setText(R.string.disable_text);
     }
 
+    @Test
+    public void testRestartBatteryStatsLoader() {
+        doReturn(mLoaderManager).when(mAppDetail).getLoaderManager();
+
+        mAppDetail.restartBatteryStatsLoader();
+
+        verify(mLoaderManager).restartLoader(InstalledAppDetails.LOADER_BATTERY, Bundle.EMPTY,
+                mAppDetail.mBatteryCallbacks);
+    }
+
     @Implements(Utils.class)
     public static class ShadowUtils {
         @Implementation
diff --git a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
index 38a8356..399c753 100644
--- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
@@ -22,6 +22,7 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -50,6 +51,7 @@
     private @Mock Preference mPreference;
     private @Mock PreferenceScreen mScreen;
     private @Mock Lifecycle mLifecycle;
+    private @Mock PreferenceAvailabilityObserver mObserver;
 
     private boolean mIsAvailable;
     private Preference mUpdatedPreference = null;
@@ -115,6 +117,21 @@
         assertThat(mUpdatedPreference).isEqualTo(mPreference);
     }
 
+    @Test
+    public void testNotifyOnAvailabilityUpdate() {
+        final DynamicAvailabilityPreferenceController controller
+                = new DynamicAvailabilityPreferenceControllerTestable(mLifecycle);
+        controller.setAvailabilityObserver(mObserver);
+        assertThat(controller.getAvailabilityObserver()).isEqualTo(mObserver);
+
+        mIsAvailable = false;
+        controller.isAvailable();
+        verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, false);
+
+        mIsAvailable = true;
+        controller.isAvailable();
+        verify(mObserver).onPreferenceAvailabilityUpdated(PREFERENCE_KEY, true);
+    }
 
     private class DynamicAvailabilityPreferenceControllerTestable
             extends DynamicAvailabilityPreferenceController {
@@ -124,6 +141,7 @@
 
         @Override
         public boolean isAvailable() {
+            notifyOnAvailabilityUpdate(mIsAvailable);
             return mIsAvailable;
         }
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
index 3b27cf1..d7daa03 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -19,23 +19,16 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Icon;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.conditional.Condition;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
-import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
@@ -54,7 +47,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -108,53 +100,6 @@
     }
 
     @Test
-    public void testOnBindViewHolder_spacer_noSuggestions_noConditions() {
-        makeCategory();
-        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
-
-        mDashboardAdapter.onBindViewHolder(holder, 0);
-
-        assertThat(holder.itemView.getBackground()).isNull();
-    }
-
-    @Test
-    public void testOnBindViewHolder_spacer_suggestion_noConditions() {
-        setupSuggestions(makeSuggestions("pkg1"));
-        makeCategory();
-        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
-
-        mDashboardAdapter.onBindViewHolder(holder, 0);
-
-        assertThat(holder.itemView.getBackground()).isNotNull();
-        assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
-    }
-
-    @Test
-    public void testOnBindViewHolder_spacer_noSuggestion_condition() {
-        makeCondition();
-        makeCategory();
-        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
-
-        mDashboardAdapter.onBindViewHolder(holder, 0);
-
-        assertThat(holder.itemView.getBackground()).isNotNull();
-        assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
-    }
-
-    @Test
-    public void testOnBindViewHolder_spacer_suggestion_condition() {
-        setupSuggestions(makeSuggestions("pkg1"));
-        makeCondition();
-        makeCategory();
-        DashboardAdapter.DashboardItemHolder holder = setupSpacer();
-
-        mDashboardAdapter.onBindViewHolder(holder, 0);
-
-        assertThat(holder.itemView.getBackground()).isNotNull();
-        assertThat(holder.itemView.getBackground()).isInstanceOf(ColorDrawable.class);
-    }
-
-    @Test
     public void testSetConditions_AfterSetConditions_ExpandedConditionNull() {
         mDashboardAdapter.onExpandClick(mView);
         assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isEqualTo(mCondition);
@@ -164,7 +109,7 @@
 
     @Test
     public void testSuggestionsLogs_NotExpanded() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         verify(mFactory.metricsFeatureProvider, times(2)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
                 mActionPackageCaptor.capture());
@@ -179,7 +124,7 @@
 
     @Test
     public void testSuggestionsLogs_NotExpandedAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         mDashboardAdapter.onPause();
         verify(mFactory.metricsFeatureProvider, times(4)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
@@ -196,7 +141,7 @@
 
     @Test
     public void testSuggestionsLogs_Expanded() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -215,7 +160,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -238,7 +183,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPause() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -263,7 +208,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
-        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -292,7 +237,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
-        setupSuggestions(makeSuggestions("pkg1"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -309,7 +254,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
-        setupSuggestions(makeSuggestions("pkg1"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
@@ -328,7 +273,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
-        setupSuggestions(makeSuggestions("pkg1"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -348,7 +293,7 @@
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
-        setupSuggestions(makeSuggestions("pkg1"));
+        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
         mDashboardAdapter.onPause();
         mDashboardAdapter.onBindSuggestionHeader(
                 mSuggestionHolder, mSuggestionHeaderData);
@@ -368,7 +313,7 @@
         assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
     }
 
-    private List<Tile> makeSuggestions(String... pkgNames) {
+    private List<Tile> makeSuggestions(String[] pkgNames) {
         final List<Tile> suggestions = new ArrayList<>();
         for (String pkgName : pkgNames) {
             Tile suggestion = new Tile();
@@ -379,31 +324,11 @@
         return suggestions;
     }
 
-    private void setupSuggestions(List<Tile> suggestions) {
+    private void setUpSuggestions(List<Tile> suggestions) {
         mDashboardAdapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
         mSuggestionHolder = mDashboardAdapter.onCreateViewHolder(
                 new FrameLayout(RuntimeEnvironment.application),
-                mDashboardAdapter.getItemViewType(1));
+                mDashboardAdapter.getItemViewType(0));
     }
 
-    private void makeCondition() {
-        final List<Condition> conditions = new ArrayList<>();
-        Condition condition = mock(Condition.class);
-        when(condition.shouldShow()).thenReturn(true);
-        conditions.add(condition);
-        mDashboardAdapter.setConditions(conditions);
-    }
-
-    private void makeCategory() {
-        List<DashboardCategory> categories = new ArrayList<>();
-        categories.add(new DashboardCategory());
-        mDashboardAdapter.setCategory(categories);
-    }
-
-    private DashboardAdapter.DashboardItemHolder setupSpacer() {
-        Context context = RuntimeEnvironment.application;
-        final View view = LayoutInflater.from(context)
-                .inflate(R.layout.dashboard_header_spacer, new LinearLayout(context), false);
-        return new DashboardAdapter.DashboardItemHolder(view);
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index 8bbb15b..abea565 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -112,7 +112,7 @@
     public void testBuildItemsData_containsAllData() {
         final DashboardData.SuggestionHeaderData data =
                 new DashboardData.SuggestionHeaderData(false, 1, 0);
-        final Object[] expectedObjects = {null, mTestCondition, null, data, mTestSuggestion,
+        final Object[] expectedObjects = {mTestCondition, null, data, mTestSuggestion,
                 mDashboardCategory, mTestCategoryTile};
         final int expectedSize = expectedObjects.length;
 
@@ -171,7 +171,7 @@
     @Test
     public void testDiffUtil_DataEqual_noResultData() {
         List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-        testDiffUtil(mDashboardDataWithOneConditions,
+        testDiffUtil(mDashboardDataWithOneConditions, 
                 mDashboardDataWithOneConditions, testResultData);
     }
 
@@ -180,7 +180,7 @@
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
         testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_INSERT, 2, 1));
+                ListUpdateResult.ResultData.TYPE_OPERATION_INSERT, 1, 1));
 
         testDiffUtil(mDashboardDataWithOneConditions,
                 mDashboardDataWithTwoConditions, testResultData);
@@ -191,7 +191,7 @@
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
         testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 1, 6));
+                ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 6));
 
         testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
     }
@@ -203,8 +203,8 @@
                 mDashboardDataWithOneConditions.getItemList(),
                 mDashboardDataWithOneConditions.getItemList());
 
-        // Item in position 1 is condition card, which payload should not be null
-        assertThat(callback.getChangePayload(1, 1)).isNotNull();
+        // Item in position 0 is condition card, which payload should not be null
+        assertThat(callback.getChangePayload(0, 0)).isNotEqualTo(null);
     }
 
     @Test
@@ -214,9 +214,9 @@
                 mDashboardDataWithOneConditions.getItemList(),
                 mDashboardDataWithOneConditions.getItemList());
 
-        // Position 0 is spacer, 1 is condition card, so others' payload should be null
-        for (int i = 2; i < mDashboardDataWithOneConditions.getItemList().size(); i++) {
-            assertThat(callback.getChangePayload(i, i)).isNull();
+        // Only item in position 0 is condition card, so others' payload should be null
+        for (int i = 1; i < mDashboardDataWithOneConditions.getItemList().size(); i++) {
+            assertThat(callback.getChangePayload(i, i)).isEqualTo(null);
         }
 
     }
@@ -356,11 +356,6 @@
 
                 return arg2 - resultData.arg2;
             }
-
-            @Override
-            public String toString() {
-                return "op:" + operation + ",arg1:" + arg1 + ",arg2:" + arg2;
-            }
         }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index 96ce081..c1a3143 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -21,6 +21,7 @@
 
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -32,9 +33,12 @@
 import org.mockito.stubbing.Answer;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -48,6 +52,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     protected Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     protected AdminGrantedPermissionsPreferenceControllerBase mController;
 
@@ -64,6 +69,12 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = createController(true /* async */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     private void setNumberOfPackagesWithAdminGrantedPermissions(int number, boolean async) {
@@ -85,6 +96,7 @@
         setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
         mController.updateState(preference);
         assertThat(preference.isVisible()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
 
         setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
         when(mContext.getResources().getQuantityString(
@@ -93,27 +105,33 @@
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
         assertThat(preference.isVisible()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
     }
 
     @Test
     public void testIsAvailableSync() {
         final AdminGrantedPermissionsPreferenceControllerBase controller
                 = createController(false /* async */);
+        controller.setAvailabilityObserver(mObserver);
 
         setNumberOfPackagesWithAdminGrantedPermissions(0, false /* async */);
         assertThat(controller.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
 
         setNumberOfPackagesWithAdminGrantedPermissions(20, false /* async */);
         assertThat(controller.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
     }
 
     @Test
     public void testIsAvailableAsync() {
         setNumberOfPackagesWithAdminGrantedPermissions(0, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
 
         setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(eq(mKey), anyBoolean());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 9d1bd58..51c8a7b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -22,6 +22,7 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -33,6 +34,7 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -42,12 +44,14 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class AlwaysOnVpnCurrentUserPreferenceControllerTest {
 
-    private final String VPN_SET_DEVICE = "VPN set";
-    private final String VPN_SET_PERSONAL = "VPN set in personal profile";
+    private static final String VPN_SET_DEVICE = "VPN set";
+    private static final String VPN_SET_PERSONAL = "VPN set in personal profile";
+    private static final String KEY_ALWAYS_ON_VPN_PRIMARY_USER = "always_on_vpn_primary_user";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private AlwaysOnVpnCurrentUserPreferenceController mController;
 
@@ -62,6 +66,12 @@
                 .thenReturn(VPN_SET_DEVICE);
         when(mContext.getString(R.string.enterprise_privacy_always_on_vpn_personal))
                 .thenReturn(VPN_SET_PERSONAL);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -85,10 +95,12 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
                 .thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInCurrentUser())
                 .thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_PRIMARY_USER, true);
     }
 
     @Test
@@ -99,6 +111,6 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("always_on_vpn_primary_user");
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ALWAYS_ON_VPN_PRIMARY_USER);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
index 8ac10d1..4562711 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
@@ -21,6 +21,7 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -32,6 +33,7 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -41,9 +43,12 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class AlwaysOnVpnManagedProfilePreferenceControllerTest {
 
+    private static final String KEY_ALWAYS_ON_VPN_MANAGED_PROFILE = "always_on_vpn_managed_profile";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private AlwaysOnVpnManagedProfilePreferenceController mController;
 
@@ -54,6 +59,12 @@
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = new AlwaysOnVpnManagedProfilePreferenceController(mContext,
                 null /* lifecycle */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -61,10 +72,12 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
                 .thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isAlwaysOnVpnSetInManagedProfile())
                 .thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE, true);
     }
 
     @Test
@@ -75,6 +88,6 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("always_on_vpn_managed_profile");
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ALWAYS_ON_VPN_MANAGED_PROFILE);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
index fef2e0f..2c0e320 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTest.java
@@ -23,6 +23,7 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -34,6 +35,7 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -43,9 +45,12 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class CaCertsPreferenceControllerTest {
 
+    private static final String KEY_CA_CERTS = "ca_certs";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private CaCertsPreferenceController mController;
 
@@ -55,6 +60,12 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = new CaCertsPreferenceController(mContext, null /* lifecycle */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -74,10 +85,12 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider
                 .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(0);
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_CA_CERTS, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider
                 .getNumberOfOwnerInstalledCaCertsForCurrentUserAndManagedProfile()).thenReturn(10);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_CA_CERTS, true);
     }
 
     @Test
@@ -88,6 +101,6 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("ca_certs");
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_CA_CERTS);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index 4255d96..cf54bb0 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -24,6 +24,7 @@
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -37,9 +38,12 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyBoolean;
 import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -49,9 +53,13 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class EnterpriseInstalledPackagesPreferenceControllerTest {
 
+    private static final String KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES
+            = "number_enterprise_installed_packages";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private EnterpriseInstalledPackagesPreferenceController mController;
 
@@ -62,6 +70,12 @@
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = new EnterpriseInstalledPackagesPreferenceController(mContext,
                 null /* lifecycle */, true /* async */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     private void setNumberOfEnterpriseInstalledPackages(int number, boolean async) {
@@ -82,6 +96,8 @@
         setNumberOfEnterpriseInstalledPackages(0, true /* async */);
         mController.updateState(preference);
         assertThat(preference.isVisible()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
+                false);
 
         setNumberOfEnterpriseInstalledPackages(20, true /* async */);
         when(mContext.getResources().getQuantityString(
@@ -90,6 +106,8 @@
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");
         assertThat(preference.isVisible()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES,
+                true);
     }
 
     @Test
@@ -97,21 +115,30 @@
         final EnterpriseInstalledPackagesPreferenceController controller
                 = new EnterpriseInstalledPackagesPreferenceController(mContext,
                         null /* lifecycle */, false /* async */);
+        controller.setAvailabilityObserver(mObserver);
 
         setNumberOfEnterpriseInstalledPackages(0, false /* async */);
         assertThat(controller.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(
+                KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, false);
 
         setNumberOfEnterpriseInstalledPackages(20, false /* async */);
         assertThat(controller.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(
+                KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES, true);
     }
 
     @Test
     public void testIsAvailableAsync() {
         setNumberOfEnterpriseInstalledPackages(0, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
 
         setNumberOfEnterpriseInstalledPackages(20, true /* async */);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES), anyBoolean());
     }
 
     @Test
@@ -123,6 +150,6 @@
     @Test
     public void testGetPreferenceKey() {
         assertThat(mController.getPreferenceKey())
-                .isEqualTo("number_enterprise_installed_packages");
+                .isEqualTo(KEY_NUMBER_ENTERPRISE_INSTALLED_PACKAGES);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
index fe48347..101a45a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
@@ -23,6 +23,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -34,6 +35,7 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -43,13 +45,15 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class EnterprisePrivacyPreferenceControllerTest {
 
-    private final String MANAGED_GENERIC = "managed by organization";
-    private final String MANAGED_WITH_NAME = "managed by Foo, Inc.";
-    private final String MANAGING_ORGANIZATION = "Foo, Inc.";
+    private static final String MANAGED_GENERIC = "managed by organization";
+    private static final String MANAGED_WITH_NAME = "managed by Foo, Inc.";
+    private static final String MANAGING_ORGANIZATION = "Foo, Inc.";
+    private static final String KEY_ENTERPRISE_PRIVACY = "enterprise_privacy";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private EnterprisePrivacyPreferenceController mController;
 
@@ -59,6 +63,12 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = new EnterprisePrivacyPreferenceController(mContext, null /* lifecycle */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -85,10 +95,11 @@
     public void testIsAvailable() {
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.hasDeviceOwner()).thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
-
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_ENTERPRISE_PRIVACY, true);
     }
 
     @Test
@@ -99,6 +110,6 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("enterprise_privacy");
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_ENTERPRISE_PRIVACY);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index d41be75..16fa5ba 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.enterprise;
 
+import android.app.Application;
 import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.XmlResourceParser;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -31,10 +35,14 @@
 import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
+import org.xmlpull.v1.XmlPullParser;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
@@ -46,6 +54,9 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class EnterprisePrivacySettingsTest {
 
+    private final static String RESOURCES_NAMESPACE = "http://schemas.android.com/apk/res/android";
+    private final static String ATTR_KEY = "key";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
@@ -101,23 +112,24 @@
     }
 
     @Test
-    public void getPreferenceControllers() {
+    public void getPreferenceControllers() throws Exception {
         final List<PreferenceController> controllers = mSettings.getPreferenceControllers(
                 ShadowApplication.getInstance().getApplicationContext());
         verifyPreferenceControllers(controllers);
     }
 
     @Test
-    public void getSearchIndexProviderPreferenceControllers() {
+    public void getSearchIndexProviderPreferenceControllers() throws Exception {
         final List<PreferenceController> controllers
                 = EnterprisePrivacySettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(
                         ShadowApplication.getInstance().getApplicationContext());
         verifyPreferenceControllers(controllers);
     }
 
-    private void verifyPreferenceControllers(List<PreferenceController> controllers) {
+    private void verifyPreferenceControllers(List<PreferenceController> controllers)
+            throws Exception {
         assertThat(controllers).isNotNull();
-        assertThat(controllers.size()).isEqualTo(15);
+        assertThat(controllers.size()).isEqualTo(16);
         int position = 0;
         assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class);
@@ -137,14 +149,71 @@
                 AlwaysOnVpnCurrentUserPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 AlwaysOnVpnManagedProfilePreferenceController.class);
+        assertThat(controllers.get(position++)).isInstanceOf(ImePreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 GlobalHttpProxyPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 CaCertsPreferenceController.class);
+        final PreferenceController exposureChangesCategoryController = controllers.get(position);
+        final int exposureChangesCategoryControllerIndex = position;
+        assertThat(controllers.get(position++)).isInstanceOf(
+                ExposureChangesCategoryPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 FailedPasswordWipeCurrentUserPreferenceController.class);
         assertThat(controllers.get(position++)).isInstanceOf(
                 FailedPasswordWipeManagedProfilePreferenceController.class);
-        assertThat(controllers.get(position++)).isInstanceOf(ImePreferenceController.class);
+
+        // The "Changes made by your organization's admin" category is hidden when all Preferences
+        // inside it become unavailable. To do this correctly, the category's controller must:
+        // a) Observe the availability of all Preferences in the category and
+        // b) Be listed after those Preferences' controllers, so that availability is updated in
+        //    the correct order
+
+        // Find all Preferences in the category.
+        final XmlResourceParser parser = RuntimeEnvironment.application.getResources().getXml(
+                R.xml.enterprise_privacy_settings);
+        boolean done = false;
+        int type;
+        final Set<String> expectedObserved = new HashSet<>();
+        while (!done && (type = parser.next()) != XmlPullParser.END_DOCUMENT) {
+            if (type != XmlPullParser.START_TAG || !"exposure_changes_category".equals(
+                    parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY))) {
+                continue;
+            }
+            int depth = 1;
+            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) {
+                if (type == XmlPullParser.START_TAG) {
+                    final String key = parser.getAttributeValue(RESOURCES_NAMESPACE, ATTR_KEY);
+                    if (key != null) {
+                        expectedObserved.add(key);
+                    }
+                    depth++;
+                } else if (type == XmlPullParser.END_TAG) {
+                    depth--;
+                    if (depth == 0) {
+                        done = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Find all Preferences the category's controller is observing.
+        final Set<String> actualObserved = new HashSet<>();
+        int maxObservedIndex = -1;
+        for (int i = 0; i < controllers.size(); i++) {
+            final PreferenceController controller = controllers.get(i);
+            if (controller instanceof DynamicAvailabilityPreferenceController &&
+                    ((DynamicAvailabilityPreferenceController) controller).getAvailabilityObserver()
+                            == exposureChangesCategoryController) {
+                actualObserved.add(controller.getPreferenceKey());
+                maxObservedIndex = i;
+            }
+        }
+
+        // Verify that the category's controller is observing the Preferences inside it.
+        assertThat(actualObserved).isEqualTo(expectedObserved);
+        // Verify that the category's controller is listed after the Preferences' controllers.
+        assertThat(maxObservedIndex).isLessThan(exposureChangesCategoryControllerIndex);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 34d9b24..5eb59e7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -29,6 +29,7 @@
 import com.android.settings.TestConfig;
 import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.applications.UserAppInfo;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -48,6 +49,7 @@
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -57,11 +59,14 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
 
+    private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private UserManager mUm;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private EnterpriseSetDefaultAppsPreferenceController mController;
 
@@ -72,6 +77,12 @@
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = new EnterpriseSetDefaultAppsPreferenceController(mContext,
                 null /* lifecycle */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     private void setEnterpriseSetDefaultApps(Intent[] intents, int number) {
@@ -118,10 +129,12 @@
         when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(anyInt(),
                 anyObject())).thenReturn(new ArrayList<UserAppInfo>());
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, false);
 
         setEnterpriseSetDefaultApps(EnterpriseDefaultApps.BROWSER.getIntents(), 1);
         configureUsers(1);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_DEFAULT_APPS, true);
     }
 
     @Test
@@ -132,8 +145,7 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey())
-                .isEqualTo("number_enterprise_set_default_apps");
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_DEFAULT_APPS);
     }
 
     private static class MatchesIntents extends ArgumentMatcher<Intent[]> {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
new file mode 100644
index 0000000..1c92ea5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceControllerTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.enterprise;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.DynamicAvailabilityPreferenceController;
+import com.android.settings.core.PreferenceAvailabilityObserver;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.anyBoolean;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Tests for {@link ExposureChangesCategoryPreferenceController}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class ExposureChangesCategoryPreferenceControllerTest {
+
+    private static final String KEY_1 = "key_1";
+    private static final String KEY_2 = "key_2";
+    private static final String KEY_EXPOSURE_CHANGES_CATEGORY = "exposure_changes_category";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private List<DynamicAvailabilityPreferenceController> mControllers;
+    private ExposureChangesCategoryPreferenceController mController;
+    @Mock private PreferenceAvailabilityObserver mObserver;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mControllers = Arrays.asList(mock(DynamicAvailabilityPreferenceController.class),
+                mock(DynamicAvailabilityPreferenceController.class));
+        mController = new ExposureChangesCategoryPreferenceController(mContext,
+                null /* lifecycle */, mControllers, true /* controllingUi */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testInitialization() {
+        verify(mControllers.get(0)).setAvailabilityObserver(mController);
+        verify(mControllers.get(1)).setAvailabilityObserver(mController);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+    }
+
+    @Test
+    public void testOnPreferenceAvailabilityUpdated() {
+        final Preference preference = new Preference(mContext, null, 0, 0);
+        preference.setVisible(true);
+
+        mController.updateState(preference);
+        assertThat(preference.isVisible()).isFalse();
+
+        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+        assertThat(preference.isVisible()).isTrue();
+        reset(mObserver);
+
+        mController.onPreferenceAvailabilityUpdated(KEY_2, true);
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+        assertThat(preference.isVisible()).isTrue();
+        reset(mObserver);
+
+        mController.onPreferenceAvailabilityUpdated(KEY_1, false);
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+        assertThat(preference.isVisible()).isTrue();
+        reset(mObserver);
+
+        mController.onPreferenceAvailabilityUpdated(KEY_2, false);
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
+        assertThat(preference.isVisible()).isFalse();
+    }
+
+    @Test
+    public void testUpdateState() {
+        final Preference preference = new Preference(mContext, null, 0, 0);
+        preference.setVisible(false);
+
+        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
+        mController.updateState(preference);
+        assertThat(preference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void testIsAvailableForUi() {
+        assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+
+        mController.onPreferenceAvailabilityUpdated(KEY_1, true);
+        reset(mObserver);
+        assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+
+        mController.onPreferenceAvailabilityUpdated(KEY_1, false);
+        reset(mObserver);
+        assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+    }
+
+    @Test
+    public void testIsAvailableForSearch() {
+        final ExposureChangesCategoryPreferenceController controller
+                = new ExposureChangesCategoryPreferenceController(mContext, null /* lifecycle */,
+                        mControllers, false /* controllingUi */);
+        controller.setAvailabilityObserver(mObserver);
+        verify(mControllers.get(0)).setAvailabilityObserver(controller);
+        verify(mControllers.get(1)).setAvailabilityObserver(controller);
+
+        assertThat(controller.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
+        reset(mObserver);
+
+        controller.onPreferenceAvailabilityUpdated(KEY_1, true);
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+        assertThat(controller.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+        reset(mObserver);
+
+        controller.onPreferenceAvailabilityUpdated(KEY_2, true);
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+        assertThat(controller.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+        reset(mObserver);
+
+        controller.onPreferenceAvailabilityUpdated(KEY_1, false);
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+        assertThat(controller.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, true);
+        reset(mObserver);
+
+        controller.onPreferenceAvailabilityUpdated(KEY_2, false);
+        verify(mObserver, never()).onPreferenceAvailabilityUpdated(
+                eq(KEY_EXPOSURE_CHANGES_CATEGORY), anyBoolean());
+        assertThat(controller.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_EXPOSURE_CHANGES_CATEGORY, false);
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick() {
+        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
+                .isFalse();
+    }
+
+    @Test
+    public void testGetPreferenceKey() {
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_EXPOSURE_CHANGES_CATEGORY);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
index c14b71e..cbc220f 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
@@ -21,6 +21,7 @@
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -30,6 +31,7 @@
 import org.mockito.MockitoAnnotations;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -42,6 +44,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     protected Context mContext;
     protected FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     protected FailedPasswordWipePreferenceControllerBase mController;
 
@@ -56,6 +59,12 @@
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
     }
 
+    @Test
+    public void testGetAvailabilityObserver() {
+        mController.setAvailabilityObserver(mObserver);
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
+    }
+
     public abstract void setMaximumFailedPasswordsBeforeWipe(int maximum);
 
     @Test
@@ -72,11 +81,15 @@
 
     @Test
     public void testIsAvailable() {
+        mController.setAvailabilityObserver(mObserver);
+
         setMaximumFailedPasswordsBeforeWipe(0);
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, false);
 
         setMaximumFailedPasswordsBeforeWipe(10);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(mKey, true);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index a0bc9ee..016d970 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -21,6 +21,7 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -32,6 +33,7 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -40,9 +42,13 @@
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class GlobalHttpProxyPreferenceControllerTest {
+
+    private static final String KEY_GLOBAL_HTTP_PROXY = "global_http_proxy";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private GlobalHttpProxyPreferenceController mController;
 
@@ -52,6 +58,12 @@
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
         mController = new GlobalHttpProxyPreferenceController(mContext, null /* lifecycle */);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -59,10 +71,12 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
                 .thenReturn(false);
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.isGlobalHttpProxySet())
                 .thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_GLOBAL_HTTP_PROXY, true);
     }
 
     @Test
@@ -73,6 +87,6 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("global_http_proxy");
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_GLOBAL_HTTP_PROXY);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index 05d0535..3304b44 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -23,6 +23,7 @@
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceAvailabilityObserver;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -34,6 +35,7 @@
 import org.robolectric.annotation.Config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -43,12 +45,14 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public final class ImePreferenceControllerTest {
 
-    private final String DEFAULT_IME_LABEL = "Test IME";
-    private final String DEFAULT_IME_TEXT = "Set to Test IME";
+    private static final String DEFAULT_IME_LABEL = "Test IME";
+    private static final String DEFAULT_IME_TEXT = "Set to Test IME";
+    private static final String KEY_INPUT_METHOD = "input_method";
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
+    @Mock private PreferenceAvailabilityObserver mObserver;
 
     private ImePreferenceController mController;
 
@@ -60,6 +64,12 @@
         mController = new ImePreferenceController(mContext, null /* lifecycle */);
         when(mContext.getResources().getString(R.string.enterprise_privacy_input_method_name,
                 DEFAULT_IME_LABEL)).thenReturn(DEFAULT_IME_TEXT);
+        mController.setAvailabilityObserver(mObserver);
+    }
+
+    @Test
+    public void testGetAvailabilityObserver() {
+        assertThat(mController.getAvailabilityObserver()).isEqualTo(mObserver);
     }
 
     @Test
@@ -77,10 +87,12 @@
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
             .thenReturn(null);
         assertThat(mController.isAvailable()).isFalse();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, false);
 
         when(mFeatureFactory.enterprisePrivacyFeatureProvider.getImeLabelIfOwnerSet())
             .thenReturn(DEFAULT_IME_LABEL);
         assertThat(mController.isAvailable()).isTrue();
+        verify(mObserver).onPreferenceAvailabilityUpdated(KEY_INPUT_METHOD, true);
     }
 
     @Test
@@ -91,6 +103,6 @@
 
     @Test
     public void testGetPreferenceKey() {
-        assertThat(mController.getPreferenceKey()).isEqualTo("input_method");
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_INPUT_METHOD);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 8393fc3..7caf3fc 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -19,13 +19,14 @@
 import android.content.Context;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
+import android.os.UserManager;
 import android.provider.Settings;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
-import com.android.settings.search2.InlineSwitchPayload;
-import com.android.settings.search2.ResultPayload;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,7 +42,9 @@
 import static android.provider.Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -58,9 +61,15 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mock(UserManager.class));
         mController = new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST);
     }
 
+    @After
+    public void tearDown() {
+        ShadowSecureSettings.clear();
+    }
+
     @Test
     public void isAvailable_hasSensor_shouldReturnTrue() {
         // Mock sensors
@@ -94,6 +103,27 @@
     }
 
     @Test
+    @Config(shadows = {ShadowSecureSettings.class})
+    public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
+        final int managedId = 2;
+        ShadowSecureSettings.putIntForUser(
+            null, CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
+        DoubleTwistPreferenceController controller =
+            spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
+        doReturn(managedId).when(controller).getManagedProfileUserId();
+
+        // enable the gesture
+        controller.onPreferenceChange(null, true);
+        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
+            CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId)).isEqualTo(1);
+
+        // disable the gesture
+        controller.onPreferenceChange(null, false);
+        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
+            CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, managedId)).isEqualTo(0);
+    }
+
+    @Test
     public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
         // Set the setting to be enabled.
         final Context context = ShadowApplication.getInstance().getApplicationContext();
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java
deleted file mode 100644
index 39f1377..0000000
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.android.settings.notification;
-
-import android.content.res.Resources;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.DropDownPreference;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class SettingPrefTest {
-
-    @Test
-    public void update_setsDropDownSummaryText() {
-        Context context = RuntimeEnvironment.application;
-        String testSetting = "test_setting";
-        int[] values = new int[] {1,2,3};
-        String[] entries = new String[] {"one", "two", "three"};
-        SettingPref settingPref =
-                spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
-                    @Override
-                    protected String getCaption(Resources res, int value) {
-                        return "temp";
-                    }
-                });
-        DropDownPreference dropdownPref = spy(new DropDownPreference(context));
-        dropdownPref.setEntries(entries);
-        settingPref.mDropDown = dropdownPref;
-        Settings.Global.putInt(context.getContentResolver(), testSetting, values[2]);
-
-        settingPref.update(context);
-
-        assertThat(settingPref.mDropDown.getSummary()).isEqualTo(entries[2]);
-    }
-
-    @Test
-    public void update_setsDropDownSummaryText_noMatch_noError() {
-        Context context = RuntimeEnvironment.application;
-        String testSetting = "test_setting";
-        int[] values = new int[] {1,2,3};
-        String[] entries = new String[] {"one", "two", "three"};
-        SettingPref settingPref =
-                spy(new SettingPref(SettingPref.TYPE_GLOBAL, "key", testSetting, 0, values) {
-                    @Override
-                    protected String getCaption(Resources res, int value) {
-                        return "temp";
-                    }
-                });
-        DropDownPreference dropdownPref = spy(new DropDownPreference(context));
-        dropdownPref.setEntries(entries);
-        settingPref.mDropDown = dropdownPref;
-        Settings.Global.putInt(context.getContentResolver(), testSetting, -1);
-
-        settingPref.update(context);
-
-        assertThat(settingPref.mDropDown.getSummary()).isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
index 51cd484..404a824 100644
--- a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
@@ -163,6 +163,20 @@
         assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
     }
 
+    @Test
+    public void testBindElements_dynamicSummary_visibilityIsGone() {
+        String dynamicSummary = "%s";
+        SearchResult result = new Builder()
+                .addTitle(TITLE)
+                .addSummary(dynamicSummary)
+                .addPayload(new IntentPayload(null))
+                .build();
+
+        mHolder.onBind(mFragment, result);
+
+        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.GONE);
+    }
+
     private SearchResult getSearchResult(String title, String summary, Drawable icon) {
         Builder builder = new Builder();
         builder.addTitle(title)
diff --git a/tests/robotests/src/com/android/settings/search2/HeaderDecoratorTest.java b/tests/robotests/src/com/android/settings/search2/HeaderDecoratorTest.java
deleted file mode 100644
index 4fdf44c..0000000
--- a/tests/robotests/src/com/android/settings/search2/HeaderDecoratorTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.search2;
-
-import android.app.LoaderManager;
-import android.content.Context;
-import android.content.Loader;
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.search.IndexingCallback;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.List;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class HeaderDecoratorTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private View mView;
-    @Mock
-    private RecyclerView mRecyclerView;
-    @Mock
-    private RecyclerView.LayoutParams mLayoutParams;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mView.getLayoutParams()).thenReturn(mLayoutParams);
-    }
-
-    @Test
-    public void testgetItemOffsets_positionZero_headerAdded() {
-        HeaderDecorator decorator = new HeaderDecorator();
-        Rect outRect = new Rect();
-        when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(0);
-        when(mView.getContext().obtainStyledAttributes(any(int[].class))
-                .getDimensionPixelSize(0, 0)).thenReturn(20);
-        when(mView.getContext().getResources().getDimensionPixelSize(R.dimen.search_bar_margin))
-                .thenReturn(5);
-
-        decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
-
-        assertThat(outRect).isEqualTo(new Rect(0, 30, 0, 0));
-    }
-
-    @Test
-    public void testgetItemOffsets_positionGreaterThanZero_noDecoration() {
-        HeaderDecorator decorator = new HeaderDecorator();
-        Rect outRect = new Rect();
-        when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(1);
-
-        decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
-
-        assertThat(outRect).isEqualTo(new Rect(0, 0, 0, 0));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
index fd4d0d2..64e188e 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
@@ -68,4 +68,8 @@
         Integer value = (Integer) mValueMap.get(name);
         return value == null ? defaultValue : value;
     }
+
+    public static void clear() {
+        mValueMap.clear();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
new file mode 100644
index 0000000..5646470
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiManager;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.widget.SwitchWidgetController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WifiEnablerTest {
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private ConnectivityManagerWrapper mConnectivityManager;
+
+    private WifiEnabler mEnabler;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        mEnabler = new WifiEnabler(mContext, mock(SwitchWidgetController.class),
+            mock(MetricsFeatureProvider.class), mConnectivityManager);
+    }
+
+    @Test
+    public void onSwitchToggled_avoidBadWifiConfigIsFalse_shouldReturnTrue() {
+        when(mWifiManager.setWifiEnabled(true)).thenReturn(true);
+        when(mWifiManager.getWifiApState()).thenReturn(WifiManager.WIFI_AP_STATE_ENABLED);
+
+        mEnabler.onSwitchToggled(true);
+
+        verify(mConnectivityManager).stopTethering(ConnectivityManager.TETHERING_WIFI);
+    }
+
+}