diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 69fb73a..4f31845 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -561,6 +561,23 @@
                 android:resource="@id/sound_settings" />
         </activity-alias>
 
+        <activity android:name="Settings$ZenModeSettingsActivity"
+                android:label="@string/zen_mode_settings_title"
+                android:exported="true"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.ZEN_MODE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.ZenModeSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/sound_settings" />
+        </activity>
+
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
                 android:taskAffinity=""
diff --git a/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..267e7ba
--- /dev/null
+++ b/res/drawable-hdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..db51f6b
--- /dev/null
+++ b/res/drawable-mdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..8d22ce2
--- /dev/null
+++ b/res/drawable-xhdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png b/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png
new file mode 100644
index 0000000..29fb50f
--- /dev/null
+++ b/res/drawable-xxhdpi/spinner_default_holo_dark_am_no_underline.9.png
Binary files differ
diff --git a/res/layout/preference_zen_mode.xml b/res/layout/preference_zen_mode.xml
new file mode 100644
index 0000000..4139d40
--- /dev/null
+++ b/res/layout/preference_zen_mode.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/configure_zen_mode"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    android:padding="8dip"
+    android:visibility="gone"
+    android:background="?android:attr/selectableItemBackground"
+    android:src="@drawable/ic_bt_config"
+    android:contentDescription="@string/configure_zen_mode_description" />
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 627f76e..57bff57 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Stemoproepe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ledig"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Foon ledig"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Onverklaarde"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Oorbereken"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Kies batterybesparende modus"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die program kan dalk instellings bied om batterygebruik te verminder"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery deur gebruiker gebruik"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Onverklaarde kragverbruik"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedert uitgeprop is"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Maak navigasielaai oop"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Maak navigasielaai toe"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Oorsig"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Wys kennisgewings"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitiewe kennisgewing-inhoud sal versteek word wanneer gesluit"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alle kennisgewing-inhoud sal gewys word wanneer gesluit"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 20edcb9..8b8e8f4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -331,8 +331,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ማመስጠሪያ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ስልክ አመስጥር"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን በአበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር ፒን   ወይም ይለፍ ቃል ጠይቅ"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን በአበሩ ቁጥር ለመፍታት የቁጥር ፒን   ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ተመሳጥሯል"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ይችላሉ። ጡባዊ ተኮዎን ምስጠራ አፈታት አንዴ ካደረጉ በኋላ፣በእያንዳንዱ ጊዜ ሲያበሩት ላለማመሳጠር የቁጥር ፒን ወይም የይለፍ ቃል መተየብ ያስፈልግዎታል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮዎን አለማመሳጠር አይችሉም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብዎ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮዎ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጡ፣ውሂብዎን አንዳንዱን ወይም ሁሉንም ያጣሉ።"</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ  መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
@@ -340,8 +340,8 @@
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ስልክ አመስጥር"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"እባክዎ ባትሪዎን ኃይል ይሙላ እና እንደገና ይሞክሩ።"</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"እባክዎ የኃይል መሙያዎን ይሰኩ እና እንደገና ይሞክሩ።"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ምንም የማያቆልፍ PIN ወይም ይለፍቃል የለም"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ PIN ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ምንም የማያቆልፍ ፒን  ወይም ይለፍቃል የለም"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ ፒን  ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ይመስጠር?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ጡባዊ ተኮው ብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"የምስጠራ ክንውኑ የማይመለስ ነው እና ካቋረጥከው፤ ውሂብ ታጣለህ።ምስጠራ ሰዓት ወይም ከዛ የበለጠ ይወስዳል፤ በዛ ጊዜ ስልኩ ለብዙ ጊዜያቶች በድጋሚ ይነሳል።"</string>
@@ -358,7 +358,7 @@
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"ምትኬ ቆላፊ ምረጥ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ማሳያ መቆለፊያ"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ስርዓተ ጥለት፣  PIN፣ ወይም የይለፍ ቃል ለውጥ ወይም አቦዝን"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ስርዓተ ጥለት፣  ፒን ፣ ወይም የይለፍ ቃል ለውጥ ወይም አቦዝን"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ማያውን ለመቆለፍ ሜተድ ምረጥ"</string>
     <string name="unlock_backup_info_summary" msgid="108524727803788172">"በፊት ገጽ መክፈቻ እርስዎን ማየት ሳይችል ሲቀር ስልኩን እንዴት ማስከፈት ይፈልጋሉ?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ምንም"</string>
@@ -369,7 +369,7 @@
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"ዝቅተኛ ጥበቃ፣ ሙከራ"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"ስርዓተ ጥለት"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"መካከለኛ ጥበቃ"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"ፒን"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ከመካከለኛ እስከ ከፍተኛ ጥበቃ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
@@ -382,18 +382,18 @@
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"የይለፍ ቃል"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"የማያ መዝጊያ አጥፋ"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"የመክፈቻ ስርዓተ ጥለት አስወግድ"</string>
-    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ PIN አስወግድ"</string>
+    <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"መክፈቻ ፒን  አስወግድ"</string>
     <string name="unlock_disable_lock_password_summary" msgid="192161194564577025">"የመክፈቻ ይለፍ ቃል አስወግድ"</string>
     <string name="unlock_change_lock_pattern_title" msgid="2044092014872741130">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
-    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ PIN ለውጥ"</string>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ ፒን  ለውጥ"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
     <string name="lockpassword_password_too_short" msgid="7328975683669256660">"የይለፍ ቃል ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
-    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN ቢያንስ %d አሃዞች መሆን አለበት"</string>
-    <string name="lockpassword_press_continue" msgid="122706614386757182">"ሲያልቅ ቀጥል ንካ"</string>
+    <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ፒን  ቢያንስ %d አሃዞች መሆን አለበት"</string>
+    <string name="lockpassword_press_continue" msgid="122706614386757182">"ሲከናወን ቀጥል ንካ"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ቀጥል"</string>
     <string name="lockpassword_password_too_long" msgid="7016906583950201704">"የይለፍ ቃል ከ<xliff:g id="NUMBER">%d</xliff:g> ቁምፊዎች ያነሰ መሆን አለበት።"</string>
-    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN ከ<xliff:g id="NUMBER">%d</xliff:g> አሀዞች ያነሰ መሆን አለበት።"</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN ከ0-9 አሀዞች ብቻ መያዝ አለበት።"</string>
+    <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"ፒን  ከ<xliff:g id="NUMBER">%d</xliff:g> አሀዞች ያነሰ መሆን አለበት።"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"ፒን  ከ0-9 አሀዞች ብቻ መያዝ አለበት።"</string>
     <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"የቅርብ ጊዜ ፒን መጠቀም የመሳሪያ አስተዳዳሪ አይፈቅድም።"</string>
     <string name="lockpassword_illegal_character" msgid="8742901630116866738">"የይለፍ ቃል ህገ ወጥ ቁምፊ ይዟል።"</string>
     <string name="lockpassword_password_requires_alpha" msgid="5203836082520634764">"የይለፍ ቃል ቢያንስ አንድ ፊደል መያዝ አለበት።"</string>
@@ -449,9 +449,9 @@
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"የብሉቱዝ ማጣመሪያ ጥየቃ"</string>
     <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"ከ:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር የመሣሪያውን የሚፈለገውን ፒን ተይብ:"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"ከ:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ጋር ለማጣመር የመሣሪያውን የሚፈለገውን የይለፍ ቁልፍ ተይብ:"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN ፊደሎች ወይም ምልክቶች ይይዛል"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ፒን  ፊደሎች ወይም ምልክቶች ይይዛል"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"አብዛኛውን ጊዜ 0000 ወይም 1234"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ይህን PIN በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ይህን ፒን  በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ይህን የይለፍ ቁልፍ በሌላ መሣሪያ ላይማስገባት ሊያስፈልግህ ይችላል።"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ጋር ለማገናኘት ይህን የይለፍ ቁልፍ ማሳየቱን አረጋግጥ፡&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ከ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ከዚህ መሣሪያ ጋር ይጣመር?"</string>
@@ -766,22 +766,22 @@
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"የSIM ካርድ መቆለፊያ አዘጋጅ"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ካርድቆልፍ"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ካርድ ቆልፍ"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ስልክ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ጡባዊ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ስልክ ለመጠቀም PIN ጠይቅ"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN ለውጥ"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ጡባዊ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ስልክ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ጡባዊ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ስልክ ለመጠቀም ፒን  ጠይቅ"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"SIM ፒን  ለውጥ"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM ፒን"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ካርድ ሸንጉር"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM ካርድ ክፈት"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"የድሮSIM PIN"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"አዲስ SIM PIN"</string>
-    <string name="sim_reenter_new" msgid="3178510434642201544">"አዲስ PIN  ድጋሚ ተይብ"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM PIN"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"የድሮSIM ፒን"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"አዲስ SIM ፒን"</string>
+    <string name="sim_reenter_new" msgid="3178510434642201544">"አዲስ ፒን   ድጋሚ ተይብ"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM ፒን"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"የተሳሳተ ፒን!"</string>
     <string name="sim_pins_dont_match" msgid="8449681619822460312">"ፒኖቹ አይዛመዱም"</string>
     <string name="sim_change_failed" msgid="304964924772218382">"ፒን መለወጥ አይቻልም::\n ምናልባት ልክ ያልኾነ ፒን ሊሆን ይችላል::"</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN በተሳካ ተለውጧል"</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM ፒን  በተሳካ ተለውጧል"</string>
     <string name="sim_lock_failed" msgid="5651596916127873626">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። \n የተሳሳተ ፒን ሊሆን ይችላል።"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"እሺ"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ሰርዝ"</string>
@@ -1048,24 +1048,24 @@
     <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"በማስገባት ላይ..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"የይለፍ ቃለዎን ይምረጡ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"የእርስዎን ስርዓተ ጥለት ይምረጡ"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"PINዎን ይምረጡ"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"የእርስዎን ፒን ይምረጡ"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"የይለፍ ቃልዎን ያረጋግጡ"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"ስርዓተ ጥለትዎን ያረጋግጡ"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PINዎንያረጋግጡ"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"የእርስዎን ፒን ያረጋግጡ"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"የይለፍ ቃላት አይዛመዱም"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PINኦች አይዛመዱም"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ምርጫዎችን ክፈት"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"የይለፍ ቃል ተዘጋጅቷል"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN አልተዘጋጀም ነበር"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ፒን  አልተዘጋጀም ነበር"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ስርዓተ ጥለት ተዘጋጅቷል"</string>
     <string name="lock_settings_title" msgid="335025124489630932">"ማሳያ ደህንነት"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"መክፈቻ ስርዓት ጥለት ለውጥ"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"መክፈቻ PIN ለውጥ"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"መክፈቻ ፒን  ለውጥ"</string>
     <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"የተቀመጠ ስርዓተ ጥለት አረጋግጥ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"በድጋሚ ሞክር::"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"የመክፈቻ ስርዓተ ንጥል ሳል"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ለእገዛ ምናሌ ተጫን"</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ሲጨርሱ ጣትዎን ያንሱት"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ሲከናወን ጣትዎን ያንሱት"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ቢያንስ <xliff:g id="NUMBER">%d</xliff:g> ነጥቦችን ያያይዙ። እንገደና ይሞክሩ።"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"ሥርዓተ ጥለት ተመዝግቧል"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ለማረጋገጥ ሥርዓተ ጥለት ድጋሚ ሳል"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"የድምፅ ጥሪዎች"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ስራ ፈትጡባዊ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ የፈታበት"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ያልተቆጠረ"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"ከመጠን በላይ የተቆጠረ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"የባትሪ ኃይል ቁጠባ ሁነታን ይምረጡ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"መተግበሪያው የባትሪ ፍጆታን ለመቀነስ ቅንብሮችን ሊያቀርብ ይችላል"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"በተጠቃሚው ስራ ላይ የዋለው ባትሪ"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ያልተቆጠረ የሃይል አጠቃቀም"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>ከተነቀለ ጀምሮ"</string>
@@ -1773,7 +1775,7 @@
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ሥምሪያ ሰርዝ"</string>
     <string name="sync_one_time_sync" msgid="6766593624598183090">"<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g> አሁን ለማስመር ንካ"</string>
-    <string name="sync_gmail" msgid="714886122098006477">"ጂሜይል"</string>
+    <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"የቀን መቁጠሪያ"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"እውቅያዎች"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">" ወደ Google አመሳስል እንኳን ደህና መጡ!"</font>\n" ውሂብ ለማመሳሰል የእርስዎን ዕውቂያዎች፣ ቀጠሮዎች እና ሌሎችም ካሉበት ለመድረስ እንዲሁም ለመፍቀድ የGoogle አቀራረብ።"</string>
@@ -2079,7 +2081,7 @@
     <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
     <string name="pairing_button_title" msgid="7411638037556429744">"አሁን አጣምር"</string>
     <string name="status_no_ring_detected" msgid="838954925249421062">"መለያውን ጠረጴዛው ላይ ያስተኙት እና ስልኩን ከላይ ያስቀምጡት"</string>
-    <string name="status_device_paired" msgid="4916932520416516526">"መለያ እና ስልክ በተሳካ ሁኔታ ተጣምረዋል፣ በቃ ጨርሰዋል!"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"መለያ እና ስልክ በተሳካ ሁኔታ ተጣምረዋል፣ በቃ ተከናውኗል!"</string>
     <string name="status_error_invalid_device" msgid="5045003971535647259">"የቀረበው መለያ ስልክዎን ለማስከፈት ስራ ላይ መዋል አይችልም"</string>
     <string name="status_error_pairing_failed" msgid="8260473909085202868">"ከእርስዎ መለያ ጋር የሚደረገው ማጣመር አልተሳካም፣ እባክዎ እንደገና ይሞክሩ"</string>
     <string name="enable_nfc" msgid="5234514241098808766">"NFC አልነቃም፣ እና በNFC ለመክፈት ያስፈልጋል። እባክዎ NFCን ያብሩ።"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"የአሰሳ መሣቢያውን ክፈት"</string>
     <string name="drawer_close" msgid="3329237203619660131">"የአሰሳ መሣቢያውን ዝጋ"</string>
     <string name="dashboard_title" msgid="821911564947991553">"አጠቃላይ ዕይታ"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"ማሳወቂያዎችን አሳይ"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"ልዩ ጥንቃቄ የሚፈልጉ የማሳወቂያ ይዘቶች ሲቆለፍ ይደበቃሉ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"ሁሉም የማሳወቂያ ይዘቶች ሲቆለፉ ይታያሉ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e0e7d0b..8c064ce 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"المكالمات الصوتية"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"الجهاز اللوحي خامل"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"الهاتف خامل"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"غير مقدّر"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"استخدام زائد عن الحد"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏إجمالي استخدام CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU في المقدمة"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"تحديد وضع توفير البطارية"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"قد يعرض التطبيق إعدادات لتقليل استخدام البطارية"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"البطارية التي يستهلكها المستخدم"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"استخدام غير مقدّر للطاقة"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> منذ عدم التوصيل"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"فتح ساحب التنقل"</string>
     <string name="drawer_close" msgid="3329237203619660131">"إغلاق ساحب التنقل"</string>
     <string name="dashboard_title" msgid="821911564947991553">"نظرة عامة"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"إظهار الإشعارات"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"سيتم إخفاء محتويات الإشعارات المهمة عند قفل الشاشة"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"سيتم عرض كل محتويات الإشعارات عند قفل الشاشة"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c5aa909..b5ded59 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Гласови обаждания"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблетът е неактивен"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефонът не се използва"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Неотчетено"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Отчетено в повече"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Процесор, общо"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Избиране на режим за запазване на батерията"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Приложението може да предлага настройки за намаляване на употребата на батерията"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Батерия, използвана от потребителя"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Неотчетено захранване"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> след изключването"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Отваряне на слоя за навигация"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Затваряне на слоя за навигация"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Общ преглед"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Известия"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Поверит. съдържание ще е скрито при заключен екран"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Цялото съдържание ще се показва при заключен екран"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c2c5ec3..6abaf9b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Trucades de veu"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tauleta inactiva"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Sense comptabilitzar"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Comptabilitzada més d\'una vegada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el mode d\'estalvi de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'aplicació pot oferir paràmetres per reduir l\'ús de la bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilitzada per l\'usuari"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consum d\'energia sense comptabilitzar"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consum d\'energia comptabilitzat més d\'una vegada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> des de la desconnexió"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Obre el tauler de navegació"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Tanca el tauler de navegació"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descripció"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostra notific."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Les notificac. confidencials s\'amagaran quan es bloquegin."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Les notificacions es mostraran quan es bloquegin."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ac7c8a2..c73d8de 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet v nečinnosti"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"V nečinnosti"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neobjasněno"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Nadhodnoceno"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba provozu procesoru"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim úspory baterie"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"V aplikaci mohou být k dispozici nastavení ke snížení spotřeby"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie spotřebovaná uživatelem"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neobjasněná spotřeba energie"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojení"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otevřít navigační panel"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zavřít navigační panel"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Přehled"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Zobr. oznámení"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Při uzamčení bude citlivý obsah oznámení skryt."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Při uzamčení bude zobrazen veškerý obsah oznámení."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index cd8ed6c..51061d1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Stemmeopkald"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletcomputeren er ikke aktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen er ikke aktiv"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Ikke medregnet"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Overvurderet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU i alt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vælg batteribesparende tilstand"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Denne app har muligvis indstillinger, der kan reducere batteriforbruget"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Brugerens batteriforbrug"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ikke medregnet strømforbrug"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden afbrydelse"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Åbn navigationsskuffen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Luk navigationsskuffen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Oversigt"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Underretninger"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Følsomt indhold i underretningen skjules, når låst"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alt indhold i underretningen vises, når låst"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9bfb54e..50f76c2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1512,7 +1512,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Anrufe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ruhezustand"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ruhezustand"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Nicht nachvollziehbar"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Zu hoch berechnet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU insgesamt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
@@ -1556,7 +1557,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Energiesparmodus auswählen"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Die App bietet unter Umständen Einstellungen für einen geringeren Akkuverbrauch."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Akkuverbrauch durch Nutzer"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Nicht nachvollziehbarer Stromverbrauch"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> seit dem Ausstecken"</string>
@@ -2088,4 +2090,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigationsleiste öffnen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigationsleiste schließen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Übersicht"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Benachr. zeigen"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Vertrauliche Inhalte bei Sperre ausgeblendet"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alle Inhalte auf Sperrbildschirm sichtbar"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3388e23..09a097c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Φωνητικές κλήσεις"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Αδράνεια tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Χωρίς εκτίμηση"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Υπερεκτίμηση"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Συνολικός χρόνος CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Επιλέξτε κατάσταση εξοικονόμησης μπαταρίας"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Η εφαρμογή ενδέχεται να προσφέρει ρυθμίσεις που θα μειώσουν τη χρήση της μπαταρίας"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Μπαταρία που χρησιμοποιείται από το χρήστη"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Χωρίς εκτίμηση χρήσης ισχύος"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> από την αποσύνδεση"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Άνοιγμα συρταριού πλοήγησης"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Κλείσιμο συρταριού πλοήγησης"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Επισκόπηση"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Εμφ.ειδοποιήσεων"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Απόκρυψη ευαίσθητου περιεχ.ειδοπ. κατά το κλείδωμα"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Εμφάνιση όλου του περιεχ.ειδοπ. κατά το κλείδωμα"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8e921ac..37ed4a2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Unaccounted"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Select battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Unaccounted power use"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Open navigation drawer"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Close navigation drawer"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overview"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Show notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitive notification contents will be hidden when locked"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"All notification contents will be shown when locked"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8e921ac..37ed4a2 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Unaccounted"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Over-counted"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Select battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"The application may offer settings to reduce battery use"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Battery used by user"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Unaccounted power use"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> since unplugged"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Open navigation drawer"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Close navigation drawer"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overview"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Show notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitive notification contents will be hidden when locked"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"All notification contents will be shown when locked"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 486bc9e..a25e9e4 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ausente"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"No calculada"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU total"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el modo de ahorro de batería."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"La aplicación podrá ofrecer una configuración para reducir el uso de la batería."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batería utilizada por el usuario"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Uso de potencia no calculada"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desconectó"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir panel lateral de navegación"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Cerrar panel lateral de navegación"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descripción"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Notificaciones"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Notificaciones personales ocultas al bloquear"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Notificaciones visibles al bloquear"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f26ce27..efddf25 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Desconocida"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrecalculada"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total de CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecciona el modo de ahorro de batería"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Es posible que la aplicación incluya opciones que permitan reducir el uso de la batería."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batería usada por el usuario"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Uso de potencia desconocido"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que se desenchufó"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir panel de navegación"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Cerrar panel de navegación"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descripción"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostrar notificaciones"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Notificaciones personales ocultas al bloquear"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Las notificaciones se mostrarán al bloquear"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 7a2f267..8d882fa 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Tavakõned"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tahvelarvuti on ooterežiimis"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon tegevuseta"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Arvestamata"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Liigselt arvestatud"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kokku"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU esiplaanil"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Valige akut säästev režiim"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Rakendus võib pakkuda akukasutust vähendavaid seadeid"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Kasutaja akukasutus"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Arvestamata energiatarbimine"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> alates lahutamisest"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigeerimissahtli avamine"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigeerimissahtli sulgemine"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Ülevaade"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Kuva märguanded"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Märguande tundlik sisu peidetakse, kui seade on lukustatud"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Märguande kogu sisu kuvat., kui seade on lukustatud"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f840dd6..5f6a398 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"تماس‌های صوتی"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"رایانهٔ لوحی آماده به کار"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"حالت بلااستفاده تلفن"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"محاسبه نشده"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"بیش از حد محاسبه شده"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏مقدار کل CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏پیش زمینه CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"انتخاب حالت صرفه‌جویی در مصرف باتری"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"این برنامه دارای تنظیماتی است که در میزان مصرف باتری صرفه‌جویی می‌کند"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"باتری استفاده شده توسط کاربر"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"نیروی مصرفی محاسبه نشده"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> از زمان جدا کردن"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"باز کردن کشوی پیمایش"</string>
     <string name="drawer_close" msgid="3329237203619660131">"بستن کشوی پیمایش"</string>
     <string name="dashboard_title" msgid="821911564947991553">"نمای کلی"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"نمایش اعلان‌ها"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"در حالت قفل محتوای اعلان حساس پنهان خواهد شد"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"در حالت قفل همه محتوای اعلان نمایش داده می‌شود"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index aacf6ae..639092a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Äänipuhelut"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet pois käytöstä"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Tuntematon"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Yliarvioitu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Suorittimen käyttöaika yhteensä"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Valitse virransäästötila"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Sovellus saattaa tarjota käyttöön asetuksia, joiden avulla akun käyttöä voidaan vähentää."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Käyttäjien käyttämä akun virta"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Tuntematon virrankulutus"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> laturin irrottamisen jälkeen"</string>
@@ -2087,4 +2089,10 @@
     <string name="drawer_open" msgid="132008699936863299">"Avaa navigointipalkki"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Sulje navigointipalkki"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Yleiskatsaus"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 2ce92ef..c8373e0 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Non prise en compte"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Durée d\'utilisation totale de l\'UC"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode Économie de la pile"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Utilisation non prise en compte de la pile"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Ouvrir le panneau de navigation"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fermer le panneau de navigation"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Présentation"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Afficher les notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Contenu notif. sensible masqué si écran verrouillé"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Tout contenu notif. s\'affiche si écran verrouillé"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 318d95f..7ccca02 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Non prise en compte"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Surestimée"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"UC - Durée totale"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Sélectionnez le mode Économie de batterie."</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'application dispose peut-être de paramètres permettant de réduire l\'utilisation de la batterie."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batterie utilisée par l\'utilisateur"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consommation non prise en compte"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Débranché depuis <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Ouvrir le panneau de navigation"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fermer le panneau de navigation"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Vue d\'ensemble"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Afficher notif."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Contenu notif. sensible masqué si écran verrouillé"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Tout contenu notif. s\'affiche si écran verrouillé"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b0fdd5e..956d85a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टेबलेट निष्‍क्रिय"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"फ़ोन निष्‍क्रिय"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"बेहिसाब"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"अत्यधिक"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"कुल CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी की बचत मोड चुनें"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए ऐप्स, सेटिंग ऑफ़र कर सकता है"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"पावर का बेहिसाब उपयोग"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"अनप्लग करने के बाद से <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"नेविगेशन ड्रॉवर खोलें"</string>
     <string name="drawer_close" msgid="3329237203619660131">"नेविगेशन ड्रॉवर बंद करें"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ओवरव्यू"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"सूचना दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"लॉक होने पर संवेदनशील सूचना सामग्री छिप जाएंगी"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"लॉक होने पर सभी सूचना सामग्री दिखाई देंगी"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 48bf910..79de454 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletni uređaj u mirovanju"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neobračunato"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Previše obračunato"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Ukupno CPU-a"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Odaberite način štednje baterije"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacija možda nudi postavke za smanjenje potrošnje baterije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterija koju upotrebljava korisnik"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neobračunata potrošnja energije"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obračunata potrošnja energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otvaranje ladice za navigaciju"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zatvaranje ladice za navigaciju"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Pregled"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Pokaži obavijest"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Na zaključanom zaslonu nema osjetljivih obavijesti"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Zaključani zaslon prikazuje sve obavijesti"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8399cd9..2be05b0 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hanghívások"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Táblagép - tétlen"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Elszámolatlan"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Túlbecsült"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU teljes"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Energiatakarékos mód kiválasztása"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Az alkalmazás felkínálhat olyan beállításokat, amelyek csökkentik az energiafelhasználást"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"A felhasználó akkumulátorhasználata"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Elszámolatlan energiafogyasztás"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> az utolsó töltés óta"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigációs fiók kinyitása"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigációs fiók bezárása"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Áttekintés"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Értesítések megjelenítése"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Zárolt állapotban a bizalmas értesítések rejtve maradnak."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Lezárt képernyőnél minden értesítés látszik"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 0f1c7ed..fa1b0fd 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Ձայնային զանգեր"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Գրասալիկի անգործունը"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Հեռախոսի անգործունը"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Չհաշվարկված"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Գերօգտագործում"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-ի ընդհանուրը"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU առաջնատեսք"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Ընտրեք մարտկոցը խնայող ռեժիմ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Հավելվածը կարող է առաջարկել կարգավորումներ` մարտկոցի օգտագործումը նվազեցնելու համար"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Օգտվողի կողմից օգտագործված մարտկոցը"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Մարտկոցի չհաշվարկված օգտագործում"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> հոսանքից անջատելուց հետո"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Բացել նավարկման դարակը"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Փակել նավարկման դարակը"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Համատեսք"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Ցուցադրել ծանուցումները"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Ծանուցման զգայուն բովանդակությունը կթաքցվի կողպված ժամանակ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Ծանուցման ողջ բովանդակությունը կցուցադրվի կողպված ժամանակ"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 215361c..8c63e1a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet menganggur"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telepon menganggur"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Tidak terhitung"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Dihitung berlebih"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pilih mode hemat baterai"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Apl tersebut mungkin menawarkan setelan untuk mengurangi penggunaan baterai"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterai yang digunakan oleh pengguna"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Penggunaan daya yang tidak terhitung"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak dicabut"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Buka panel samping navigasi"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Tutup panel samping navigasi"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Ikhtisar"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Lihat Notifikasi"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Isi notifikasi sensitif tersembunyi saat terkunci"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Semua isi notifikasi ditampilkan saat terkunci"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b5ad389..6116d6b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chiamate vocali"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inattivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefono inattivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Non considerato"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sovrastimato"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Totale CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Seleziona modalità a basso consumo"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"L\'applicazione potrebbe offrire impostazioni per ridurre l\'utilizzo della batteria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteria utilizzata dall\'utente"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumo batteria non considerato"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> dallo scollegamento"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Apri riquadro a scomparsa di navigazione"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Chiudi riquadro a scomparsa di navigazione"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Panoramica"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostra notifiche"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Contenuti riservati nascosti con blocco attivo"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Visualizzazione di tutti i contenuti con blocco"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e4b537b..8b2e39f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"שיחות קוליות"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"טאבלט לא פעיל"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"טלפון לא פעיל"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"לא מוסבר"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"חישוב יתר"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"‏CPU - סך הכל"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"‏CPU בחזית"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"בחר במצב חיסכון בסוללה"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ייתכן שהאפליקציה מציעה הגדרות לצמצום צריכת הסוללה"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"סוללה בשימוש על ידי משתמש"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"שימוש לא מוסבר בחשמל"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> מאז הניתוק"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"פתח את חלונית הניווט"</string>
     <string name="drawer_close" msgid="3329237203619660131">"סגור את חלונית הניווט"</string>
     <string name="dashboard_title" msgid="821911564947991553">"סקירה כללית"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"הצג התראות"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"תוכן התראות רגיש יוסתר כשהמכשיר נעול"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"התוכן של כל ההתראות יוצג כשהמכשיר נעול"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ecc6219..358fb50 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -1513,7 +1513,8 @@
     <string name="power_phone" msgid="5392641106474567277">"通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"アイドル状態"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"アイドル状態"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"算出不能"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"過剰算出"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU合計"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
@@ -1557,7 +1558,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"バッテリー節約モードを選択します"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"アプリ側の設定で電池使用量を抑えられる場合があります"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ユーザーの電池使用量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"算出不能の消費電力"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"電池使用時間: <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2093,4 +2095,7 @@
     <string name="drawer_open" msgid="132008699936863299">"ナビゲーションドロワーを開く"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ナビゲーションドロワーを閉じる"</string>
     <string name="dashboard_title" msgid="821911564947991553">"概要"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"通知を表示"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"ロック時にプライベートな通知の内容を非表示にします"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"ロック時にすべての通知の内容を表示します"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 371485f..1bb515f 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ხმოვანი ზარები"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"მოცდის რეჟიმი"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"მოცდის რეჟიმი"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ჩაუთვლელი"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"ზედმეტად ჩათვლილი"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"სულ ცენრალურ პროცესორში"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU აქტიური რეჟიმი"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ბატარეის დაზოგვის რეჟიმი"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"აპში შესაძლოა იყოს პარამეტრები ბატარეის ხარჯის შესამცირებლად"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"მომხმარებლის მიერ გამოყენებული ბატარეა"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ჩაუთვლელი ელკვების გამოყენება"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> გამორთვის მომენტიდან"</string>
@@ -2087,4 +2089,10 @@
     <string name="drawer_open" msgid="132008699936863299">"ნავიგაციის სექციის გახსნა"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ნავიგაციის სექციის დახურვა"</string>
     <string name="dashboard_title" msgid="821911564947991553">"მიმოხილვა"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 3722919..361e2da 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ការ​ហៅ​ជា​សំឡេង"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"កុំព្យូទ័រ​បន្ទះ​ទំនេរ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ទូរស័ព្ទ​ទំនេរ"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"មិន​រាប់​បញ្ចូល"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"លើស"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU សរុប"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ផ្ទៃ​ខាង​មុខ CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ជ្រើស​របៀប​សន្សំ​ថ្ម"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"កម្មវិធី​អាច​ផ្ដល់​ការ​កំណត់​ ដើម្បី​កាត់បន្ថយ​ការ​ប្រើ​ថ្ម"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ថ្ម​បាន​ប្រើ​ដោយ​អ្នក​ប្រើ"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ការ​ប្រើ​ប្រាស់​​ថាមពល​ដែល​មិន​រាប់បញ្ចូល"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> តាំង​ពី​បានដក"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"បើក​កា​រ​រុករក​​ថត"</string>
     <string name="drawer_close" msgid="3329237203619660131">"បិទ​ការ​រុករក​ថត"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ទិដ្ឋភាព​ទូទៅ"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"បង្ហាញការជូនដំណឹង"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"នឹង​លាក់​មាតិកា​ជូនដំណឹង​សុវត្ថិភាព​ពេល​បាន​ចាក់សោ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"នឹងបង្ហាញការជូនដំណឹងមាតិកា​ទាំងអស់​​ពេល​បាន​ចាក់សោ"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3737d83..4c81d1b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"음성 통화"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"유휴 상태 태블릿"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"휴대전화 유휴 상태"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"산정되지 않음"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"과다 산정됨"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"총 CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"배터리 절약 모드 선택"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"앱에서 배터리 사용을 줄일 수 있는 설정을 제공할 수 있습니다."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"사용자의 배터리 사용"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"전력 사용량 산정되지 않음"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"플러그를 뽑은 후 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"탐색 창 열기"</string>
     <string name="drawer_close" msgid="3329237203619660131">"탐색 창 닫기"</string>
     <string name="dashboard_title" msgid="821911564947991553">"개요"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"알림 표시"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"잠금 상태일 때 민감한 알림 콘텐츠가 숨겨집니다."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"잠금 상태일 때 모든 알림 콘텐츠가 표시됩니다."</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index ddc552a..741dcbd 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"ການໂທດ້ວຍສຽງ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ແທັບເລັດບໍ່ເຮັດວຽກ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ໂທລະ​ສັບ​ບໍ່​ເຮັດ​ວຽກ"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ບໍ່ໄດ້ຄິດໄລ່"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"ຄິດໄລ່ເກີນ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ຮວມ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ພື້ນໜ້າ"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ເລືອກໂໝດປະຫຍັດໄຟ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ແອັບຯອາດນຳສະເໜີການຕັ້ງຄ່າ ເພື່ອຫຼຸດການນຳໃຊ້ແບັດເຕີຣີ"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ແບັດເຕີຣີທີ່ໃຊ້ໂດຍຜູ່ໃຊ້"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"ການໃຊ້ພະລັງງານທີ່ບໍ່ໄດ້ຄິດໄລ່"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"ເປີດລິ້ນຊັກໂຕນຳທາງ"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ປິດລິ້ນຊັກນຳທາງ"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ພາບ​ຮວມ"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"ສະແດງການແຈ້ງເຕືອນ"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"ເນື້ອຫາການແຈ້ງເຕືອນທີ່ມິຄວາມອ່ອນໄຫວ ຈະຖືກເຊື່ອງໄວ້ເມື່ອມີການລັອກ"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"ທຸກເນື້ອຫາການແຈ້ງເຕືອນ ຈະຖືກສະແດງເມື່ອມີການລັອກ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a971eb3..bdd08b0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Balso skambučiai"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetinis kompiuteris neveikos būsenos"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neapskaičiuota"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Per daug apskaičiuota"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Visas CPU laikas"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pasirinkite akumuliatoriaus tausojimo režimą"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Programa gali pasiūlyti nustatymus, kad būtų išeikvojama mažiau akumuliatoriaus energijos"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Naudotojo sunaudota akumuliatoriaus energija"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neapskaičiuotos energijos naudojimas"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> po to, kai buvo ištrauktas iš lizdo"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Atidaryti naršymo juostą"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Uždaryti naršymo juostą"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Apžvalga"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Rodyti pranešim."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Delik. praneš. turin. bus paslėpt., kai užrakinta"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Visas pranešimų turinys bus rodomas, kai užrakinta"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4ed1083..1efe8a0 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Balss zvani"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetdators ir gaidstāvē"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neuzskaitītais"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Par daudz uzskaitītais"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kopā"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU akt. režīms"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Atlasiet akumulatora jaudas taupīšanas režīmu"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Lietotnē var būt pieejami iestatījumi akumulatora enerģijas patēriņa samazināšanai"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Lietotāja patērētā akumulatora jauda"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neuzskaitītais enerģijas patēriņš"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kopš atslēgšanas"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Atvērt navigācijas paneli"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Aizvērt navigācijas paneli"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Kopsavilkums"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Rādīt paziņojumus"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Bloķēšanas ekrānā netiks rādīti sensitīvi paziņoj."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Bloķēšanas ekrānā tiks rādīti visi paziņojumi"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 6754768..70b914d 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Дуугаар залгах"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет идэвхгүй"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Утас идэвхгүй"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Бүртгэгдээгүй"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Хэтрүүлэн тооцсон"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU нийт"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ил"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Батерей хэмнэлтийн горимыг сонгох"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апп зайны ашиглалтыг багасгах тохиргоог санал болгож болно"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Хэрэглэгчийн зарцуулсан зай"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Бүртгэгдээгүй цахилгаан ашиглалт"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Салгаснаас хойш <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Навигацын татуургыг нээх"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Навигацын татуургыг хаах"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Тойм"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Мэдэгдлүүдийг харуулах"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Түгжээтэй үед нууцлалтай мэдэгдлийн агуулгыг харуулахгүй"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Түгжээтэй үед бүх мэдэгдлийн агуулгыг харуулна"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index f338bed..152abce 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet melahu"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon melahu"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Tidak dapat dikesan"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Terlebih kira"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Jumlah CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pilih mod penjimatan bateri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikasi ini mungkin menawarkan tetapan untuk mengurangkan penggunaan bateri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateri digunakan oleh pengguna"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Penggunaan kuasa tidak dapat dikesan"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sejak palam dicabut"</string>
@@ -2087,4 +2089,10 @@
     <string name="drawer_open" msgid="132008699936863299">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Tutup laci navigasi"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Gambaran keseluruhan"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8fc7df9..033bf1c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Telefonsamtaler"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Nettbrettet ikke i bruk"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Ikke-beregnet"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Overberegnet"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Prosessor totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Velg batterisparingsmodus"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen kan ha innstillinger som kan redusere batteribruken"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteri brukt av brukeren"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ikke-beregnet strømforbruk"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> siden strømmen ble frakoblet"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Åpne navigasjonsskuffen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Lukk navigasjonsskuffen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Oversikt"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Vis varsler"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Sensitivt varselinnhold skjules på låseskjermen"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Alt varselinnhold vises på låseskjermen"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 14aa7f8..00a9e5d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Spraakoproepen"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactief"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Onverklaard"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Te hoog berekend"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU-totaal"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Accubesparingsmodus selecteren"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"De app kan instellingen aanbieden om het accugebruik te beperken"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Accu gebruikt door gebruiker"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Onverklaard stroomgebruik"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sinds losgekoppeld"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Navigatielade openen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Navigatielade sluiten"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overzicht"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Meldingen weergeven"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Inhoud van gevoelige meldingen wordt verborgen indien vergrendeld"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Inhoud van alle meldingen wordt weergegeven indien vergrendeld"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c734915..3c27a25 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Połączenia głosowe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet nieaktywny"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon nieaktywny"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Nierozliczone"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Obliczone z nadmiarem"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU łącznie"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (pierwszy plan)"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Wybierz tryb oszczędzania baterii"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplikacja może oferować ustawienia pozwalające zmniejszyć użycie baterii."</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Użycie baterii przez użytkownika"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Nierozliczone zużycie energii"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odłączenia"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otwórz szufladę nawigacji"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zamknij szufladę nawigacji"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Omówienie"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Pokaż powiadomienia"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"W trybie blokady treść poufna powiadomień będzie ukryta"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"W trybie blokady cała treść powiadomień będzie widoczna"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1608b5b..bb0cf86 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Não contabilizada"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Contabilizada em excesso"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecionar o modo de poupança de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"A aplicação pode sugerir definições para reduzir a utilização da bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria usada pelo utilizador"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Utilização de energia não contabilizada"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desligado"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir gaveta de navegação"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fechar gaveta de navegação"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Descrição geral"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostrar notif."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"O cont. de notif. conf. será ocult. c/ ecrã bloq."</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"O cont. de todas notif. será mostr. c/ ecrã bloq."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 40446ac..510e129 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ocioso"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Não estimado"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Superestimado"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total da CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selecionar modo de economia de bateria"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"O aplicativo pode oferecer configurações para reduzir o uso da bateria"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateria utilizada pelo usuário"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumo de energia não estimado"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> desde que foi desconectado"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Abrir gaveta de navegação"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Fechar gaveta de navegação"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Visão geral"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Mostrar notific."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Notificações confidenciais ocultas ao bloquear"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Conteúdo de notificações exibido ao bloquear"</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 1322ec6..3c7f967 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -2384,7 +2384,7 @@
     <!-- no translation found for power_idle (4612478572401640759) -->
     <skip />
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
-    <!-- no translation found for power_unaccounted (4835429811853042257) -->
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
     <skip />
     <!-- no translation found for power_overcounted (2762354976171358445) -->
     <skip />
@@ -2455,7 +2455,7 @@
     <skip />
     <!-- no translation found for battery_desc_users (7682989161885027823) -->
     <skip />
-    <!-- no translation found for battery_desc_unaccounted (1653798876416893745) -->
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
     <skip />
     <!-- no translation found for battery_desc_overcounted (5481865509489228603) -->
     <skip />
@@ -3451,4 +3451,10 @@
     <skip />
     <!-- no translation found for dashboard_title (821911564947991553) -->
     <skip />
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a75d2ab..3d373e9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -1512,7 +1512,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Apeluri vocale"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inactivă"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neînregistrat"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Supraevaluat"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Total procesor"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
@@ -1556,7 +1557,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Selectați modul de economisire a bateriei"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Aplicaţia poate oferi setări pentru reducerea utilizării bateriei"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Baterie utilizată de utilizator"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Consumul neînregistrat al bateriei"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> de la deconectare"</string>
@@ -2088,4 +2090,10 @@
     <string name="drawer_open" msgid="132008699936863299">"Deschideți panoul de navigare"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Închideți panoul de navigare"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Prezentare"</string>
+    <!-- no translation found for lock_screen_notifications (736030096980572317) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_off (3873689304488434778) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_on (7770997162767814840) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 05b36d6..4ea8045 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшетный ПК в режиме ожидания"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Неучтенное"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Переучтенное"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"ЦП – всего"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – акт. режим"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Выберите режим экономии заряда батареи"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"В программе могут быть настройки режима энергосбережения"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Использование батареи пользователем"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Неучтенное энергопотребление"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> с момента отключения от питания"</string>
@@ -2089,4 +2091,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Открыть панель навигации"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Закрыть панель навигации"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Обзор"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Уведомления"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Не показывать конфиденциальные данные"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Показывать уведомления полностью"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e3ee607..a6c2617 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -807,7 +807,7 @@
     <string name="device_status" msgid="607405385799807324">"Stav"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Stav batérie, siete a ďalšie informácie"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefónne číslo, signál atď."</string>
-    <string name="storage_settings" msgid="4211799979832404953">"Ukladací priestor"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Úložisko"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Nastavenia ukladacieho priestoru"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Odpojiť ukladací priestor USB a zobraziť dostupný ukladací priestor"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojiť kartu SD a zobraziť dostupný ukladací priestor"</string>
@@ -1100,7 +1100,7 @@
     <string name="advanced_settings" msgid="1777249286757067969">"Rozšírené nastavenia"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povoliť ďalšie možnosti nastavení"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informácie o aplikácii"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Ukladací priestor"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Úložisko"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"Spúšťať ako predvolenú"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Predvolené"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilita obrazovky"</string>
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet je nečinný"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neznáma"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Nadsadená"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Doba prevádzky procesora"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Vyberte režim úspory batérie"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Táto aplikácia môže ponúkať nastavenia na zníženie používania batérie"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Využitie batérie používateľom"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neznáma spotreba energie"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odpojenia"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Otvoriť priečinok s navigáciou"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zavrieť priečinok s navigáciou"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Prehľad"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Zobraziť upozor."</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Po uzamk. sa obsah citlivých upozornení nezobrazí"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Po uzamknutí sa zobrazí obsah všetkých upozornení"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 47d2aac..cc9408f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Glasovni klici"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablični računalnik nedejaven"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon je nedejaven"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Neevidentirano"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Preveč šteto"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Skupni čas za CPE"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Izberite način za varčevanje z energijo akumulatorja"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Program morda omogoča nastavitve za zmanjšanje porabe energije"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Energija, ki jo je porabil uporabnik"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Neevidentirana uporaba energije"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od odklopa"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Odpri predal za krmarjenje"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Zapri predal za krmarjenje"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Pregled"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Pokaži obvestila"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Ob zaklen. zaslonu bo skrita občut. vseb. obvestil"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Ob zaklen. zaslonu bo prikaz. vsa vsebina obvestil"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9490e46..1b113bd 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Гласовни позиви"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет је у стању мировања"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон у мировању"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Непозната"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Прекомерно израчуната"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Укупно коришћење процесора"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Изаберите режим уштеде батерије"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апликација може да понуди подешавања како би се смањило коришћење батерије"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Батерија коју користи корисник"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Непозната потрошња батерије"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> од искључивања"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Отворите фиоку за навигацију"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Затворите фиоку за навигацију"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Преглед"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Приказ обавештења"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Осетљив садржај обавештења се сакрива на закључаном екрану"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Цела обавештења се приказују на закључаном екрану"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 16a1532..39b9f98 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Surfplattan är inaktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Oräknad"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"För högt räknad"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU totalt"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Välj batterisparläge"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Appen erbjuder eventuellt inställningar som minskar batteriförbrukningen"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Batteri som förbrukats av användaren"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Oräknad strömförbrukning"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> sedan bortkoppling"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Öppna navigeringspanelen"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Stäng navigeringspanelen"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Översikt"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Visa aviseringar"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Känsliga aviseringar döljs när skärmen är låst"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Allt aviseringsinnehåll visas när skärmen är låst"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3adbadc..e8916b2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -1505,7 +1505,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Simu za sauti"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Kompyuta kibao haitumiki"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Wakati simu haitumiki"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Isiyorekodiwa"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Hesabu iliyopitiliza"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU kwa jumla"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
@@ -1549,7 +1550,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Chagua hali inayookoa betri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Huenda programu ikatoa mipangilio ya kupunguza utumiaji wa betri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Betri imetumiwa na mtumiaji"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Matumizi ya nishati yasiyokuwa na rekodi"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
     <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> tangu ilipoondolewa"</string>
@@ -2081,4 +2083,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Fungua menyu"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Funga menyu"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Muhtasari"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Onyesha arifa"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Maudhui ya arifa nyeti yatafichwa inapokuwa imefungwa"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Maudhui yote ya arifa yataonyeshwa inapokuwa imefungwa"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b4a17a9..67fb641 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ไม่มีการใช้งานแท็บเล็ต"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"ไม่สามารถคำนวณ"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"คำนวณมากเกินไป"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU รวม"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"เลือกโหมดประหยัดแบตเตอรี่"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"แอปพลิเคชันอาจเสนอการตั้งค่าที่ลดการใช้แบตเตอรี่"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"แบตเตอรี่ที่ใช้โดยผู้ใช้"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"การใช้พลังงานที่ไม่สามารถคำนวณ"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ตั้งแต่ถอดปลั๊ก"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"เปิดลิ้นชักการนำทาง"</string>
     <string name="drawer_close" msgid="3329237203619660131">"ปิดลิ้นชักการนำทาง"</string>
     <string name="dashboard_title" msgid="821911564947991553">"ภาพรวม"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"แสดงการแจ้งเตือน"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"เนื้อหาแจ้งเตือนที่ละเอียดอ่อนจะถูกซ่อนไปเมื่อล็อก"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"เนื้อหาการแจ้งเตือนทั้งหมดจะแสดงขึ้นเมื่อล็อก"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0ef39bb..16cfc3e 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Mga boses ng tawag"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Idle ang tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Idle ang telepono"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Hindi nakalkula"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Sobrang nakalkula"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Kabuuan ng CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Piliin ang battery-saving mode"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Maaaring mag-alok ang app ng mga setting upang mabawasan ang paggamit ng baterya"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Bateryang ginamit ng user"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Hindi nakalkulang paggamit ng power"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> mula nang na-unplug"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Buksan ang drawer ng pag-navigate"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Isara ang drawer ng pag-navigate"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Overview"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Show notifications"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Nakatago ang sensitive notification contents pag naka-lock"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Kita ang nilalaman ng notification kapag naka-lock"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 90495d3..7d5bf6b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Sesli aramalar"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet boşta"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon boşta"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Yetersiz hesaplandı"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Fazla hesaplandı"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Toplam CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Pil tasarrufu modunu seçin"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uygulama, pil kullanımını azaltmak için ayarlar önerebilir"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Kullanıcı tarafından harcanan pil miktarı"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Hesaplanmayan güç kullanımı"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"Fişten çekildikten itibaren <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Gezinme çekmecesini aç"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Gezinme çekmecesini kapat"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Genel Bakış"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Bildirim göster"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Kilitliyken hassas bildirim içerikleri gizlenecek"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Kilitliyken tüm bildirim içerikleri gösterilecek"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fef12a7..baef20f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Голос. дзвінки"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Режим очікув."</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим очік."</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Невраховане"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Переоцінене"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Заг. ЦП"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Виберіть режим економії заряду акумулятора"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"У програмі можуть бути налаштування режиму енергозбереження"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Використання акумулятора користувачем"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Невраховане енергоспоживання"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> з часу відключ."</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Відкрити панель навігації"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Сховати панель навігації"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Огляд"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Показ.сповіщення"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Після блокування особисті відомості буде приховано"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Після блокування всі відомості відображатимуться"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e02c0f1..bb2bd43 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Dưới mức"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Vượt mức"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU tổng"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Chọn chế độ tiết kiệm pin"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Ứng dụng có thể cung cấp các cài đặt để giảm mức sử dụng pin"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Pin do người dùng sử dụng"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Sử dụng nguồn dưới mức"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> từ khi tháo đầu cắm"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Mở ngăn điều hướng"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Đóng ngăn điều hướng"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Tổng quan"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"H.thị thông báo"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Nội dung thông báo nhạy cảm sẽ được ẩn khi bị khóa"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Tất cả nội dung thông báo sẽ hiển thị khi bị khóa"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8e9d251..e155b09 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"语音通话"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板电脑待机"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手机待机"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"未计算在内的"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"多算了的"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 总使用时间"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"选择“耗电量低”模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"该应用中可能提供了用于减少耗电量的设置"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用户所耗电量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"未计算在内的用电量"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔下电源后已过 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2087,4 +2089,7 @@
     <string name="drawer_open" msgid="132008699936863299">"打开抽屉式导航栏"</string>
     <string name="drawer_close" msgid="3329237203619660131">"关闭抽屉式导航栏"</string>
     <string name="dashboard_title" msgid="821911564947991553">"概览"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"显示通知"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"屏幕锁定时，系统会隐藏敏感的通知内容"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"屏幕锁定时，系统会显示所有通知内容"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 047274d2..7568eae 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"用途不明"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"計算過高"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約電池用量模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能有提供節省電力的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"用戶用電量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"用途不明的用電量"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已耗電 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2091,4 +2093,7 @@
     <string name="drawer_open" msgid="132008699936863299">"開啟導覽匣"</string>
     <string name="drawer_close" msgid="3329237203619660131">"關閉導覽匣"</string>
     <string name="dashboard_title" msgid="821911564947991553">"簡介"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"顯示通知"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"鎖定時隱藏敏感通知內容"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"鎖定時顯示所有通知內容"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7a96a91..7c3dfe3 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -1511,7 +1511,8 @@
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"用途不明"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"估計過高"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
@@ -1555,7 +1556,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"選取節約耗電量模式"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"應用程式可能會提供省電的設定"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"使用者用電量"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"用途不明的用電量"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"拔除插頭後已過了 <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
@@ -2091,4 +2093,7 @@
     <string name="drawer_open" msgid="132008699936863299">"開啟導覽匣"</string>
     <string name="drawer_close" msgid="3329237203619660131">"關閉導覽匣"</string>
     <string name="dashboard_title" msgid="821911564947991553">"總覽"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"顯示通知"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"鎖定時隱藏敏感通知內容"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"鎖定時顯示所有通知內容"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index dc82335..b40a60d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -1518,7 +1518,8 @@
     <string name="power_phone" msgid="5392641106474567277">"Amakholi ezwi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ithebhulethi ayenzi lutho"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ifoni ayenzi lutho"</string>
-    <string name="power_unaccounted" msgid="4835429811853042257">"Okungabaliwe"</string>
+    <!-- no translation found for power_unaccounted (8066636609824407931) -->
+    <skip />
     <string name="power_overcounted" msgid="2762354976171358445">"Okubalwe ngaphezulu"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"Inani le-CPU"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
@@ -1562,7 +1563,8 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Khetha imodi yokulondoloza ibhethri"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uhlelo lokusebenza lunganikeza izilungiselelo ukwehlisa ukusebenzisa ibhetri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Ibhethri elisetshenziswe umsebenzisi"</string>
-    <string name="battery_desc_unaccounted" msgid="1653798876416893745">"Ukusetshenziswa kwamandla okungabalwa"</string>
+    <!-- no translation found for battery_desc_unaccounted (827801520179355764) -->
+    <skip />
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> kusukelwa kungaxhunyiwe"</string>
@@ -2094,4 +2096,7 @@
     <string name="drawer_open" msgid="132008699936863299">"Vula ikhabethe lokuzulazula"</string>
     <string name="drawer_close" msgid="3329237203619660131">"Vala ikhabethe lokuzulazula"</string>
     <string name="dashboard_title" msgid="821911564947991553">"Ukubuka konke"</string>
+    <string name="lock_screen_notifications" msgid="736030096980572317">"Bonisa izaziso"</string>
+    <string name="lock_screen_notifications_summary_off" msgid="3873689304488434778">"Okuqukethwe kwesaziso esinozwelo kuzofihlwa uma kukhiyiwe"</string>
+    <string name="lock_screen_notifications_summary_on" msgid="7770997162767814840">"Konke okuqukethwe kwesaziso kuzoboniswa uma kukhiyiwe"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2e22d46..6d0cd76 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1229,4 +1229,17 @@
         <item>6</item>
     </string-array>
 
+    <!-- Setting display values for zen mode -->
+    <string-array name="entries_zen_mode">
+        <item>Off</item>
+        <item>Limited interruptions</item>
+        <item>Zero interruptions</item>
+    </string-array>
+
+    <!-- Setting values for zen mode, must match the Settings.Global.ZEN_MODE_ constants -->
+    <string-array name="entryvalues_zen_mode" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b42c88c..8b6e671 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1753,6 +1753,10 @@
     <string name="notification_sound_title">Default notification sound</string>
     <!-- Sound settings screen, notification light repeat pulsing title -->
     <string name="notification_pulse_title">Pulse notification light</string>
+    <!-- Display settings screen, notification popups are enabled [CHAR LIMIT=30] -->
+    <string name="heads_up_enabled_title">Heads Up Notifications</string>
+    <!-- Display settings screen, notification popups are explained [CHAR LIMIT=45]-->
+    <string name="heads_up_enabled_summary">Important notifications will pop up</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
     <string name="incoming_call_volume_title">Ringtone</string>
     <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
@@ -2625,7 +2629,7 @@
     <!-- Applications settings screen, setting check box title. If checked, the system will send package verification requests to package verifiers on the device who will ultimately allow or reject the installation of applications. [CHAR LIMIT=30] -->
     <string name="verify_applications">Verify apps</string>
     <!-- Applications settings screen, setting check box summary. This is the summary for "App Check" checkbox. [CHAR LIMIT=none] -->
-    <string name="verify_applications_summary">Regularly check all apps and disallow or warn about those that may cause harm</string>
+    <string name="verify_applications_summary">Regularly check device activity for security problems, and prevent or warn about potential harm.</string>
     <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
     <string name="advanced_settings">Advanced settings</string>
     <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
@@ -3626,6 +3630,8 @@
     <string name="usage_type_data_send">Mobile packets sent</string>
     <!-- Label for mobile network data received [CHAR LIMIT=32] -->
     <string name="usage_type_data_recv">Mobile packets received</string>
+    <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+    <string name="usage_type_radio_active">Mobile radio active</string>
     <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
     <string name="usage_type_data_wifi_send">Wi\u2011Fi packets sent</string>
     <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
@@ -5005,4 +5011,15 @@
          shown in notifications shown on a secure lock screen
          [CHAR LIMIT=50] -->
     <string name="lock_screen_notifications_summary_on">All notification contents will be shown when locked</string>
+
+    <!-- [CHAR LIMIT=30] Sound settings screen, setting option name to change zen mode -->
+    <string name="title_zen_mode">Zen mode</string>
+    <!-- [CHAR LIMIT=30] Sound settings screen, setting option summary displaying the currently selected zen mode -->
+    <string name="summary_zen_mode" translatable="false">%1$s</string>
+    <!-- [CHAR LIMIT=40] Sound settings screen, title of dialog for picking zen mode -->
+    <string name="dialog_title_zen_mode">Zen mode</string>
+    <!-- [CHAR LIMIT=30] Sound settings screen, description for configuring zen mode -->
+    <string name="configure_zen_mode_description">Configure Zen mode</string>
+    <!-- [CHAR LIMIT=30] Zen mode settings screen, activity title -->
+    <string name="zen_mode_settings_title">Limited Interruptions</string>
 </resources>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index a9506e8..53d9915 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -53,6 +53,12 @@
             android:title="@string/notification_pulse_title"
             android:persistent="false" />
 
+        <CheckBoxPreference
+            android:key="heads_up"
+            android:title="@string/heads_up_enabled_title"
+            android:summary="@string/heads_up_enabled_summary"
+            android:persistent="false" />
+
         <PreferenceScreen
                 android:key="wifi_display"
                 android:title="@string/wifi_display_settings_title"
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 26e2e20..580b6d5 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -109,4 +109,13 @@
         android:title="@string/dock_sounds_enable_title"
         android:defaultValue="false" />
 
+    <com.android.settings.ZenModeListPreference
+            android:key="zen_mode"
+            android:persistent="false"
+            android:title="@string/title_zen_mode"
+            android:summary="@string/summary_zen_mode"
+            android:entries="@array/entries_zen_mode"
+            android:entryValues="@array/entryvalues_zen_mode"
+            android:dialogTitle="@string/dialog_title_zen_mode" />
+
 </PreferenceScreen>
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index ab00a0d..efd4705 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -25,7 +25,9 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.RemoteException;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
@@ -36,9 +38,6 @@
 import android.provider.Settings.SettingNotFoundException;
 import android.util.Log;
 
-import com.android.internal.view.RotationPolicy;
-import com.android.settings.DreamSettings;
-
 import java.util.ArrayList;
 
 public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -51,6 +50,7 @@
     private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
     private static final String KEY_FONT_SIZE = "font_size";
     private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
+    private static final String KEY_HEADS_UP = "heads_up";
     private static final String KEY_SCREEN_SAVER = "screensaver";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
@@ -59,14 +59,16 @@
     private CheckBoxPreference mNotificationPulse;
 
     private final Configuration mCurConfig = new Configuration();
+    private final Handler mHandler = new Handler();
 
     private ListPreference mScreenTimeoutPreference;
     private Preference mScreenSaverPreference;
+    private CheckBoxPreference mHeadsUp;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ContentResolver resolver = getActivity().getContentResolver();
+        final ContentResolver resolver = getActivity().getContentResolver();
 
         addPreferencesFromResource(R.xml.display_settings);
 
@@ -102,6 +104,19 @@
                 Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
             }
         }
+        mHeadsUp = (CheckBoxPreference) findPreference(KEY_HEADS_UP);
+        if (mHeadsUp != null) {
+            updateHeadsUpMode(resolver);
+            mHeadsUp.setOnPreferenceChangeListener(this);
+            resolver.registerContentObserver(
+                    Settings.Global.getUriFor(Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED),
+                    false, new ContentObserver(mHandler) {
+                @Override
+                public void onChange(boolean selfChange) {
+                    updateHeadsUpMode(resolver);
+                }
+            });
+        }
     }
 
     private void updateTimeoutPreferenceDescription(long currentTimeout) {
@@ -235,6 +250,16 @@
         }
     }
 
+    private void updateHeadsUpMode(ContentResolver resolver) {
+        mHeadsUp.setChecked(Settings.Global.HEADS_UP_ON == Settings.Global.getInt(resolver,
+                Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, Settings.Global.HEADS_UP_OFF));
+    }
+
+    private void setHeadsUpMode(ContentResolver resolver, boolean value) {
+        Settings.Global.putInt(resolver, Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED,
+                value ? Settings.Global.HEADS_UP_ON : Settings.Global.HEADS_UP_OFF);
+    }
+
     public void writeFontSizePreference(Object objValue) {
         try {
             mCurConfig.fontScale = Float.parseFloat(objValue.toString());
@@ -252,6 +277,12 @@
                     value ? 1 : 0);
             return true;
         }
+        if (preference == mHeadsUp) {
+            final boolean value = mHeadsUp.isChecked();
+            Log.d(TAG, "onPreferenceTreeClick mHeadsUp: " + value);
+            setHeadsUpMode(getContentResolver(), value);
+            return true;
+        }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 8bbd701..1c7bb59 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -85,6 +85,7 @@
     public static class PaymentSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrintSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrintJobSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ZenModeSettingsActivity extends SettingsActivity { /* empty */ }
 
     public static class TopLevelSettings extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index b7d29fa..fd6c986 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -278,7 +278,8 @@
             TrustedCredentialsSettings.class.getName(),
             PaymentSettings.class.getName(),
             KeyboardLayoutPickerFragment.class.getName(),
-            DashboardSummary.class.getName()
+            DashboardSummary.class.getName(),
+            ZenModeSettings.class.getName()
     };
 
     private SharedPreferences mDevelopmentPreferences;
@@ -683,7 +684,7 @@
         mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
                 mDevelopmentPreferencesListener);
 
-        mHeaderAdapter.resume();
+        mHeaderAdapter.resume(this);
         invalidateHeaders();
 
         registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
@@ -1578,9 +1579,9 @@
             holder.mIcon.setImageDrawable(icon);
         }
 
-        public void resume() {
+        public void resume(Context context) {
             mWifiEnabler.resume();
-            mBluetoothEnabler.resume();
+            mBluetoothEnabler.resume(context);
         }
 
         public void pause() {
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 28d93f1..d506864 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -75,6 +75,7 @@
     private static final String KEY_DOCK_AUDIO_SETTINGS = "dock_audio";
     private static final String KEY_DOCK_SOUNDS = "dock_sounds";
     private static final String KEY_DOCK_AUDIO_MEDIA_ENABLED = "dock_audio_media_enabled";
+    private static final String KEY_ZEN_MODE = "zen_mode";
 
     private static final String[] NEED_VOICE_CAPABILITY = {
             KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
@@ -101,6 +102,7 @@
     private CheckBoxPreference mDockSounds;
     private Intent mDockIntent;
     private CheckBoxPreference mDockAudioMediaEnabled;
+    private ZenModeListPreference mZenModeListPreference;
 
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
@@ -227,6 +229,9 @@
         };
 
         initDockSettings();
+
+        mZenModeListPreference = (ZenModeListPreference) findPreference(KEY_ZEN_MODE);
+        mZenModeListPreference.init();
     }
 
     @Override
diff --git a/src/com/android/settings/ZenModeListPreference.java b/src/com/android/settings/ZenModeListPreference.java
new file mode 100644
index 0000000..e405e0f
--- /dev/null
+++ b/src/com/android/settings/ZenModeListPreference.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2014 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;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+public class ZenModeListPreference extends ListPreference {
+    private static final String TAG = "ZenModeListPreference";
+    private static final boolean DEBUG = false;
+
+    private final Context mContext;
+    private final Handler mHandler = new Handler();
+    private final ContentResolver mResolver;
+
+    private ImageView mConfigure;
+    private int mMode;
+
+    public ZenModeListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        if (DEBUG) Log.d(TAG, "new ZenModeListPreference()");
+        mContext = context;
+        mResolver = context.getContentResolver();
+        setWidgetLayoutResource(R.layout.preference_zen_mode);
+    }
+
+    public void init() {
+        if (DEBUG) Log.d(TAG, "init");
+        loadZenModeSetting("init");
+        setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (DEBUG) Log.d(TAG, "onPreferenceChange " + newValue);
+                final boolean updateWithNewValue = saveZenModeSetting((String)newValue);
+                return updateWithNewValue;
+            }
+        });
+        mResolver.registerContentObserver(
+                Settings.Global.getUriFor(Settings.Global.ZEN_MODE),
+                false, new SettingsObserver());
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        if (DEBUG) Log.d(TAG, "onBindView");
+        super.onBindView(view);
+        mConfigure = (ImageView)view.findViewById(R.id.configure_zen_mode);
+        updateConfigureVisibility();
+        mConfigure.setOnClickListener(new OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                if (mMode != Settings.Global.ZEN_MODE_LIMITED) return;
+                if (mContext instanceof SettingsActivity) {
+                    SettingsActivity sa = (SettingsActivity)mContext;
+                    sa.startPreferencePanel(ZenModeSettings.class.getName(),
+                            null, R.string.zen_mode_settings_title, null, null, 0);
+                }
+            }
+        });
+    }
+
+    private void updateConfigureVisibility() {
+        if (mConfigure != null) {
+            final boolean limited = mMode == Settings.Global.ZEN_MODE_LIMITED;
+            mConfigure.setVisibility(limited ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private void loadZenModeSetting(String reason) {
+        if (DEBUG) Log.d(TAG, "loadZenModeSetting " + reason);
+        mMode = Settings.Global.getInt(mResolver,
+                Settings.Global.ZEN_MODE, Settings.Global.ZEN_MODE_OFF);
+        setValue(Integer.toString(mMode));
+        updateConfigureVisibility();
+    }
+
+    private boolean saveZenModeSetting(String value) {
+        if (DEBUG) Log.d(TAG, "saveZenModeSetting " + value);
+        try {
+            final int v = Integer.valueOf(value);
+            checkZenMode(v);
+            return Settings.Global.putInt(mResolver, Settings.Global.ZEN_MODE, v);
+        } catch (Throwable t) {
+            Log.w(TAG, "Failed to update zen mode with value: " + value, t);
+            return false;
+        }
+    }
+
+    private static void checkZenMode(int mode) {
+        if (mode < Settings.Global.ZEN_MODE_OFF || mode > Settings.Global.ZEN_MODE_FULL) {
+            throw new IllegalArgumentException("Invalid zen mode: " + mode);
+        }
+    }
+
+    private final class SettingsObserver extends ContentObserver {
+        public SettingsObserver() {
+            super(mHandler);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            loadZenModeSetting("change");
+        }
+    }
+}
diff --git a/src/com/android/settings/ZenModeSettings.java b/src/com/android/settings/ZenModeSettings.java
new file mode 100644
index 0000000..4b209b5
--- /dev/null
+++ b/src/com/android/settings/ZenModeSettings.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (C) 2014 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;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class ZenModeSettings extends SettingsPreferenceFragment {
+    private static final String TAG = "ZenModeSettings";
+    private static final boolean DEBUG = false;
+
+    private ZenModeConfigView mConfig;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final Context context = getActivity();
+        final ScrollView sv = new ScrollView(context);
+        sv.setVerticalScrollBarEnabled(false);
+        sv.setHorizontalScrollBarEnabled(false);
+        mConfig = new ZenModeConfigView(context);
+        sv.addView(mConfig);
+        return sv;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mConfig.resetBackground();
+    }
+
+    public static final class ZenModeConfigView extends LinearLayout {
+        private static final Typeface LIGHT =
+                Typeface.create("sans-serif-light", Typeface.NORMAL);
+        private static final int BG_COLOR = 0xffe7e8e9;
+        private final Context mContext;
+
+        private Drawable mOldBackground;
+        private Toast mToast;
+
+        public ZenModeConfigView(Context context) {
+            super(context);
+            mContext = context;
+            setOrientation(VERTICAL);
+
+            int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
+            TextView tv = addHeader("When on");
+            tv.setPadding(0, p / 2, 0, p / 4);
+            addBuckets();
+            tv = addHeader("Automatically turn on");
+            tv.setPadding(0, p / 2, 0, p / 4);
+            addTriggers();
+        }
+
+        @Override
+        protected void onAttachedToWindow() {
+            super.onAttachedToWindow();
+            mOldBackground = getParentView().getBackground();
+            if (DEBUG) Log.d(TAG, "onAttachedToWindow mOldBackground=" + mOldBackground);
+            getParentView().setBackgroundColor(BG_COLOR);
+        }
+
+        public void resetBackground() {
+            if (DEBUG) Log.d(TAG, "resetBackground");
+            getParentView().setBackground(mOldBackground);
+        }
+
+        private View getParentView() {
+            return (View)getParent().getParent();
+        }
+
+        private TextView addHeader(String text) {
+            TextView tv = new TextView(mContext);
+            tv.setTypeface(LIGHT);
+            tv.setTextColor(0x7f000000);
+            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
+            tv.setText(text);
+            addView(tv);
+            return tv;
+        }
+
+        private void addTriggers() {
+            addView(new TriggerView("While driving"));
+            addView(new TriggerView("While in meetings"));
+            addView(new TriggerView("During a set time period"));
+        }
+
+        private void addBuckets() {
+            LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT,
+                    LayoutParams.WRAP_CONTENT);
+            BucketView callView = new BucketView(android.R.drawable.ic_menu_call, "Calls", 2,
+                    "Block all", "Starred contacts only", "Allow all");
+            addView(callView, lp);
+            lp.topMargin = 4;
+            BucketView msgView = new BucketView(android.R.drawable.ic_menu_myplaces,
+                    "Text & SMS Messages", 0,
+                    "Block all", "Starred contacts only", "Allow all");
+            addView(msgView, lp);
+            BucketView alarmView = new BucketView(android.R.drawable.ic_menu_agenda,
+                    "Alarms & Timers", 1,
+                    "Block all", "Allow all");
+            addView(alarmView, lp);
+            BucketView otherView = new BucketView(android.R.drawable.ic_menu_info_details,
+                    "Other Interruptions", 0,
+                    "Block all", "Block all except...");
+            addView(otherView, lp);
+        }
+
+        private void notImplemented() {
+            if (mToast != null) mToast.cancel();
+            mToast = Toast.makeText(mContext, "Not implemented", Toast.LENGTH_SHORT);
+            mToast.show();
+        }
+
+        private class BucketView extends RelativeLayout {
+            private final BucketSpinner mSpinner;
+
+            public BucketView(int icon, String category, int defaultValue, String... values) {
+                super(ZenModeConfigView.this.mContext);
+
+                setBackgroundColor(0xffffffff);
+                final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
+
+                final ImageView iv = new ImageView(mContext);
+                iv.setId(android.R.id.icon);
+                iv.setImageResource(icon);
+                iv.setAlpha(.5f);
+
+                final int size = mContext.getResources()
+                        .getDimensionPixelSize(R.dimen.app_icon_size);
+                LayoutParams lp = new LayoutParams(size, size);
+                lp.addRule(CENTER_VERTICAL);
+                lp.leftMargin = 16;
+                lp.rightMargin = 16;
+                addView(iv, lp);
+
+                TextView tv = new TextView(mContext);
+                tv.setPadding(4, 0, 0, 0);
+                tv.setId(android.R.id.title);
+                tv.setTextColor(0xff000000);
+                tv.setText(category);
+                tv.setAllCaps(true);
+                lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+                lp.addRule(RIGHT_OF, iv.getId());
+                lp.topMargin = p / 2;
+                addView(tv, lp);
+
+                mSpinner = new BucketSpinner(defaultValue, values);
+                lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+                lp.addRule(RIGHT_OF, iv.getId());
+                lp.addRule(BELOW, tv.getId());
+                addView(mSpinner, lp);
+            }
+        }
+
+        private class BucketSpinner extends Spinner {
+            private final Bitmap mArrow;
+
+            public BucketSpinner(int defaultValue, String... values) {
+                super(ZenModeConfigView.this.mContext);
+                setGravity(Gravity.LEFT);
+                mArrow = BitmapFactory.decodeResource(getResources(),
+                        R.drawable.spinner_default_holo_dark_am_no_underline);
+                setPadding(0, 0, getPaddingRight(), getPaddingBottom());
+                setBackgroundColor(0x00000000);
+                final ArrayAdapter<String> adapter = new ArrayAdapter<String>(mContext, 0) {
+                    @Override
+                    public View getView(int position, View convertView,  ViewGroup parent) {
+                        return getDropDownView(position, convertView, parent);
+                    }
+
+                    @Override
+                    public View getDropDownView(int position, View convertView, ViewGroup parent) {
+                        final TextView tv = convertView != null ? (TextView) convertView
+                                : new TextView(ZenModeConfigView.this.mContext);
+                        tv.setText(getItem(position));
+                        if (convertView == null) {
+                            tv.setTypeface(LIGHT);
+                            tv.setGravity(Gravity.LEFT | Gravity.CENTER_VERTICAL);
+                            tv.setTextColor(0xff000000);
+                            tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
+                            final int p = (int) tv.getTextSize() / 2;
+                            if (parent instanceof ListView) {
+                                final ListView lv = (ListView)parent;
+                                lv.setDividerHeight(0);
+                                tv.setBackgroundColor(BG_COLOR);
+                                tv.setPadding(p, p, p, p);
+                            } else {
+                                tv.setPadding(0, 0, p, 0);
+                            }
+                        }
+                        return tv;
+                    }
+                };
+                adapter.addAll(values);
+                setAdapter(adapter);
+                setSelection(defaultValue, true);
+            }
+
+            @Override
+            protected void onDraw(Canvas canvas) {
+                final TextView tv = (TextView)getSelectedView();
+                final int w = (int)tv.getLayout().getLineWidth(0);
+                final int left = w - mArrow.getWidth() / 4;
+                final int top = getHeight() - mArrow.getHeight();
+                canvas.drawBitmap(mArrow, left, top, null);
+                super.onDraw(canvas);
+            }
+
+            @Override
+            public void setSelection(int position) {
+                if (position != getSelectedItemPosition()) {
+                    notImplemented();
+                }
+            }
+        }
+
+        private class TriggerView extends RelativeLayout {
+            public TriggerView(String text) {
+                super(ZenModeConfigView.this.mContext);
+
+                setBackgroundColor(0xffffffff);
+                final int p = getResources().getDimensionPixelSize(R.dimen.content_margin_left);
+                final int p2 = p / 4;
+                setPadding(p2, p2, p2, p2);
+
+                final CheckBox cb = new CheckBox(mContext);
+                cb.setId(android.R.id.checkbox);
+                cb.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        if (isChecked) {
+                            cb.setChecked(false);
+                            notImplemented();
+                        }
+                    }
+                });
+                LayoutParams lp = new LayoutParams(LayoutParams.WRAP_CONTENT,
+                        LayoutParams.WRAP_CONTENT);
+                lp.addRule(ALIGN_PARENT_RIGHT);
+                addView(cb, lp);
+
+                final TextView tv = new TextView(mContext);
+                tv.setText(text);
+                tv.setTypeface(LIGHT);
+                tv.setTextColor(0xff000000);
+                tv.setTextSize(TypedValue.COMPLEX_UNIT_PX, tv.getTextSize() * 1.5f);
+                final int p3 = p / 2;
+                tv.setPadding(p3, 0, p3, 0);
+                lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+                lp.addRule(LEFT_OF, cb.getId());
+                lp.addRule(CENTER_VERTICAL);
+                addView(tv, lp);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java b/src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
index b9e4ee2..a6b0838 100644
--- a/src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
@@ -26,7 +26,7 @@
  */
 final class BluetoothAdvertisingEnabler {
 
-    private final Context mContext;
+    private Context mContext;
     private final PreferenceScreen mBluetoothAdvertisingPreference;
 
     public BluetoothAdvertisingEnabler(Context context, PreferenceScreen bluetoothBroadcast) {
@@ -34,7 +34,10 @@
         mBluetoothAdvertisingPreference = bluetoothBroadcast;
     }
 
-    public void resume() {
+    public void resume(Context context) {
+        if (mContext != context) {
+            mContext = context;
+        }
         boolean isBroadcastingEnable = LocalBluetoothPreferences.isAdvertisingEnabled(mContext);
         handleAdvertisingStateChange(isBroadcastingEnable);
     }
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index df13eef..1a450d4 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -35,7 +35,7 @@
  * preference reflects the current state.
  */
 public final class BluetoothEnabler implements CompoundButton.OnCheckedChangeListener {
-    private final Context mContext;
+    private Context mContext;
     private Switch mSwitch;
     private boolean mValidListener;
     private final LocalBluetoothAdapter mLocalAdapter;
@@ -67,12 +67,16 @@
         mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
     }
 
-    public void resume() {
+    public void resume(Context context) {
         if (mLocalAdapter == null) {
             mSwitch.setEnabled(false);
             return;
         }
 
+        if (mContext != context) {
+            mContext = context;
+        }
+
         // Bluetooth state is not sticky, so set it manually
         handleStateChanged(mLocalAdapter.getBluetoothState());
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 9b2a3e8..d6f27ef 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -207,8 +207,8 @@
                 return null;
         }
 
-        // Format the message string, then parse HTML style tags
-        String messageText = getString(messageId1, deviceName);
+        // HTML escape deviceName, Format the message string, then parse HTML style tags
+        String messageText = getString(messageId1, Html.escapeHtml(deviceName));
         messageView.setText(Html.fromHtml(messageText));
         messageView2.setText(messageId2);
         mPairingView.setInputType(InputType.TYPE_CLASS_NUMBER);
@@ -220,7 +220,8 @@
 
     private View createView(CachedBluetoothDeviceManager deviceManager) {
         View view = getLayoutInflater().inflate(R.layout.bluetooth_pin_confirm, null);
-        String name = deviceManager.getName(mDevice);
+	// Escape device name to avoid HTML injection.
+        String name = Html.escapeHtml(deviceManager.getName(mDevice));
         TextView messageView = (TextView) view.findViewById(R.id.message);
 
         String messageText; // formatted string containing HTML style tags
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 68cf37a..c6b560f 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -151,7 +151,7 @@
         // resume BluetoothEnabler before calling super.onResume() so we don't get
         // any onDeviceAdded() callbacks before setting up view in updateContent()
         if (mBluetoothEnabler != null) {
-            mBluetoothEnabler.resume();
+            mBluetoothEnabler.resume(getActivity());
         }
         super.onResume();
 
diff --git a/src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java b/src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
index ed27697..47b1476 100644
--- a/src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.bluetooth;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
@@ -80,9 +81,10 @@
     @Override
     public void onResume() {
         super.onResume();
-        mManager.setForegroundActivity(getActivity());
-        mAdvertisingEnabler.resume();
-        mDiscoverableEnabler.resume(getActivity());
+        final Activity activity = getActivity();
+        mManager.setForegroundActivity(activity);
+        mAdvertisingEnabler.resume(activity);
+        mDiscoverableEnabler.resume(activity);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index a1e7278..518fc0e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -116,6 +116,7 @@
                     R.string.usage_type_wifi_running,
                     R.string.usage_type_data_recv,
                     R.string.usage_type_data_send,
+                    R.string.usage_type_radio_active,
                     R.string.usage_type_data_wifi_recv,
                     R.string.usage_type_data_wifi_send,
                     R.string.usage_type_audio,
@@ -129,6 +130,7 @@
                     entry.sipper.wifiRunningTime,
                     entry.sipper.mobileRxPackets,
                     entry.sipper.mobileTxPackets,
+                    entry.sipper.mobileActive,
                     entry.sipper.wifiRxPackets,
                     entry.sipper.wifiTxPackets,
                     0,
@@ -157,11 +159,13 @@
             {
                 types = new int[] {
                     R.string.usage_type_on_time,
-                    R.string.usage_type_no_coverage
+                    R.string.usage_type_no_coverage,
+                    R.string.usage_type_radio_active,
                 };
                 values = new double[] {
                     entry.sipper.usageTime,
-                    entry.sipper.noCoveragePercent
+                    entry.sipper.noCoveragePercent,
+                    entry.sipper.mobileActive
                 };
             }
             break;