Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

119 files changed, 1593 insertions, 271 deletions

diff --git a/packages/Keyguard/res/values-ca/cm_strings.xml b/packages/Keyguard/res/values-ca/cm_strings.xml
index 9e37642..1234e26 100644
--- a/packages/Keyguard/res/values-ca/cm_strings.xml
+++ b/packages/Keyguard/res/values-ca/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intent restant abans que hagis de contactar amb el teu operador per desbloquejar el teu dispositiu.</item>
     <item quantity="other">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intents restants.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Error: L\'entrada és més curta que la longitud mínima</string>
 </resources>
diff --git a/packages/Keyguard/res/values-cs/cm_strings.xml b/packages/Keyguard/res/values-cs/cm_strings.xml
index bb5046f..20fae9d 100644
--- a/packages/Keyguard/res/values-cs/cm_strings.xml
+++ b/packages/Keyguard/res/values-cs/cm_strings.xml
@@ -16,5 +16,12 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="keyguard_perso_locked_message">SIM/RUIM je zamčená pomocí Perso</string>
   <string name="lockscreen_sim_error_message_short">Neplatná SIM karta.</string>
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokus než budete muset kontaktovat operátora pro odemčení zařízení.</item>
+    <item quantity="few">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokusy.</item>
+    <item quantity="other">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývajících pokusů.</item>
+  </plurals>
+  <string name="kg_invalid_sim_length">Chyba: vstup je kratší než minimální délka</string>
 </resources>
diff --git a/packages/Keyguard/res/values-de/cm_strings.xml b/packages/Keyguard/res/values-de/cm_strings.xml
index 87acef9..e8b0434 100644
--- a/packages/Keyguard/res/values-de/cm_strings.xml
+++ b/packages/Keyguard/res/values-de/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuch übrig, bevor Sie den Netzbetreiber zum Entsperren des Gerätes kontaktieren müssen.</item>
     <item quantity="other">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuche übrig, bevor Sie den Netzbetreiber zum Entsperren des Gerätes kontaktieren müssen.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Fehler: Eingabe ist kürzer als die Mindestlänge</string>
 </resources>
diff --git a/packages/Keyguard/res/values-el/cm_strings.xml b/packages/Keyguard/res/values-el/cm_strings.xml
index ef5e71f..6ea7b00 100644
--- a/packages/Keyguard/res/values-el/cm_strings.xml
+++ b/packages/Keyguard/res/values-el/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες πριν χρειαστεί να επικοινωνήσετε με τον πάροχό σας για να ξεκλειδώσετε τη συσκευή σας.</item>
     <item quantity="other">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Σφάλμα: Το μήκος εισόδου είναι μικρότερο από το ελάχιστο μήκος</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rIN/cm_strings.xml b/packages/Keyguard/res/values-en-rIN/cm_strings.xml
index c6a7b7d..f737d9e 100644
--- a/packages/Keyguard/res/values-en-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rIN/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
     <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
 </resources>
diff --git a/packages/Keyguard/res/values-eu-rES/cm_strings.xml b/packages/Keyguard/res/values-eu-rES/cm_strings.xml
index ad94255..41081c9 100644
--- a/packages/Keyguard/res/values-eu-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-eu-rES/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Sartu SIM txartelaren PIN kodea, saiakera  <xliff:g id="number">%d</xliff:g> geratzen zaizu gailua desblokeatzeko zure operadorearekin kontaktuan jarri behar aurretik.</item>
     <item quantity="other">Sartu SIM txartelaren PIN kodea, <xliff:g id="number">%d</xliff:g> saiakera geratzen zaizkizu.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Errorea: Sarrera gutxieneko luzera baino laburragoa da</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fr/cm_strings.xml b/packages/Keyguard/res/values-fr/cm_strings.xml
index d687ab6..4d3398e 100644
--- a/packages/Keyguard/res/values-fr/cm_strings.xml
+++ b/packages/Keyguard/res/values-fr/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentative avant d\'avoir à contacter votre opérateur pour déverrouiller votre appareil.</item>
     <item quantity="other">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentatives.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Erreur : code entré trop court</string>
 </resources>
diff --git a/packages/Keyguard/res/values-gl-rES/cm_strings.xml b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
index b0421e9..1e46e59 100644
--- a/packages/Keyguard/res/values-gl-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
@@ -16,5 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="keyguard_perso_locked_message">A SIM/RUIM personalizada está bloqueada</string>
   <string name="lockscreen_sim_error_message_short">Esta tarxeta non é válida.</string>
+  <string name="kg_invalid_sim_length">Erro: O dato introducido é máis curto có mínimo esixido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hr/cm_strings.xml b/packages/Keyguard/res/values-hr/cm_strings.xml
index c680bfb..b96db36 100644
--- a/packages/Keyguard/res/values-hr/cm_strings.xml
+++ b/packages/Keyguard/res/values-hr/cm_strings.xml
@@ -18,4 +18,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="keyguard_perso_locked_message">SIM kartica je Perso zaključana</string>
   <string name="lockscreen_sim_error_message_short">Nevažeća kartica.</string>
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Upišite SIM PIN, preostao vam je <xliff:g id="number">%d</xliff:g> pokušaj nakon čega ćete morati kontaktirati svog pružatelja usluga da otključa vaš uređaj.</item>
+    <item quantity="few">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
+    <item quantity="other">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
+  </plurals>
+  <string name="kg_invalid_sim_length">Pogreška: Ulaz je kraći od minimalne potrebne duljine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hu/cm_strings.xml b/packages/Keyguard/res/values-hu/cm_strings.xml
index e4c03f6..b985e02 100644
--- a/packages/Keyguard/res/values-hu/cm_strings.xml
+++ b/packages/Keyguard/res/values-hu/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt mielőtt fel kell vennie a kapcsolatot a mobilszolgáltatójával a készülék feloldásához.</item>
     <item quantity="other">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Hiba: A bemeneti adat rövidebb, mint a minimális hossz</string>
 </resources>
diff --git a/packages/Keyguard/res/values-it/cm_strings.xml b/packages/Keyguard/res/values-it/cm_strings.xml
index 10eba67..1c48611 100644
--- a/packages/Keyguard/res/values-it/cm_strings.xml
+++ b/packages/Keyguard/res/values-it/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativo rimanente prima di dover contattare l\'operatore per sbloccare il dispositivo.</item>
     <item quantity="other">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativi rimanenti.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Errore: input non sufficientemente lungo</string>
 </resources>
diff --git a/packages/Keyguard/res/values-iw/cm_strings.xml b/packages/Keyguard/res/values-iw/cm_strings.xml
index f6e35a1..0cd676b 100644
--- a/packages/Keyguard/res/values-iw/cm_strings.xml
+++ b/packages/Keyguard/res/values-iw/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">הזן את קוד ה-PIN של כרטיס ה-SIM, נותר לך ניסיון <xliff:g id="number">%d</xliff:g> לפני שתיאלץ לפנות לספק הסלולרי שלך על מנת לבטל את נעילת המכשיר.</item>
     <item quantity="other">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">שגיאה: הקלט קצר יותר מהאורך המינימלי</string>
 </resources>
diff --git a/packages/Keyguard/res/values-pl/cm_strings.xml b/packages/Keyguard/res/values-pl/cm_strings.xml
index ad6603e..1a2563c 100644
--- a/packages/Keyguard/res/values-pl/cm_strings.xml
+++ b/packages/Keyguard/res/values-pl/cm_strings.xml
@@ -23,4 +23,5 @@
     <item quantity="few">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałe próby.</item>
     <item quantity="other">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałych prób.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Błąd: Podany kod jest za krótki</string>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml b/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
index c490c87..5ebd5be 100644
--- a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativa restante antes de precisar contatar sua operadora para desbloquear seu aparelho.</item>
     <item quantity="other">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativas restantes.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Erro: Entrada mais curta do que o comprimento mínimo</string>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml b/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
index 7493317..bfa6b3a 100644
--- a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
@@ -22,4 +22,5 @@
     <item quantity="one">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativa antes de ter de contactar a sua operadora para desbloquear o dispositivo.</item>
     <item quantity="other">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativas.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Erro: o tamanho é menor que o requerido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ru/cm_strings.xml b/packages/Keyguard/res/values-ru/cm_strings.xml
index 8532697..4d64761 100644
--- a/packages/Keyguard/res/values-ru/cm_strings.xml
+++ b/packages/Keyguard/res/values-ru/cm_strings.xml
@@ -23,4 +23,5 @@
     <item quantity="few">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попытки.</item>
     <item quantity="other">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попыток.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Ошибка: введено меньше минимальной длины</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sl/cm_strings.xml b/packages/Keyguard/res/values-sl/cm_strings.xml
index b3d5c41..84c794e 100644
--- a/packages/Keyguard/res/values-sl/cm_strings.xml
+++ b/packages/Keyguard/res/values-sl/cm_strings.xml
@@ -24,4 +24,5 @@
     <item quantity="few">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostale poskuse.</item>
     <item quantity="other">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostalih poskusov.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Napaka: Vnos je krajši od minimalne zahtevane dolžine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sr/cm_strings.xml b/packages/Keyguard/res/values-sr/cm_strings.xml
index 3b6750c..33dc37f 100644
--- a/packages/Keyguard/res/values-sr/cm_strings.xml
+++ b/packages/Keyguard/res/values-sr/cm_strings.xml
@@ -23,4 +23,5 @@
     <item quantity="few">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
     <item quantity="other">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
   </plurals>
+  <string name="kg_invalid_sim_length">Грешка: Унос је краћи од минималне дужине</string>
 </resources>
diff --git a/packages/Keyguard/res/values-uk/cm_strings.xml b/packages/Keyguard/res/values-uk/cm_strings.xml
index 314fd26..5c1883b 100644
--- a/packages/Keyguard/res/values-uk/cm_strings.xml
+++ b/packages/Keyguard/res/values-uk/cm_strings.xml
@@ -16,5 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="keyguard_perso_locked_message">SIM-карта заблокована оператором</string>
   <string name="lockscreen_sim_error_message_short">Невірна картка.</string>
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроба перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
+    <item quantity="few">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроби перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
+    <item quantity="other">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроб перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
+  </plurals>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
index 80240bf..56f8e18 100644
--- a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
@@ -21,4 +21,5 @@
   <plurals name="kg_password_default_pin_message">
     <item quantity="other">输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会；若超出此次数，则必须联系运营商以解锁 SIM 卡。</item>
   </plurals>
+  <string name="kg_invalid_sim_length">错误：输入长度小于最小长度</string>
 </resources>
diff --git a/packages/SettingsLib/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png b/packages/SettingsLib/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png
index 2d9b75e..eebbe00 100644
--- a/packages/SettingsLib/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png
+++ b/packages/SettingsLib/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png
diff --git a/packages/SettingsLib/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png b/packages/SettingsLib/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png
index b6ebe34..92d7e51 100644
--- a/packages/SettingsLib/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png
+++ b/packages/SettingsLib/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png
diff --git a/packages/SettingsLib/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png b/packages/SettingsLib/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png
index 8b67b91..95f90bac 100644
--- a/packages/SettingsLib/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png
+++ b/packages/SettingsLib/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png
diff --git a/packages/SettingsLib/res/values-ca/cm_strings.xml b/packages/SettingsLib/res/values-ca/cm_strings.xml
new file mode 100644
index 0000000..50933db
--- /dev/null
+++ b/packages/SettingsLib/res/values-ca/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicacions</string>
+  <string name="picker_activities">Activitats</string>
+  <string name="select_custom_app_title">Selecciona una aplicació personalitzada</string>
+  <string name="select_custom_activity_title">Selecciona una activitat personalitzada</string>
+  <string name="lockscreen_targets_message">Dreceres de la pantalla de bloqueig</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-cs/cm_strings.xml b/packages/SettingsLib/res/values-cs/cm_strings.xml
new file mode 100644
index 0000000..faccd6f
--- /dev/null
+++ b/packages/SettingsLib/res/values-cs/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikace</string>
+  <string name="picker_activities">Aktivity</string>
+  <string name="select_custom_app_title">Zvolte vlastní aplikaci</string>
+  <string name="select_custom_activity_title">Zvolte vlastní aktivitu</string>
+  <string name="lockscreen_targets_message">Ikony zámku obrazovky</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rIN/cm_strings.xml b/packages/SettingsLib/res/values-en-rIN/cm_strings.xml
new file mode 100644
index 0000000..b311b85
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Apps</string>
+  <string name="picker_activities">Activities</string>
+  <string name="select_custom_app_title">Select custom app</string>
+  <string name="select_custom_activity_title">Select custom activity</string>
+  <string name="lockscreen_targets_message">Lock screen shortcuts</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-eu-rES/cm_strings.xml b/packages/SettingsLib/res/values-eu-rES/cm_strings.xml
new file mode 100644
index 0000000..6f1cec3
--- /dev/null
+++ b/packages/SettingsLib/res/values-eu-rES/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikazioak</string>
+  <string name="picker_activities">Aktibitateak</string>
+  <string name="select_custom_app_title">Hautatu aplikazio pertsonalizatua</string>
+  <string name="select_custom_activity_title">Hautatu aktibitate pertsonalizatua</string>
+  <string name="lockscreen_targets_message">Blokeo-pantailako lasterbideak</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-fi/cm_strings.xml b/packages/SettingsLib/res/values-fi/cm_strings.xml
new file mode 100644
index 0000000..fb10ac5
--- /dev/null
+++ b/packages/SettingsLib/res/values-fi/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Sovellukset</string>
+  <string name="picker_activities">Aktiviteetit</string>
+  <string name="select_custom_app_title">Valitse oma sovellus</string>
+  <string name="select_custom_activity_title">Valitse oma aktiviteetti</string>
+  <string name="lockscreen_targets_message">Lukitusnäytön pikakuvakkeet</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-gl-rES/cm_strings.xml b/packages/SettingsLib/res/values-gl-rES/cm_strings.xml
new file mode 100644
index 0000000..a98f4e9
--- /dev/null
+++ b/packages/SettingsLib/res/values-gl-rES/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicacións</string>
+  <string name="picker_activities">Actividades</string>
+  <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Seleccionar actividade personalizada</string>
+  <string name="lockscreen_targets_message">Atallos da pantalla de bloqueo</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-hr/cm_strings.xml b/packages/SettingsLib/res/values-hr/cm_strings.xml
new file mode 100644
index 0000000..dbf9958
--- /dev/null
+++ b/packages/SettingsLib/res/values-hr/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikacije</string>
+  <string name="picker_activities">Aktivnosti</string>
+  <string name="select_custom_app_title">Odaberite aplikaciju</string>
+  <string name="select_custom_activity_title">Odaberite prilagođenu aktivnost</string>
+  <string name="lockscreen_targets_message">Prečaci zaključanog zaslona</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-hu/cm_strings.xml b/packages/SettingsLib/res/values-hu/cm_strings.xml
new file mode 100644
index 0000000..b2e364f
--- /dev/null
+++ b/packages/SettingsLib/res/values-hu/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Alkalmazások</string>
+  <string name="picker_activities">Tevékenységek</string>
+  <string name="select_custom_app_title">Válassz egyedi alkalmazást</string>
+  <string name="select_custom_activity_title">Válassz egyedi tevékenységet</string>
+  <string name="lockscreen_targets_message">Zárképernyő hivatkozások</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-iw/cm_strings.xml b/packages/SettingsLib/res/values-iw/cm_strings.xml
new file mode 100644
index 0000000..36ca0d2
--- /dev/null
+++ b/packages/SettingsLib/res/values-iw/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">יישומים</string>
+  <string name="picker_activities">פעילויות</string>
+  <string name="select_custom_app_title">בחר יישום מותאם אישית</string>
+  <string name="select_custom_activity_title">בחר פעילות מותאמת אישית</string>
+  <string name="lockscreen_targets_message">קיצורי דרך במסך הנעילה</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ja/cm_strings.xml b/packages/SettingsLib/res/values-ja/cm_strings.xml
new file mode 100644
index 0000000..7a75cb0
--- /dev/null
+++ b/packages/SettingsLib/res/values-ja/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">アプリ</string>
+  <string name="picker_activities">アクティビティ</string>
+  <string name="select_custom_app_title">カスタムのアプリを選択</string>
+  <string name="select_custom_activity_title">カスタムのアクティビティを選択</string>
+  <string name="lockscreen_targets_message">ロック画面のショートカット</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-lb/cm_strings.xml b/packages/SettingsLib/res/values-lb/cm_strings.xml
new file mode 100644
index 0000000..84a7011
--- /dev/null
+++ b/packages/SettingsLib/res/values-lb/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Appen</string>
+  <string name="picker_activities">Aktivitéiten</string>
+  <string name="select_custom_app_title">Eegen App auswielen</string>
+  <string name="select_custom_activity_title">Eegen Aktivitéit auswielen</string>
+  <string name="lockscreen_targets_message">Spärschierm-Ofkierzungen</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-nb/cm_strings.xml b/packages/SettingsLib/res/values-nb/cm_strings.xml
new file mode 100644
index 0000000..e55d4a1
--- /dev/null
+++ b/packages/SettingsLib/res/values-nb/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Apps</string>
+  <string name="picker_activities">Aktiviteter</string>
+  <string name="select_custom_app_title">Velg egendefinert app</string>
+  <string name="select_custom_activity_title">Velg egendefinert aktivitet</string>
+  <string name="lockscreen_targets_message">Låseskjermsnarveier</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-nl/cm_strings.xml b/packages/SettingsLib/res/values-nl/cm_strings.xml
new file mode 100644
index 0000000..7dec7e0
--- /dev/null
+++ b/packages/SettingsLib/res/values-nl/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Apps</string>
+  <string name="picker_activities">Activiteiten</string>
+  <string name="select_custom_app_title">Aangepaste app kiezen</string>
+  <string name="select_custom_activity_title">Aangepaste activiteit kiezen</string>
+  <string name="lockscreen_targets_message">Snelkoppelingen vergrendelingsscherm</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-pl/cm_strings.xml b/packages/SettingsLib/res/values-pl/cm_strings.xml
new file mode 100644
index 0000000..ba5c4f9
--- /dev/null
+++ b/packages/SettingsLib/res/values-pl/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikacje</string>
+  <string name="picker_activities">Aktywności</string>
+  <string name="select_custom_app_title">Wskaż aplikację</string>
+  <string name="select_custom_activity_title">Wskaż aktywność</string>
+  <string name="lockscreen_targets_message">Skróty ekranu blokady</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt-rBR/cm_strings.xml b/packages/SettingsLib/res/values-pt-rBR/cm_strings.xml
new file mode 100644
index 0000000..29ecbff
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt-rBR/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Apps</string>
+  <string name="picker_activities">Atividades</string>
+  <string name="select_custom_app_title">Selecione o app personalizado</string>
+  <string name="select_custom_activity_title">Selecione a atividade personalizada</string>
+  <string name="lockscreen_targets_message">Atalhos da tela de bloqueio</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt-rPT/cm_strings.xml b/packages/SettingsLib/res/values-pt-rPT/cm_strings.xml
new file mode 100644
index 0000000..84f31d2
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt-rPT/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicações</string>
+  <string name="picker_activities">Atividades</string>
+  <string name="select_custom_app_title">Selecione uma aplicação personalizada</string>
+  <string name="select_custom_activity_title">Selecione uma atividade personalizada</string>
+  <string name="lockscreen_targets_message">Atalhos do ecrã de bloqueio</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ro/cm_strings.xml b/packages/SettingsLib/res/values-ro/cm_strings.xml
new file mode 100644
index 0000000..26f8836
--- /dev/null
+++ b/packages/SettingsLib/res/values-ro/cm_strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicații</string>
+  <string name="picker_activities">Activități</string>
+  <string name="select_custom_app_title">Selectați aplicație personalizată</string>
+  <string name="select_custom_activity_title">Selectați activitate personalizată</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ru/cm_strings.xml b/packages/SettingsLib/res/values-ru/cm_strings.xml
new file mode 100644
index 0000000..b3a4c86
--- /dev/null
+++ b/packages/SettingsLib/res/values-ru/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Приложения</string>
+  <string name="picker_activities">Действия</string>
+  <string name="select_custom_app_title">Выбор приложения</string>
+  <string name="select_custom_activity_title">Выбор действия</string>
+  <string name="lockscreen_targets_message">Ярлыки экрана блокировки</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sl/cm_strings.xml b/packages/SettingsLib/res/values-sl/cm_strings.xml
new file mode 100644
index 0000000..4a66c17
--- /dev/null
+++ b/packages/SettingsLib/res/values-sl/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikacije</string>
+  <string name="picker_activities">Dejavnosti</string>
+  <string name="select_custom_app_title">Izberite aplikacijo po meri</string>
+  <string name="select_custom_activity_title">Izberite dejavnost po meri</string>
+  <string name="lockscreen_targets_message">Bližnjice zaslona za zaklepanje</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sr/cm_strings.xml b/packages/SettingsLib/res/values-sr/cm_strings.xml
new file mode 100644
index 0000000..8078426
--- /dev/null
+++ b/packages/SettingsLib/res/values-sr/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Апликације</string>
+  <string name="picker_activities">Активности</string>
+  <string name="select_custom_app_title">Изабери прилагођену апликацију</string>
+  <string name="select_custom_activity_title">Изабери прилагођену активност</string>
+  <string name="lockscreen_targets_message">Пречица закључаног екрана</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-uk/cm_strings.xml b/packages/SettingsLib/res/values-uk/cm_strings.xml
new file mode 100644
index 0000000..00f95a7
--- /dev/null
+++ b/packages/SettingsLib/res/values-uk/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Додатки</string>
+  <string name="picker_activities">Дії</string>
+  <string name="select_custom_app_title">Вибрати власну програму</string>
+  <string name="select_custom_activity_title">Вибрати власну дію</string>
+  <string name="lockscreen_targets_message">Ярлики екрану блокування</string>
+</resources>
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index fca6318..f8bcc27 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -124,6 +124,8 @@ public class AccessPoint implements Comparable<AccessPoint> {
 
     private Object mTag;
 
+    public boolean foundInScanResult = false;
+
     public AccessPoint(Context context, Bundle savedState) {
         mContext = context;
         mConfig = savedState.getParcelable(KEY_CONFIG);
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index 4f51137..ed0371c 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -319,7 +319,8 @@ public class WifiTracker {
                 if (config.selfAdded && config.numAssociation == 0) {
                     continue;
                 }
-                AccessPoint accessPoint = new AccessPoint(mContext, config);
+                AccessPoint accessPoint = getCachedOrCreate(config, cachedAccessPoints);
+                accessPoint.foundInScanResult = false;
                 if (mLastInfo != null && mLastNetworkInfo != null) {
                     if (config.isPasspoint() == false) {
                         accessPoint.update(connectionConfig, mLastInfo, mLastNetworkInfo);
@@ -352,6 +353,7 @@ public class WifiTracker {
                 boolean found = false;
                 for (AccessPoint accessPoint : apMap.getAll(result.SSID)) {
                     if (accessPoint.update(result)) {
+                        accessPoint.foundInScanResult = true;
                         found = true;
                         break;
                     }
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index afcd05e..210a096 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -185,6 +185,9 @@
          >0 is milliseconds of screen-off time after which battery sounds will not play -->
     <integer name="def_low_battery_sound_timeout">0</integer>
 
+    <!-- Default for Settings.System.VIBRATE_WHEN_RINGING enabled -->
+    <bool name="def_vibrate_when_ringing_enabled">false</bool>
+
     <!-- Initial value for the Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS setting,
          which is a comma separated list of packages that no longer need confirmation
          for immersive mode.
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index c70c8e3..fe7c986 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2515,7 +2515,11 @@ class DatabaseHelper extends SQLiteOpenHelper {
         try {
             stmt = db.compileStatement("INSERT OR IGNORE INTO system(name,value)"
                     + " VALUES(?,?);");
-            loadSetting(stmt, Settings.System.VIBRATE_WHEN_RINGING, vibrateWhenRinging ? 1 : 0);
+            if (mContext.getResources().getBoolean(R.bool.def_vibrate_when_ringing_enabled)) {
+                loadSetting(stmt, Settings.System.VIBRATE_WHEN_RINGING, 1);
+            } else {
+                loadSetting(stmt, Settings.System.VIBRATE_WHEN_RINGING, vibrateWhenRinging ? 1 : 0);
+            }
         } finally {
             if (stmt != null) stmt.close();
         }
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index c361c70..f55cead 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -27,6 +27,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -51,6 +52,7 @@ import android.os.Process;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArrayMap;
@@ -127,6 +129,8 @@ public class SettingsProvider extends ContentProvider {
     private static final String TABLE_BOOKMARKS = "bookmarks";
     private static final String TABLE_ANDROID_METADATA = "android_metadata";
 
+    private static final String HAS_REPLAYED_DEFAULTS_FROM_L = "has_replayed_defaults_from_L";
+
     // The set of removed legacy tables.
     private static final Set<String> REMOVED_LEGACY_TABLES = new ArraySet<>();
     static {
@@ -1983,6 +1987,9 @@ public class SettingsProvider extends ContentProvider {
 
         private final class UpgradeController {
             private static final int SETTINGS_VERSION = 122;
+            /**
+             * This is the 12.1 database version (DO NOT INCREMENT)
+             */
             private static final int CM_SETTINGS_DB_VERSION = 125;
 
             private final int mUserId;
@@ -2014,8 +2021,9 @@ public class SettingsProvider extends ContentProvider {
                 //       force replay AOSP defaults as they get introduced
                 //       once 125 is hit, we never have to maintain this again.
                 if ((oldVersion == newVersion || oldVersion == CM_SETTINGS_DB_VERSION)) {
-                    if (oldVersion == CM_SETTINGS_DB_VERSION) {
+                    if (oldVersion == CM_SETTINGS_DB_VERSION && !hasReplayedDefaultsFromL()) {
                         forceReplayAOSPDefaults(mUserId);
+                        setDefaultsReplayedFromLFlag();
                     }
                     return;
                 }
@@ -2056,6 +2064,18 @@ public class SettingsProvider extends ContentProvider {
                 systemSettings.setVersionLocked(newVersion);
             }
 
+            private boolean hasReplayedDefaultsFromL() {
+                SharedPreferences sharedPreferences = PreferenceManager
+                        .getDefaultSharedPreferences(getContext());
+                return sharedPreferences.getBoolean(HAS_REPLAYED_DEFAULTS_FROM_L, false);
+            }
+
+            private void setDefaultsReplayedFromLFlag() {
+                SharedPreferences sharedPreferences = PreferenceManager
+                        .getDefaultSharedPreferences(getContext());
+                sharedPreferences.edit().putBoolean(HAS_REPLAYED_DEFAULTS_FROM_L, true).apply();
+            }
+
             private SettingsState getGlobalSettingsLocked() {
                 return getSettingsLocked(SETTINGS_TYPE_GLOBAL, UserHandle.USER_OWNER);
             }
diff --git a/packages/SystemUI/res/layout/navigation_bar.xml b/packages/SystemUI/res/layout/navigation_bar.xml
index 6a28ef6..f8f59da 100644
--- a/packages/SystemUI/res/layout/navigation_bar.xml
+++ b/packages/SystemUI/res/layout/navigation_bar.xml
@@ -59,7 +59,6 @@
             <ImageView
                 android:layout_width="@dimen/navigation_key_width"
                 android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/navigation_side_padding"
                 android:src="@drawable/ic_sysbar_lights_out_dot_large"
                 android:scaleType="center"
                 />
@@ -83,19 +82,6 @@
                 />
             <ImageView
                 android:layout_width="@dimen/navigation_key_width"
-                android:layout_marginEnd="@dimen/navigation_side_padding"
-                android:layout_height="match_parent"
-                android:src="@drawable/ic_sysbar_lights_out_dot_large"
-                android:scaleType="center"
-                />
-            <View
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:visibility="invisible"
-                android:layout_weight="1"
-                />
-            <ImageView
-                android:layout_width="80dp"
                 android:layout_height="match_parent"
                 android:src="@drawable/ic_sysbar_lights_out_dot_large"
                 android:scaleType="center"
@@ -151,7 +137,6 @@
             >
             <ImageView
                 android:layout_height="@dimen/navigation_key_width"
-                android:layout_marginTop="@dimen/navigation_side_padding"
                 android:layout_width="match_parent"
                 android:src="@drawable/ic_sysbar_lights_out_dot_large"
                 android:scaleType="center"
@@ -176,19 +161,6 @@
                 />
             <ImageView
                 android:layout_height="@dimen/navigation_key_width"
-                android:layout_marginBottom="@dimen/navigation_side_padding"
-                android:layout_width="match_parent"
-                android:src="@drawable/ic_sysbar_lights_out_dot_large"
-                android:scaleType="center"
-                />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:visibility="invisible"
-                android:layout_weight="1"
-                />
-            <ImageView
-                android:layout_height="80dp"
                 android:layout_width="match_parent"
                 android:src="@drawable/ic_sysbar_lights_out_dot_large"
                 android:scaleType="center"
diff --git a/packages/SystemUI/res/layout/qs_settings.xml b/packages/SystemUI/res/layout/qs_settings.xml
index dcf04a4..b7c8d60 100644
--- a/packages/SystemUI/res/layout/qs_settings.xml
+++ b/packages/SystemUI/res/layout/qs_settings.xml
@@ -18,67 +18,79 @@
         xmlns:systemui="http://schemas.android.com/apk/res-auto"
         android:id="@+id/quick_settings_settings_recursion_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
-    <TextView
+    <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:gravity="center_vertical"
-            android:textColor="@color/qs_title_text_color"
-            android:text="@string/quick_settings_title_header"/>
-
-    <!-- show weather -->
-    <com.android.systemui.qs.QSBooleanSettingRow
-            style="@style/SettingRow"
-            android:key="status_bar_show_weather"
-            android:title="@string/quick_settings_title_show_weather"
-            systemui:defaultValue="1"
-            systemui:table="cm_system"
-    />
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-    <TextView
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:gravity="center_vertical"
-            android:textColor="@color/qs_title_text_color"
-            android:text="@string/quick_settings_title_tiles"/>
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:gravity="center_vertical"
+                android:textColor="@color/qs_title_text_color"
+                android:text="@string/quick_settings_title_header"/>
 
-    <!-- first row large -->
-    <com.android.systemui.qs.QSBooleanSettingRow
-            style="@style/SettingRow"
-            android:title="@string/quick_settings_title_enlarge_first_row"
-            android:key="sysui_qs_main_tiles"
-            systemui:defaultValue="1"
-            systemui:table="cm_secure" />
+        <!-- show weather -->
+        <com.android.systemui.qs.QSBooleanSettingRow
+                style="@style/SettingRow"
+                android:key="status_bar_show_weather"
+                android:title="@string/quick_settings_title_show_weather"
+                systemui:defaultValue="1"
+                systemui:table="cm_system"/>
 
-    <com.android.systemui.qs.QSBooleanSettingRow
-            style="@style/SettingRow"
-            android:title="@string/quick_settings_title_advanced_location"
-            android:key="qs_location_advanced"
-            systemui:defaultValue="0"
-            systemui:table="cm_secure" />
+        <!-- brightness slider -->
+        <com.android.systemui.qs.QSBooleanSettingRow
+                style="@style/SettingRow"
+                android:key="qs_show_brightness_slider"
+                android:title="@string/quick_settings_title_show_brightness_slider"
+                systemui:defaultValue="1"
+                systemui:table="cm_system"/>
 
-    <LinearLayout
-            android:id="@+id/reset_tiles"
-            style="@style/SettingRow">
         <TextView
-                android:layout_width="0dp"
-                android:layout_height="24dp"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:id="@+id/title"
-                android:textColor="@color/qs_tile_reset_to_default_text_color"
-                android:text="@string/quick_settings_tile_reset_to_default"
-                android:contentDescription="@null"/>
+                android:textColor="@color/qs_title_text_color"
+                android:text="@string/quick_settings_title_tiles"/>
 
-    </LinearLayout>
+        <!-- first row large -->
+        <com.android.systemui.qs.QSBooleanSettingRow
+                style="@style/SettingRow"
+                android:title="@string/quick_settings_title_enlarge_first_row"
+                android:key="sysui_qs_main_tiles"
+                systemui:defaultValue="1"
+                systemui:table="cm_secure"/>
+
+        <com.android.systemui.qs.QSBooleanSettingRow
+                style="@style/SettingRow"
+                android:title="@string/quick_settings_title_advanced_location"
+                android:key="qs_location_advanced"
+                systemui:defaultValue="0"
+                systemui:table="cm_secure"/>
+
+        <LinearLayout
+                android:id="@+id/reset_tiles"
+                style="@style/SettingRow">
+            <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="24dp"
+                    android:gravity="center_vertical"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:id="@+id/title"
+                    android:textColor="@color/qs_tile_reset_to_default_text_color"
+                    android:text="@string/quick_settings_tile_reset_to_default"
+                    android:contentDescription="@null"/>
 
+        </LinearLayout>
+
+    </LinearLayout>
 </com.android.systemui.qs.QSSettings>
 
diff --git a/packages/SystemUI/res/layout/qs_tile_top.xml b/packages/SystemUI/res/layout/qs_tile_top.xml
index 4413ec3..a302c73 100644
--- a/packages/SystemUI/res/layout/qs_tile_top.xml
+++ b/packages/SystemUI/res/layout/qs_tile_top.xml
@@ -29,7 +29,7 @@
     <LinearLayout
             android:id="@+id/delete_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:orientation="horizontal">
@@ -48,7 +48,7 @@
     <LinearLayout
             android:id="@+id/edit_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:orientation="horizontal">
@@ -73,7 +73,7 @@
 
     <TextView
             android:id="@+id/qs_toast"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:gravity="center_vertical"
diff --git a/packages/SystemUI/res/values-af/cm_strings.xml b/packages/SystemUI/res/values-af/cm_strings.xml
index abfe144..f1202fc 100644
--- a/packages/SystemUI/res/values-af/cm_strings.xml
+++ b/packages/SystemUI/res/values-af/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Stelsel profiele</string>
   <string name="quick_settings_profiles_off">Profiele is afgeskakel</string>
+  <string name="quick_settings_heads_up_label">Loer boodskap</string>
+  <string name="quick_settings_battery_saver_label">Battery bespaarder</string>
   <string name="accessibility_quick_settings_sync_off">Sinchronisering af.</string>
   <string name="accessibility_quick_settings_sync_on">Sinchronisering aan.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sinchronisering afgeskakel.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Omgewingstemperatuur vertoning aan.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Omgewingstemperatuur skerm vertoning is afgeskakel.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Omgewingstemperatuur skerm vertoning is aangeskakel.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Loer boodskap af.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Loer boodskap aan.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Loer boodskap is afgeskakel.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Loer boodskap is aangeskakel.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Battery bespaarder af.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Battery bespaarder aan.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Battery bespaarder afgeskakel.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Battery bespaarder aangeskakel.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dinamiese teëls</string>
   <string name="dynamic_qs_tile_next_alarm_label">Volgende alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Kies IME</string>
diff --git a/packages/SystemUI/res/values-ar/cm_strings.xml b/packages/SystemUI/res/values-ar/cm_strings.xml
index 530e651..a59d14a 100644
--- a/packages/SystemUI/res/values-ar/cm_strings.xml
+++ b/packages/SystemUI/res/values-ar/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">ملفات تعريف النظام</string>
   <string name="quick_settings_profiles_off">تعطيل ملفات التعريف</string>
+  <string name="quick_settings_heads_up_label">إنذار مسبق</string>
+  <string name="quick_settings_battery_saver_label">موفر البطارية</string>
   <string name="accessibility_quick_settings_sync_off">تعطيل المزامنة. </string>
   <string name="accessibility_quick_settings_sync_on">تشغيل المزامنة.</string>
   <string name="accessibility_quick_settings_sync_changed_off">تم تعطيل المزامنة.</string>
@@ -83,6 +85,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">تشغيل العرض المحيط.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">تم تعطيل العرض المحيط.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">تم تشغيل العرض المحيط.</string>
+  <string name="accessibility_quick_settings_heads_up_off">تعطيل الإنذار المسبق.</string>
+  <string name="accessibility_quick_settings_heads_up_on">تشغيل الإنذار المسبق.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">تم تعطيل الإنذار المسبق.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">تم تشغيل الإنذار المسبق.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">إيقاف موفر البطارية.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">تشغيل موفر البطارية.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">تم ايقاف موفر البطارية.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">تشغيل موفر البطارية.</string>
   <string name="quick_settings_dynamic_tile_detail_title">مربع ديناميكي</string>
   <string name="dynamic_qs_tile_next_alarm_label">التنبيه المقبل</string>
   <string name="dynamic_qs_tile_ime_selector_label">محدد IME</string>
diff --git a/packages/SystemUI/res/values-ast-rES/cm_strings.xml b/packages/SystemUI/res/values-ast-rES/cm_strings.xml
index 3ad2a27..9628bf6 100644
--- a/packages/SystemUI/res/values-ast-rES/cm_strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/cm_strings.xml
@@ -42,6 +42,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfiles del sistema</string>
   <string name="quick_settings_profiles_off">Perfiles deshabilitaos</string>
+  <string name="quick_settings_battery_saver_label">Aforrador d\'enerxía</string>
   <string name="quick_settings_volume_panel_label">Panel de volume</string>
   <string name="quick_settings_usb_tether_label">USB tethering</string>
   <string name="quick_settings_screen_timeout_detail_title">Tiempu d\'espera</string>
diff --git a/packages/SystemUI/res/values-az-rAZ/cm_strings.xml b/packages/SystemUI/res/values-az-rAZ/cm_strings.xml
index 270e674..ac5ab8b 100644
--- a/packages/SystemUI/res/values-az-rAZ/cm_strings.xml
+++ b/packages/SystemUI/res/values-az-rAZ/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Sistem profilləri</string>
   <string name="quick_settings_profiles_off">Profillər ləğv edildi</string>
+  <string name="quick_settings_heads_up_label">Açılan başlıqlar</string>
+  <string name="quick_settings_battery_saver_label">Batereyaya qənaət</string>
   <string name="accessibility_quick_settings_sync_off">Eyniləşdirmə bağlıdır.</string>
   <string name="accessibility_quick_settings_sync_on">Eyniləşdirmə açıqdır.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Eyniləşdirmə bağlanıldı.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Bildiriş ekranı açıqdır.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Bildiriş ekranı bağlanıldı.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Bildiriş ekranı açıldı.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Açılan başlıq bildirişi bağlıdır.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Açılan başlıq bildişi açıqdır.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Açılan başlıq bildirişi bağlanıldı.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Açılan başlıq bildirişi açıldı.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Batereyaya qənaət bağlıdır.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Batereyaya qənaət açıqdır.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Batereyaya qənaət bağlanıldı.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Batereyaya qənaət açıldı.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dinamik kvadrat</string>
   <string name="dynamic_qs_tile_next_alarm_label">Növbəti zəngli saat</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME seçici</string>
diff --git a/packages/SystemUI/res/values-ca/cm_strings.xml b/packages/SystemUI/res/values-ca/cm_strings.xml
index 156d380..6c16834 100644
--- a/packages/SystemUI/res/values-ca/cm_strings.xml
+++ b/packages/SystemUI/res/values-ca/cm_strings.xml
@@ -45,7 +45,7 @@
   <string name="accessibility_quick_settings_profiles">Perfils: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="accessibility_quick_settings_profiles_changed_off">S\'han desactivat els perfils.</string>
   <string name="accessibility_quick_settings_profiles_changed">Perfil canviat a <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
-  <string name="quick_settings_compass_init">Inicialitzant\u2026</string>
+  <string name="quick_settings_compass_init">S\'està inicialitzant\u2026</string>
   <string name="led_notification_title">Ajustaments de llums</string>
   <string name="led_notification_text">Llum LED habilitada per ajustos</string>
   <string name="qs_tile_edit_header_instruction">Prem i aguanta les cel·les per reordenar-les</string>
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfils de sistema</string>
   <string name="quick_settings_profiles_off">Perfils desactivats</string>
+  <string name="quick_settings_heads_up_label">Notificacions emergents</string>
+  <string name="quick_settings_battery_saver_label">Estalvi de bateria</string>
   <string name="accessibility_quick_settings_sync_off">Sinc desactivada.</string>
   <string name="accessibility_quick_settings_sync_on">Sinc activada.</string>
   <string name="accessibility_quick_settings_sync_changed_off">S\'ha desactivat la sincronització.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Pantalla ambient activada.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">S\'ha desactivat la pantalla ambient.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">S\'ha activat la pantalla ambient.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Notificacions emergents apagades.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Notificacions emergents activades.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">S\'han apagat les notificacions emergents.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">S\'han encès les notificacions emergents.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Estalvi de bateria apagat.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Estalvi de bateria encès.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">S\'ha apagat l\'estalvi de bateria.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">S\'ha encès l\'estalvi de bateria.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Cel·la dinàmica</string>
   <string name="dynamic_qs_tile_next_alarm_label">Propera alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector de l\'IME</string>
@@ -123,4 +133,7 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Informes d\'ubicació canviats al mode d\'estalvi d\'energia.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Informes d\'ubicació canviats al mode només sensors.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Informes d\'ubicació canviats al mode d\'alta precisió.</string>
+  <string name="quick_settings_tiles_category_system">Cel·les del sistema</string>
+  <string name="quick_settings_tiles_add_tiles">Afegeix una cel·la</string>
+  <string name="hotspot_apm_message">No es pot connectar a la xarxa mòbil mentre el mode Avió està habilitat. Deshabilita el mode Avió i intenta-ho de nou.</string>
 </resources>
diff --git a/packages/SystemUI/res/values-cs/cm_strings.xml b/packages/SystemUI/res/values-cs/cm_strings.xml
index 3163ade..718a494 100644
--- a/packages/SystemUI/res/values-cs/cm_strings.xml
+++ b/packages/SystemUI/res/values-cs/cm_strings.xml
@@ -16,9 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <string name="left_shortcut_hint">Přejeďte doprava pro %1$s</string>
   <string name="right_shortcut_hint">Přejeďte doleva pro %1$s</string>
+  <string name="lockscreen_message">Dotykem na ikonu na levé nebo pravé straně zamykací obrazovky změňte zástupce.</string>
+  <string name="lockscreen_default_target">Výchozí</string>
   <string name="select_application">Vybrat aplikaci</string>
   <string name="lockscreen_choose_action_title">Zvolit akci</string>
   <string name="lockscreen_none_target">Žádný</string>
@@ -36,11 +40,23 @@
   <string name="advanced_dev_option_wipe_app">Vymazat data aplikací</string>
   <string name="advanced_dev_option_force_stop">Vynutit ukončení</string>
   <string name="advanced_dev_option_uninstall">Odinstalovat</string>
+  <string name="accessibility_notification_brightness">Jas podsvícení</string>
   <string name="accessibility_quick_settings_profiles_off">Profily vyp.</string>
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="accessibility_quick_settings_profiles_changed_off">Profily vypnuty.</string>
   <string name="accessibility_quick_settings_profiles_changed">Profil změněn na <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializace\u2026</string>
+  <string name="led_notification_title">Nastavení jasu</string>
+  <string name="led_notification_text">LED světlo povoleno v nastavení</string>
+  <string name="qs_tile_edit_header_instruction">Stiskněte a podržte tlačítko dlaždice pro přeskupení</string>
+  <string name="quick_settings_edit_label">Úprava dlaždic</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Dlaždici „Úprava dlaždic“ nelze odstranit</string>
+  <string name="qs_tiles_reset_confirmation">Obnovit výchozí dlaždice rychlého nastavení?</string>
+  <string name="quick_settings_tile_reset_to_default">Obnovit výchozí rozložení</string>
+  <string name="quick_settings_title_header">Záhlaví</string>
+  <string name="quick_settings_title_tiles">Dlaždice</string>
+  <string name="quick_settings_title_show_weather">Zobrazit počasí</string>
+  <string name="quick_settings_title_enlarge_first_row">Zvětšit první řádek</string>
   <string name="screen_pinning_description_no_navbar">Zůstává zobrazeno, dokud není uvolněn. Dotykem a podržením tlačítka Zpět bude provedeno uvolnění.</string>
   <string name="quick_settings_custom_tile_detail_title">Vlastní dlaždice</string>
   <string name="quick_settings_remove">Odebrat dlaždici</string>
@@ -49,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Systémové profily</string>
   <string name="quick_settings_profiles_off">Profily zakázány</string>
+  <string name="quick_settings_heads_up_label">Plovoucí upozornění</string>
+  <string name="quick_settings_battery_saver_label">Spořič baterie</string>
   <string name="accessibility_quick_settings_sync_off">Synch. vyp.</string>
   <string name="accessibility_quick_settings_sync_on">Synch. zap.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synchronizace vypnuta.</string>
@@ -82,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambientní zobrazení zapnuto.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambientní zobrazení vypnuto.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambientní zobrazení zapnuto.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Plovoucí upozorněn vyp.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Plovoucí upozornění zap.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Plovoucí upozorněn vyp.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Plovoucí upozornění zap.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Spořič baterie vyp.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Spořič baterie zap.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Spořič baterie vypnut.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Spořič baterie zapnut.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamické dlaždice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Další budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výběr IME</string>
@@ -96,6 +122,7 @@
   <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay změněn na režim ve dne.</string>
   <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay změněn na režim v noci.</string>
   <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay změněn na režim venku.</string>
+  <string name="quick_settings_title_advanced_location">Třístavové nastavení určení polohy</string>
   <string name="accessibility_quick_settings_location_battery_saving">Zjištění polohy: úsporný režim.</string>
   <string name="accessibility_quick_settings_location_gps_only">Zjištění polohy: pouze GPS.</string>
   <string name="accessibility_quick_settings_location_high_accuracy">Zjištění polohy: vysoká přesnost.</string>
@@ -106,4 +133,7 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Zjištění polohy změněno na úsporu baterie.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Zjištění polohy změněno na pouze GPS.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Zjištění polohy změněno na vysokou přesnost.</string>
+  <string name="quick_settings_tiles_category_system">Systémové dlaždice</string>
+  <string name="quick_settings_tiles_add_tiles">Přidat dlaždici</string>
+  <string name="hotspot_apm_message">Nelze se připojit k mobilním sítím při zapnutém režimu „V letadle“. Vypněte prosím tento režim a zkuste to znovu.</string>
 </resources>
diff --git a/packages/SystemUI/res/values-da/cm_strings.xml b/packages/SystemUI/res/values-da/cm_strings.xml
index 3672bb7..b029398 100644
--- a/packages/SystemUI/res/values-da/cm_strings.xml
+++ b/packages/SystemUI/res/values-da/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Systemprofiler</string>
   <string name="quick_settings_profiles_off">Profiler deaktiveret</string>
+  <string name="quick_settings_heads_up_label">Svævende meddelelser</string>
+  <string name="quick_settings_battery_saver_label">Strømsparetilstand</string>
   <string name="accessibility_quick_settings_sync_off">Synkr. fra.</string>
   <string name="accessibility_quick_settings_sync_on">Synkr. til.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synkr. er slået fra.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Inaktivitetsvisning til.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Inaktivitetsvisning er slået fra.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Inaktivitetsvisning er slået til.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Svævende meddelelser fra.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Svævende meddelelser til.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Svævende meddelelser er slået fra.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Svævende meddelelser er slået til.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Strømsparetilstand fra.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Strømsparetilstand til.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Strømsparetilstand er slået fra.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Strømsparetilstand er slået til.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamisk flise</string>
   <string name="dynamic_qs_tile_next_alarm_label">Næste alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME-vælger</string>
diff --git a/packages/SystemUI/res/values-de/cm_strings.xml b/packages/SystemUI/res/values-de/cm_strings.xml
index b3fc26f..b77a624 100644
--- a/packages/SystemUI/res/values-de/cm_strings.xml
+++ b/packages/SystemUI/res/values-de/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Systemprofile</string>
   <string name="quick_settings_profiles_off">Profile deaktiviert</string>
+  <string name="quick_settings_heads_up_label">Pop-up</string>
+  <string name="quick_settings_battery_saver_label">Akku-Sparmodus</string>
   <string name="accessibility_quick_settings_sync_off">Sync aus.</string>
   <string name="accessibility_quick_settings_sync_on">Sync an.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sync ausgeschaltet.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Inaktivitätsdisplay an.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Inaktivitätsdisplay ausgeschaltet.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Inaktivitätsdisplay eingeschaltet.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Pop-up aus.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Pop-up an.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Pop-up ausgeschaltet.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Pop-up eingeschaltet.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Akku-Sparmodus aus.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Akku-Sparmodus an.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Akku-Sparmodus ausgeschaltet.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Akku-Sparmodus eingeschaltet.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamische Kachel</string>
   <string name="dynamic_qs_tile_next_alarm_label">Nächster Alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Eingabemethode</string>
diff --git a/packages/SystemUI/res/values-el/cm_strings.xml b/packages/SystemUI/res/values-el/cm_strings.xml
index e8be8ff..4eff675 100644
--- a/packages/SystemUI/res/values-el/cm_strings.xml
+++ b/packages/SystemUI/res/values-el/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Προφίλ συστήματος</string>
   <string name="quick_settings_profiles_off">Προφίλ απενεργοποιημένα</string>
+  <string name="quick_settings_heads_up_label">Αναδυόμενες ειδοποιήσεις</string>
+  <string name="quick_settings_battery_saver_label">Εξοικονόμηση μπαταρίας</string>
   <string name="accessibility_quick_settings_sync_off">Ανενεργός συγχρονισμός.</string>
   <string name="accessibility_quick_settings_sync_on">Ενεργός συγχρονισμός.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Ο συγχρονισμός απενεργοποιήθηκε.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ενεργή οθόνη ambient.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Η οθόνη ambient απενεργοποιήθηκε.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Η οθόνη ambient ενεργοποιήθηκε.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Ανενεργές αναδυόμενες ειδοποιήσεις.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Ενεργές αναδυόμενες ειδοποιήσεις.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Οι αναδυόμενες ειδοποιήσεις απενεργοποιήθηκαν.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Οι αναδυόμενες ειδοποιήσεις ενεργοποιήθηκαν.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Ανενεργή εξοικονόμηση μπαταρίας.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Ενεργή εξοικονόμηση μπαταρίας.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Η εξοικονόμηση μπαταρίας απενεργοποιήθηκε.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Η εξοικονόμηση μπαταρίας ενεργοποιήθηκε.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Δυναμικό πλακίδιο</string>
   <string name="dynamic_qs_tile_next_alarm_label">Επόμενο ξυπνητήρι</string>
   <string name="dynamic_qs_tile_ime_selector_label">Επιλογέας μεθόδου εισόδου</string>
@@ -125,4 +135,5 @@
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Η αναφορά τοποθεσίας άλλαξε σε λειτουργία υψηλής ακρίβειας.</string>
   <string name="quick_settings_tiles_category_system">Πλακίδια συστήματος</string>
   <string name="quick_settings_tiles_add_tiles">Προσθήκη πλακιδίου</string>
+  <string name="hotspot_apm_message">Δεν είναι δυνατή η σύνδεση με δίκτυα κινητής τηλεφωνίας ενώ είναι ενεργοποιημένη η λειτουργία πτήσης. Απενεργοποιήστε τη λειτουργία πτήσης και προσπαθήστε ξανά.</string>
 </resources>
diff --git a/packages/SystemUI/res/values-en-rIN/cm_strings.xml b/packages/SystemUI/res/values-en-rIN/cm_strings.xml
index c4daae3..1e364db 100644
--- a/packages/SystemUI/res/values-en-rIN/cm_strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">System profiles</string>
   <string name="quick_settings_profiles_off">Profiles disabled</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Battery saver</string>
   <string name="accessibility_quick_settings_sync_off">Sync off.</string>
   <string name="accessibility_quick_settings_sync_on">Sync on.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sync turned off.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display on.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display turned off.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display turned on.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up off.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up on.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up turned off.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up turned on.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Battery saver off.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Battery saver on.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Battery saver turned off.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Battery saver turned on.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamic tile</string>
   <string name="dynamic_qs_tile_next_alarm_label">Next alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME selector</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Location reporting changed to battery saving mode.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Location reporting changed to sensors only mode.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Location reporting changed to high accuracy mode.</string>
+  <string name="quick_settings_tiles_category_system">System tiles</string>
+  <string name="quick_settings_tiles_add_tiles">Add a tile</string>
 </resources>
diff --git a/packages/SystemUI/res/values-eo/cm_strings.xml b/packages/SystemUI/res/values-eo/cm_strings.xml
index 26ba687..e903d2b 100644
--- a/packages/SystemUI/res/values-eo/cm_strings.xml
+++ b/packages/SystemUI/res/values-eo/cm_strings.xml
@@ -49,6 +49,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Sistemaj profiloj</string>
   <string name="quick_settings_profiles_off">Profiloj malŝaltitaj</string>
+  <string name="quick_settings_heads_up_label">Atentigoj</string>
   <string name="accessibility_quick_settings_sync_off">Sinkronigado malaktiva.</string>
   <string name="accessibility_quick_settings_sync_on">Sinkronigado aktiva.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sinkronigado malŝaltita.</string>
@@ -75,6 +76,10 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ĉirkaŭaĵa afiŝado aktiva.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ĉirkaŭaĵa afiŝado malŝaltita.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ĉirkaŭaĵa afiŝado ŝaltita.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Atentigoj malaktivaj.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Atentigoj aktivaj.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Atentigoj malŝaltitaj.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Atentigoj ŝaltitaj.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dinamika kahelo</string>
   <string name="dynamic_qs_tile_next_alarm_label">Venonta alarmo</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME elektilo</string>
diff --git a/packages/SystemUI/res/values-es/cm_strings.xml b/packages/SystemUI/res/values-es/cm_strings.xml
index bc72063..92425c1 100644
--- a/packages/SystemUI/res/values-es/cm_strings.xml
+++ b/packages/SystemUI/res/values-es/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfiles del sistema</string>
   <string name="quick_settings_profiles_off">Perfiles desactivados</string>
+  <string name="quick_settings_heads_up_label">Notificaciones emergentes</string>
+  <string name="quick_settings_battery_saver_label">Modo de ahorro de batería</string>
   <string name="accessibility_quick_settings_sync_off">Sincronización desactivada.</string>
   <string name="accessibility_quick_settings_sync_on">Sincronización activada.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sincronización desactivada.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Pantalla ambiente activada.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Pantalla ambiente desactivada.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Pantalla ambiente activada.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Desactivar notificaciones emergentes.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Activar notificaciones emergentes.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Notificaciones emergentes desactivadas.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Notificaciones emergentes activadas.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Apagar modo de ahorro de batería.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Encender modo de ahorro de batería.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Modo de ahorro de batería apagado.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Modo de ahorro de batería encendido.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Control dinámico</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
diff --git a/packages/SystemUI/res/values-et-rEE/cm_strings.xml b/packages/SystemUI/res/values-et-rEE/cm_strings.xml
index 4ff9808..2ba6e81 100644
--- a/packages/SystemUI/res/values-et-rEE/cm_strings.xml
+++ b/packages/SystemUI/res/values-et-rEE/cm_strings.xml
@@ -49,6 +49,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Süsteemi profiilid</string>
   <string name="quick_settings_profiles_off">Profiilid välja lülitatud</string>
+  <string name="quick_settings_heads_up_label">Etteteavitus</string>
   <string name="accessibility_quick_settings_sync_off">Sünk väljas.</string>
   <string name="accessibility_quick_settings_sync_on">Sünk sees.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sünk välja lülitatud.</string>
@@ -76,6 +77,10 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient kuva sees.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient kuva väljalülitatud.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient kuva sisselülitatud.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Etteteavitus väljas.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Etteteavitus sees.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Etteteavitus on väljalülitatud.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Etteteavitus on sisselülitatud.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dünaamiline plaat</string>
   <string name="dynamic_qs_tile_next_alarm_label">Järgmine alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME valija</string>
diff --git a/packages/SystemUI/res/values-eu-rES/cm_strings.xml b/packages/SystemUI/res/values-eu-rES/cm_strings.xml
index 8b11af1c..ab852a1 100644
--- a/packages/SystemUI/res/values-eu-rES/cm_strings.xml
+++ b/packages/SystemUI/res/values-eu-rES/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Sistema profilak</string>
   <string name="quick_settings_profiles_off">Profilak ezgaituta</string>
+  <string name="quick_settings_heads_up_label">Jakinarazpen flotatzaileak</string>
+  <string name="quick_settings_battery_saver_label">Bateria aurrezlea</string>
   <string name="accessibility_quick_settings_sync_off">Sinkronizazioa ezgaituta.</string>
   <string name="accessibility_quick_settings_sync_on">Sinkronizazioa gaituta.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sinkronizazioa ezgaituta.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display piztuta.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display itzalita.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display piztuta.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Jakinarazpen flotatzaileak ezgaituta.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Jakinarazpen flotatzaileak gaituta.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Jakinarazpen flotatzaileak ezgaituta.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Jakinarazpen flotatzaileak gaituta.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Bateria aurrezlea itzalita.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Bateria aurrezlea piztuta.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Bateria aurrezlea itzalita.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Bateria aurrezlea piztuta.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Lauza dinamikoa</string>
   <string name="dynamic_qs_tile_next_alarm_label">Hurrengo alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME hautatzailea</string>
@@ -123,4 +133,7 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Kokaleku txostena bateria aurrezteko modura aldatu da.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Kokaleku txostena sentsoreak besterik ez modura aldatu da.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Kokaleku txostena zehaztasun handiko modura aldatu da.</string>
+  <string name="quick_settings_tiles_category_system">Sistemaren lauzak</string>
+  <string name="quick_settings_tiles_add_tiles">Gehitu lauza bat</string>
+  <string name="hotspot_apm_message">Ezin da sare mugikorretara konektatu hegaldi modua gaituta dagoenean. Desgaitu hegaldi modua eta saiatu berriro.</string>
 </resources>
diff --git a/packages/SystemUI/res/values-fa/cm_strings.xml b/packages/SystemUI/res/values-fa/cm_strings.xml
index 46df54b..030560e 100644
--- a/packages/SystemUI/res/values-fa/cm_strings.xml
+++ b/packages/SystemUI/res/values-fa/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">ان‌اف‌سی</string>
   <string name="quick_settings_profiles">پروفایل‌ها</string>
   <string name="quick_settings_profiles_off">پروفایل‌ها غیرفعالند</string>
+  <string name="quick_settings_heads_up_label">اعلان فوری</string>
+  <string name="quick_settings_battery_saver_label">بهینه‌ساز باتری</string>
   <string name="accessibility_quick_settings_sync_off">همگام‌سازی خاموش.</string>
   <string name="accessibility_quick_settings_sync_on">همگام‌سازی روشن.</string>
   <string name="accessibility_quick_settings_sync_changed_off">همگام‌سازی خاموش شد.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">نمایش حساس به محیط روشن.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">نمایش حساس به محیط خاموش شد.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">نمایش حساس به محیط روشن شد.</string>
+  <string name="accessibility_quick_settings_heads_up_off">اعلان فوری خاموش.</string>
+  <string name="accessibility_quick_settings_heads_up_on">اعلان فوری روشن.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">اعلان فوری خاموش شد.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">اعلان فوری روشن شد.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">بهینه‌ساز باتری خاموش.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">بهینه‌ساز باتری روشن.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">بهینه‌ساز باتری خاموش شد.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">بهینه‌ساز باتری روشن شد.</string>
   <string name="quick_settings_dynamic_tile_detail_title">کاشی پویا</string>
   <string name="dynamic_qs_tile_next_alarm_label">هشدار بعدی</string>
   <string name="dynamic_qs_tile_ime_selector_label">انتخابگر تغییر روش ورودی</string>
diff --git a/packages/SystemUI/res/values-fi/cm_strings.xml b/packages/SystemUI/res/values-fi/cm_strings.xml
index c7a44f9..0f9065c 100644
--- a/packages/SystemUI/res/values-fi/cm_strings.xml
+++ b/packages/SystemUI/res/values-fi/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Järjestelmäprofiilit</string>
   <string name="quick_settings_profiles_off">Profiilit pois käytöstä</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Virransäästö</string>
   <string name="accessibility_quick_settings_sync_off">Synkronointi pois.</string>
   <string name="accessibility_quick_settings_sync_on">Synkronointi päällä.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synkronointi pois päältä.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient-näyttö päällä.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient-näyttö pois päältä.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient-näyttö päällä.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up pois.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up päällä.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up pois päältä.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up päällä.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Virransäästö pois.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Virransäästö päällä.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Virransäästö pois käytöstä.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Virransäästö käytössä.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynaamiset tiilet</string>
   <string name="dynamic_qs_tile_next_alarm_label">Seuraava hälytys</string>
   <string name="dynamic_qs_tile_ime_selector_label">Syöttötavan valitsin</string>
diff --git a/packages/SystemUI/res/values-fr/cm_strings.xml b/packages/SystemUI/res/values-fr/cm_strings.xml
index cda12e5..fac0d72 100644
--- a/packages/SystemUI/res/values-fr/cm_strings.xml
+++ b/packages/SystemUI/res/values-fr/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profils système</string>
   <string name="quick_settings_profiles_off">Profils désactivés</string>
+  <string name="quick_settings_heads_up_label">Notifications flottantes</string>
+  <string name="quick_settings_battery_saver_label">Économiseur de batterie</string>
   <string name="accessibility_quick_settings_sync_off">Synchronisation désactivée.</string>
   <string name="accessibility_quick_settings_sync_on">Synchronisation activée.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synchronisation désactivée.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Affichage ambiant activé.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Affichage ambiant désactivé.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Affichage ambiant activé.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Notifications flottantes désactivées.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Notifications flottantes activées.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Notifications flottantes désactivées.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Notifications flottantes activées.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Économiseur de batterie désactivé.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Économiseur de batterie activé.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">L\'économiseur de batterie a été désactivé.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">L\'économiseur de batterie a été activé.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Raccourcis dynamiques</string>
   <string name="dynamic_qs_tile_next_alarm_label">Prochaine alarme</string>
   <string name="dynamic_qs_tile_ime_selector_label">Mode de saisie</string>
diff --git a/packages/SystemUI/res/values-gl-rES/cm_strings.xml b/packages/SystemUI/res/values-gl-rES/cm_strings.xml
index 1d0a344..d0d1af6 100644
--- a/packages/SystemUI/res/values-gl-rES/cm_strings.xml
+++ b/packages/SystemUI/res/values-gl-rES/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfís do sistema</string>
   <string name="quick_settings_profiles_off">Perfís desactivados</string>
+  <string name="quick_settings_heads_up_label">Notificacións emerxentes</string>
+  <string name="quick_settings_battery_saver_label">Economizador da bateria</string>
   <string name="accessibility_quick_settings_sync_off">Sincronización apagada.</string>
   <string name="accessibility_quick_settings_sync_on">Sincronización acesa.</string>
   <string name="accessibility_quick_settings_sync_changed_off">A sincronización foi apagada.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Visualización de ambiente activada.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">A visualización de ambiente foi desactivada.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">A visualización de ambiente foi activada.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Notificacións emerxentes desactivadas.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Notificacións emerxentes activadas.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">As notificacións emerxentes foron desactivadas.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">As notificacións emerxentes foron activadas.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Economizador da batería apagado.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Economizador da bateria aceso.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">O economizador da batería foi apagado.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">O economizador da batería foi acendido.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Botón dinámico</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
diff --git a/packages/SystemUI/res/values-hi/cm_strings.xml b/packages/SystemUI/res/values-hi/cm_strings.xml
index e1d0904..fd86432 100644
--- a/packages/SystemUI/res/values-hi/cm_strings.xml
+++ b/packages/SystemUI/res/values-hi/cm_strings.xml
@@ -49,6 +49,7 @@
   <string name="quick_settings_nfc_label">एनएफसी</string>
   <string name="quick_settings_profiles">सिस्टम प्रोफ़ाइलें</string>
   <string name="quick_settings_profiles_off">प्रोफ़ाइलें अक्षम हैं</string>
+  <string name="quick_settings_heads_up_label">हेड्स अप।</string>
   <string name="accessibility_quick_settings_sync_off">संकालन बंद है।</string>
   <string name="accessibility_quick_settings_sync_on">संकालन चालू है।</string>
   <string name="accessibility_quick_settings_sync_changed_off">संकालन को बंद किया गया है।</string>
@@ -75,6 +76,10 @@
   <string name="accessibility_quick_settings_ambient_display_on">परिवेशी प्रदर्शन चालू है।</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">परिवेशी प्रदर्शन को बंद किया गया है।</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">परिवेशी प्रदर्शन को चालू किया गया।</string>
+  <string name="accessibility_quick_settings_heads_up_off">हेड्स अप बंद है।</string>
+  <string name="accessibility_quick_settings_heads_up_on">हेड्स अप चालू है।</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">हेड्स अप को बंद किया गया है।</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">हेड्स अप को चालू किया गया।</string>
   <string name="quick_settings_dynamic_tile_detail_title">गतिशील टाइल</string>
   <string name="dynamic_qs_tile_next_alarm_label">अलगा अलार्म</string>
   <string name="dynamic_qs_tile_ime_selector_label">आईएमई चयनक</string>
diff --git a/packages/SystemUI/res/values-hr/cm_strings.xml b/packages/SystemUI/res/values-hr/cm_strings.xml
index 302eb54..87f1d25 100644
--- a/packages/SystemUI/res/values-hr/cm_strings.xml
+++ b/packages/SystemUI/res/values-hr/cm_strings.xml
@@ -18,14 +18,14 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="accessibility_data_connection_hspap">HSPA+</string>
   <string name="accessibility_data_connection_4g_plus">4G+</string>
-  <string name="status_bar_expanded_header_weather_format">%1$s - %2$s</string>
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <string name="left_shortcut_hint">Kliznite desno za %1$s</string>
   <string name="right_shortcut_hint">Kliznite lijevo za %1$s</string>
-  <string name="lockscreen_message">Dodirnite ikonu na lijevo ili desno kako bi preraspodijelili prečac zaključanog zaslona .</string>
+  <string name="lockscreen_message">Dodirnite ikonu na lijevo ili desno kako bi preraspodijelili prečac zaključanog zaslona.</string>
   <string name="lockscreen_default_target">Zadano</string>
   <string name="select_application">Odaberite aplikaciju</string>
   <string name="lockscreen_choose_action_title">Odaberite radnju</string>
-  <string name="lockscreen_none_target">Ništa</string>
+  <string name="lockscreen_none_target">Nijedan</string>
   <string name="navbar_dialog_title">Odaberi radnju</string>
   <string name="navbar_home_button">Home tipka</string>
   <string name="navbar_recent_button">Tipka nedavno</string>
@@ -51,11 +51,11 @@
   <string name="qs_tile_edit_header_instruction">Pritisnite i držite pločicu za uređivanje</string>
   <string name="quick_settings_edit_label">Uredi pločice</string>
   <string name="quick_settings_cannot_delete_edit_tile">Nije moguće obrisati Uredi pločice</string>
-  <string name="qs_tiles_reset_confirmation">Resetirati pločice brzih postavki na zadano?</string>
+  <string name="qs_tiles_reset_confirmation">Vratiti pločice brzih postavki na zadano?</string>
   <string name="quick_settings_tile_reset_to_default">Vraćanje na zadani izgled</string>
   <string name="quick_settings_title_header">Zaglavlje</string>
   <string name="quick_settings_title_tiles">Pločice</string>
-  <string name="quick_settings_title_show_weather">Pokaži vrijeme</string>
+  <string name="quick_settings_title_show_weather">Pokaži prognozu</string>
   <string name="quick_settings_title_enlarge_first_row">Povećaj prvi red</string>
   <string name="screen_pinning_description_no_navbar">Ovo drži u pogledu dok ne otkvačite. Dodirnite i držite gumb natrag da bi otkvačili.</string>
   <string name="quick_settings_custom_tile_detail_title">Prilagodljive pločice</string>
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profili sustava</string>
   <string name="quick_settings_profiles_off">Profili onemogućeni</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Ušteda baterije</string>
   <string name="accessibility_quick_settings_sync_off">Sinkronizacija isključena.</string>
   <string name="accessibility_quick_settings_sync_on">Sinkronizacija uključena.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sinkronizacija je isključena.</string>
@@ -98,8 +100,16 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambijentni zaslon uključen.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambijentni zaslon je isključen.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambijentni zaslon je uključen.</string>
-  <string name="quick_settings_dynamic_tile_detail_title">Dinamičke pločice</string>
-  <string name="dynamic_qs_tile_next_alarm_label">Slijedeći alarm</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up isključen.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up uključen.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up je isključen.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up je uključen.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Ušteda baterije isključena.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Ušteda baterije uključena.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Ušteda baterije je isključena.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Ušteda baterije je uključena.</string>
+  <string name="quick_settings_dynamic_tile_detail_title">Dinamične pločice</string>
+  <string name="dynamic_qs_tile_next_alarm_label">Sljedeći alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME za odabir</string>
   <string name="dynamic_qs_tile_su_label">Root pristup</string>
   <string name="accessibility_quick_settings_live_display_off">LiveDisplay isključen.</string>
@@ -107,7 +117,7 @@
   <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dnevni način.</string>
   <string name="accessibility_quick_settings_live_display_night">LiveDisplay: noćni način.</string>
   <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: vanjski način.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay isključeno.</string>
+  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay isključen.</string>
   <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay promijenjen u auto.</string>
   <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay promijenjen u dnevni način.</string>
   <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay promijenjen u noćni način rada.</string>
@@ -120,7 +130,7 @@
   <string name="quick_settings_location_battery_saving_label">Štednja baterije</string>
   <string name="quick_settings_location_gps_only_label">Samo uređaj</string>
   <string name="quick_settings_location_high_accuracy_label">Visoka preciznost</string>
-  <string name="accessibility_quick_settings_location_changed_battery_saving">Prijavljivanje lokacije promijenjeno u način uštednje baterije.</string>
+  <string name="accessibility_quick_settings_location_changed_battery_saving">Prijavljivanje lokacije promijenjeno u način uštede baterije.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Prijavljivanje lokacije promijenjeno u samo senzori.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Prijavljivanje lokacije promijenjeno u način visoke preciznosti.</string>
   <string name="quick_settings_tiles_category_system">Sistemske pločice</string>
diff --git a/packages/SystemUI/res/values-hu/cm_strings.xml b/packages/SystemUI/res/values-hu/cm_strings.xml
index d185af0..20dc86e 100644
--- a/packages/SystemUI/res/values-hu/cm_strings.xml
+++ b/packages/SystemUI/res/values-hu/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Rendszer profilok</string>
   <string name="quick_settings_profiles_off">Profilok letiltva</string>
+  <string name="quick_settings_heads_up_label">Lebegő értesítés</string>
+  <string name="quick_settings_battery_saver_label">Akkumulátor kímélő</string>
   <string name="accessibility_quick_settings_sync_off">Szinkronizálás ki.</string>
   <string name="accessibility_quick_settings_sync_on">Szinkronizálás be.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Szinkronizálás kikapcsolva.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Környezeti kijelző be.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Környezeti kijelző kikapcsolva.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Környezeti kijelző bekapcsolva.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Lebegő értesítés ki.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Lebegő értesítés be.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Lebegő értesítés kikapcsolva.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Lebegő értesítés bekapcsolva.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Akkumulátor kímélő ki.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Akkumulátor kímélő be.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Akkumulátor kímélő kikapcsolva.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Akkumulátor kímélő bekapcsolva.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dinamikus csempe</string>
   <string name="dynamic_qs_tile_next_alarm_label">Következő riasztás</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME választó</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Helymeghatározás jelentése energiatakarékosra változtatva.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Helymeghatározás jelentése csak GPS-re változtatva.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Helymeghatározás jelentése nagyon pontosra változtatva.</string>
+  <string name="quick_settings_tiles_category_system">Rendszer csempék</string>
+  <string name="quick_settings_tiles_add_tiles">Csempe hozzáadása</string>
 </resources>
diff --git a/packages/SystemUI/res/values-in/cm_strings.xml b/packages/SystemUI/res/values-in/cm_strings.xml
index 7ee285e..f7c1570 100644
--- a/packages/SystemUI/res/values-in/cm_strings.xml
+++ b/packages/SystemUI/res/values-in/cm_strings.xml
@@ -49,6 +49,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profil sistem</string>
   <string name="quick_settings_profiles_off">Profil dinonaktifkan</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="accessibility_quick_settings_sync_off">Singkron mati.</string>
   <string name="accessibility_quick_settings_sync_on">Singkron aktif.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Singkron dimatikan.</string>
@@ -75,6 +76,10 @@
   <string name="accessibility_quick_settings_ambient_display_on">Tampilan Ambient aktif.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Tampilan Ambient dinonaktifkan.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Tampilan Ambient diaktifkan.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up nonaktif.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up aktif.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up dinonaktifkan.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up diaktifkan.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Petak Dinamis</string>
   <string name="dynamic_qs_tile_next_alarm_label">Alarm selanjutnya</string>
   <string name="dynamic_qs_tile_ime_selector_label">Pemilih IME</string>
diff --git a/packages/SystemUI/res/values-it/cm_strings.xml b/packages/SystemUI/res/values-it/cm_strings.xml
index 94b0ab6..b0ff2b7 100644
--- a/packages/SystemUI/res/values-it/cm_strings.xml
+++ b/packages/SystemUI/res/values-it/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profili di sistema</string>
   <string name="quick_settings_profiles_off">Profili disattivati</string>
+  <string name="quick_settings_heads_up_label">Heads Up</string>
+  <string name="quick_settings_battery_saver_label">Risparmio batteria</string>
   <string name="accessibility_quick_settings_sync_off">Sincronia OFF</string>
   <string name="accessibility_quick_settings_sync_on">Sincronizzazione attiva.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sincronizzazione spenta.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display attivato.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display disattivato.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display attivato.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads Up disattivo.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads Up attivo.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads Up disattivato.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads Up attivato.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Risparmio batteria OFF.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Risparmio batteria ON.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Risparmio batteria disattivato.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Risparmio batteria attivato.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Tile dinamici</string>
   <string name="dynamic_qs_tile_next_alarm_label">Prossima sveglia</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selettore IME</string>
@@ -125,4 +135,5 @@
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Segnalatore posizione cambiato in modalità alta precisione.</string>
   <string name="quick_settings_tiles_category_system">Tile di sistema</string>
   <string name="quick_settings_tiles_add_tiles">Aggiungi tile</string>
+  <string name="hotspot_apm_message">Impossibile connettersi alle reti mobili quando la modalità aereo è attiva. Disattiva la modalità aereo e riprova.</string>
 </resources>
diff --git a/packages/SystemUI/res/values-iw/cm_strings.xml b/packages/SystemUI/res/values-iw/cm_strings.xml
index fea5506..16b1276 100644
--- a/packages/SystemUI/res/values-iw/cm_strings.xml
+++ b/packages/SystemUI/res/values-iw/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">פרופילי מערכת</string>
   <string name="quick_settings_profiles_off">פרופילים מושבתים</string>
+  <string name="quick_settings_heads_up_label">התראות קופצת</string>
+  <string name="quick_settings_battery_saver_label">שומר סוללה</string>
   <string name="accessibility_quick_settings_sync_off">סנכרון כבוי.</string>
   <string name="accessibility_quick_settings_sync_on">סנכרון פעיל.</string>
   <string name="accessibility_quick_settings_sync_changed_off">סנכרון כובה.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">תצוגת התראות ברקע פעילה.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">תצוגת התראות ברקע כובתה.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">תצוגת התראות ברקע הופעלה.</string>
+  <string name="accessibility_quick_settings_heads_up_off">התראות קופצות כבויות.</string>
+  <string name="accessibility_quick_settings_heads_up_on">התראות קופצות פעילות.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">התראות קופצות כובו.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">התראות קופצות הופעלו.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">שומר סוללה כבוי.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">שומר סוללה פעיל.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">שומר סוללה כובה.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">שומר סוללה הופעל.</string>
   <string name="quick_settings_dynamic_tile_detail_title">אריחים דינמיים</string>
   <string name="dynamic_qs_tile_next_alarm_label">ההתראה הבאה</string>
   <string name="dynamic_qs_tile_ime_selector_label">בורר שיטות קלט</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">דיווח מיקום השתנה למצב חיסכון סוללה.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">דיווח מיקום השתנה למצב חיישנים בלבד.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">דיווח מיקום השתנה למצב דיוק גבוה.</string>
+  <string name="quick_settings_tiles_category_system">אריחי מערכת</string>
+  <string name="quick_settings_tiles_add_tiles">הוסף אריח</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ja/cm_strings.xml b/packages/SystemUI/res/values-ja/cm_strings.xml
index 1220657..1733c31 100644
--- a/packages/SystemUI/res/values-ja/cm_strings.xml
+++ b/packages/SystemUI/res/values-ja/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">システムプロファイル</string>
   <string name="quick_settings_profiles_off">プロファイル無効</string>
+  <string name="quick_settings_heads_up_label">ヘッドアップ</string>
+  <string name="quick_settings_battery_saver_label">バッテリーセーバー</string>
   <string name="accessibility_quick_settings_sync_off">同期はOFFです。</string>
   <string name="accessibility_quick_settings_sync_on">同期はONです。</string>
   <string name="accessibility_quick_settings_sync_changed_off">同期がOFFになりました。</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">アンビエント表示はONです。</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">アンビエント表示がOFFになりました。</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">アンビエント表示がONになりました。</string>
+  <string name="accessibility_quick_settings_heads_up_off">ヘッドアップはOFFです。</string>
+  <string name="accessibility_quick_settings_heads_up_on">ヘッドアップはONです。</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">ヘッドアップがOFFになりました。</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">ヘッドアップがONになりました。</string>
+  <string name="accessibility_quick_settings_battery_saver_off">バッテリーセーバーはOFFです。</string>
+  <string name="accessibility_quick_settings_battery_saver_on">バッテリーセーバーはONです。</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">バッテリーセーバーがOFFになりました。</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">バッテリーセーバーがONになりました。</string>
   <string name="quick_settings_dynamic_tile_detail_title">自動タイル</string>
   <string name="dynamic_qs_tile_next_alarm_label">次のアラーム</string>
   <string name="dynamic_qs_tile_ime_selector_label">入力方法の選択</string>
diff --git a/packages/SystemUI/res/values-kn-rIN/cm_strings.xml b/packages/SystemUI/res/values-kn-rIN/cm_strings.xml
index 8fd7e5e..396cb3a 100644
--- a/packages/SystemUI/res/values-kn-rIN/cm_strings.xml
+++ b/packages/SystemUI/res/values-kn-rIN/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">ಸಿಸ್ಟಂ ಪ್ರೊಫೈಲ್ಸ್</string>
   <string name="quick_settings_profiles_off">ಪ್ರೊಫೈಲ್ಸ್ ನಿಷ್ಕ್ರೀಯಗೊಂಡಿದೆ</string>
+  <string name="quick_settings_heads_up_label">ಹೆಡ್ಸ್ ಅಪ್</string>
+  <string name="quick_settings_battery_saver_label">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ</string>
   <string name="accessibility_quick_settings_sync_off">ಸಿಂಕ್ ಆಫ್.</string>
   <string name="accessibility_quick_settings_sync_on">ಸಿಂಕ್ ಆನ್.</string>
   <string name="accessibility_quick_settings_sync_changed_off">ಸಿಂಕ್ ಆಫ್ ಆಗಿದೆ.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">ಆವರಿಸಿದ ಪರದೆ ಆನ್.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">ಆವರಿಸಿದ ಪರದೆ ಆಫ್ ಆಗಿದೆ.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">ಆವರಿಸಿದ ಪರದೆ ಆನ್ ಆಗಿದೆ.</string>
+  <string name="accessibility_quick_settings_heads_up_off">ಹೆಡ್ಸ್ ಅಪ್ ಆಫ್.</string>
+  <string name="accessibility_quick_settings_heads_up_on">ಹೆಡ್ಸ್ ಅಪ್ ಆನ್.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">ಹೆಡ್ಸ್ ಅಪ್ ಆಫ್ ಆಗಿದೆ.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">ಹೆಡ್ಸ್ ಅಪ್ ಆನ್ ಆಗಿದೆ.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆಫ್.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆನ್.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆಫ್ ಆಗಿದೆ.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆನ್ ಆಗಿದೆ.</string>
   <string name="quick_settings_dynamic_tile_detail_title">ಕ್ರಿಯಾತ್ಮಕ ಟೈಲ್</string>
   <string name="dynamic_qs_tile_next_alarm_label">ಮುಂದಿನ ಅಲಾರಂ</string>
   <string name="dynamic_qs_tile_ime_selector_label">ಇಎಂಇ ಆಯ್ಕೆ</string>
diff --git a/packages/SystemUI/res/values-ko/cm_strings.xml b/packages/SystemUI/res/values-ko/cm_strings.xml
index cdd0792..35db63a 100644
--- a/packages/SystemUI/res/values-ko/cm_strings.xml
+++ b/packages/SystemUI/res/values-ko/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">시스템 프로필</string>
   <string name="quick_settings_profiles_off">프로필 사용 안 함</string>
+  <string name="quick_settings_heads_up_label">헤드업 알림</string>
+  <string name="quick_settings_battery_saver_label">배터리 절약</string>
   <string name="accessibility_quick_settings_sync_off">동기화 꺼짐</string>
   <string name="accessibility_quick_settings_sync_on">동기화 켜짐</string>
   <string name="accessibility_quick_settings_sync_changed_off">동기화가 해제되었습니다.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">절전 모드 자동 해제가 켜짐.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">절전 모드 자동 해제가 꺼졌습니다.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">절전 모드 자동 해제가 켜졌습니다.</string>
+  <string name="accessibility_quick_settings_heads_up_off">헤드업 알림이 꺼짐.</string>
+  <string name="accessibility_quick_settings_heads_up_on">헤드업 알림이 켜짐.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">헤드업 알림이 꺼졌습니다.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">헤드업 알림이 켜졌습니다.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">배터리 절약 끔.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">배터리 절약 킴.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">배터리 절약이 꺼졌습니다.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">배터리 절약이 켜졌습니다.</string>
   <string name="quick_settings_dynamic_tile_detail_title">동적 타일</string>
   <string name="dynamic_qs_tile_next_alarm_label">다음 알람</string>
   <string name="dynamic_qs_tile_ime_selector_label">입력 방법 선택</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">위치 보고가 배터리 절약 모드로 바뀜.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">위치 보고가 기기 전용 모드로 바뀜.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">위치 보고가 높은 정확도 모드로 바뀜.</string>
+  <string name="quick_settings_tiles_category_system">시스템 타일</string>
+  <string name="quick_settings_tiles_add_tiles">타일 추가</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ku/cm_strings.xml b/packages/SystemUI/res/values-ku/cm_strings.xml
index 018c4c3..59f8c53 100644
--- a/packages/SystemUI/res/values-ku/cm_strings.xml
+++ b/packages/SystemUI/res/values-ku/cm_strings.xml
@@ -45,6 +45,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">زانیاری تایبەتیەکانی سیستەم</string>
   <string name="quick_settings_profiles_off">زانیاری تایبەتی ناچالاکە</string>
+  <string name="quick_settings_heads_up_label">فه‌رمووه‌کان</string>
   <string name="quick_settings_usb_tether_label">گرتنەدەستی USB</string>
   <string name="quick_settings_screen_timeout_detail_title">کاتی شاشە</string>
   <string name="quick_settings_lockscreen_label">قفڵی شاشە</string>
diff --git a/packages/SystemUI/res/values-lb/cm_strings.xml b/packages/SystemUI/res/values-lb/cm_strings.xml
index 9da6cb9..d69da04 100644
--- a/packages/SystemUI/res/values-lb/cm_strings.xml
+++ b/packages/SystemUI/res/values-lb/cm_strings.xml
@@ -16,9 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <string name="left_shortcut_hint">No riets wësche fir %1$s</string>
   <string name="right_shortcut_hint">No lénks wësche fir %1$s</string>
+  <string name="lockscreen_message">Dréck e Symbol op der lénkser oder rietser Säit fir d\'Spärschierm-Ofkierzungen nei ze definéieren.</string>
+  <string name="lockscreen_default_target">Standard</string>
   <string name="select_application">App auswielen</string>
   <string name="lockscreen_choose_action_title">Aktioun auswielen</string>
   <string name="lockscreen_none_target">Keen</string>
@@ -36,11 +40,23 @@
   <string name="advanced_dev_option_wipe_app">Applikatiounsdate läschen</string>
   <string name="advanced_dev_option_force_stop">Zoumaachen zwéngen</string>
   <string name="advanced_dev_option_uninstall">Desinstalléieren</string>
+  <string name="accessibility_notification_brightness">Hellegkeet</string>
   <string name="accessibility_quick_settings_profiles_off">Profiller aus.</string>
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="accessibility_quick_settings_profiles_changed_off">Profiller ausgeschalt.</string>
   <string name="accessibility_quick_settings_profiles_changed">Profil op <xliff:g id="profile" example="Default">%s</xliff:g> geännert.</string>
   <string name="quick_settings_compass_init">Initialiséieren\u2026</string>
+  <string name="led_notification_title">Hellegkeetsastellungen</string>
+  <string name="led_notification_text">Notifikatiounsluucht duerch Astellungen aktivéieren</string>
+  <string name="qs_tile_edit_header_instruction">Dréck an haalt d\'Kachelen, fir se nei zouzeuerdnen</string>
+  <string name="quick_settings_edit_label">Kachelen änneren</string>
+  <string name="quick_settings_cannot_delete_edit_tile">\"Kachelen änneren\" kann net geläscht ginn</string>
+  <string name="qs_tiles_reset_confirmation">Kachele vun de Séieren Astellungen op de Standardlayout zrécksetzen?</string>
+  <string name="quick_settings_tile_reset_to_default">Zréck op den Standardlayout setzen</string>
+  <string name="quick_settings_title_header">Entête</string>
+  <string name="quick_settings_title_tiles">Kachelen</string>
+  <string name="quick_settings_title_show_weather">Wieder uweisen</string>
+  <string name="quick_settings_title_enlarge_first_row">Éischt Rei vergréisseren</string>
   <string name="screen_pinning_description_no_navbar">Doduerch bleift d\'App visibel bis se lassgeléist gëtt. Dréck den Zréck-Knäppchen an hal e gedréckt fir d\'App lasszeléisen.</string>
   <string name="quick_settings_custom_tile_detail_title">Eege Kachel</string>
   <string name="quick_settings_remove">Kachel läschen</string>
@@ -49,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Systemprofiller</string>
   <string name="quick_settings_profiles_off">Profiller desaktivéiert</string>
+  <string name="quick_settings_heads_up_label">Pop-Up-Notifikatiounen</string>
+  <string name="quick_settings_battery_saver_label">Akkuschouner</string>
   <string name="accessibility_quick_settings_sync_off">Synchronisatioun aus.</string>
   <string name="accessibility_quick_settings_sync_on">Synchronisatioun un.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synchronisatioun ausgeschalt.</string>
@@ -82,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambiente Schierm un.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambiente Schierm ausgeschalt.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambiente Schierm ugeschalt.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Pop-Up-Notifikatiounen aus.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Pop-Up-Notifikatiounen un.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Pop-Up-Notifikatiounen ausgeschalt.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Pop-Up-Notifikatiounen ugeschalt.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Akkuschouner aus.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Akkuschouner un.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Akkuschouner ausgeschalt.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Akkuschouner ugeschalt.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamesch Kachelen</string>
   <string name="dynamic_qs_tile_next_alarm_label">Nächste Wecker</string>
   <string name="dynamic_qs_tile_ime_selector_label">Method fir anzeginn</string>
@@ -96,6 +122,7 @@
   <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay-Modus op \"Dag\" geännert.</string>
   <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay-Modus op \"Nuecht\" geännert.</string>
   <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay-Modus op \"Dobaussen\" geännert.</string>
+  <string name="quick_settings_title_advanced_location">Standuert mat dräi Zoustänn</string>
   <string name="accessibility_quick_settings_location_battery_saving">Standuertbericht: Akku spueren.</string>
   <string name="accessibility_quick_settings_location_gps_only">Standuertbericht: Just Sensoren.</string>
   <string name="accessibility_quick_settings_location_high_accuracy">Standuertbericht: Héich Genauegkeet.</string>
@@ -106,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Standuertbericht op \"Akku spueren\" geännert.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Standuertbericht op \"Just Sensoren\" geännert.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Standuertbericht op \"Héich Genauegkeet\" geännert.</string>
+  <string name="quick_settings_tiles_category_system">System-Kachelen</string>
+  <string name="quick_settings_tiles_add_tiles">Kachelen dobäisetzen</string>
 </resources>
diff --git a/packages/SystemUI/res/values-lt/cm_strings.xml b/packages/SystemUI/res/values-lt/cm_strings.xml
index 0af0aae..71a070b 100644
--- a/packages/SystemUI/res/values-lt/cm_strings.xml
+++ b/packages/SystemUI/res/values-lt/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Sistemos profiliai</string>
   <string name="quick_settings_profiles_off">Profiliai neleidžiami</string>
+  <string name="quick_settings_heads_up_label">Iššokantys pranešimai</string>
+  <string name="quick_settings_battery_saver_label">Akumuliatoriaus tausojimas</string>
   <string name="accessibility_quick_settings_sync_off">Sinchronizavimas išjungtas.</string>
   <string name="accessibility_quick_settings_sync_on">Sinchronizavimas įjungtas.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sinchronizavimas išjungtas.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display įjungta.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display išjungta.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display įjungta.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Iššokantys pranešimai išjungti.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Iššokantys pranešimai įjungti.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Iššokantys pranešimai išjungti.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Iššokantys pranešimai įjungti.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Akumuliatoriaus tausojimas išjungtas.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Akumuliatoriaus tausojimas įjungtas.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Akumuliatoriaus tausojimas išjungtas.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Akumuliatoriaus tausojimas įjungtas.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dinaminė plytelė</string>
   <string name="dynamic_qs_tile_next_alarm_label">Kitas signalas</string>
   <string name="dynamic_qs_tile_ime_selector_label">Įvesties metodas</string>
diff --git a/packages/SystemUI/res/values-nb/cm_strings.xml b/packages/SystemUI/res/values-nb/cm_strings.xml
index d8630cf..51af5c6 100644
--- a/packages/SystemUI/res/values-nb/cm_strings.xml
+++ b/packages/SystemUI/res/values-nb/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">System profiler</string>
   <string name="quick_settings_profiles_off">Profiler deaktivert</string>
+  <string name="quick_settings_heads_up_label">Flytende notifikasjoner</string>
+  <string name="quick_settings_battery_saver_label">Batterisparing</string>
   <string name="accessibility_quick_settings_sync_off">Synkronisering av.</string>
   <string name="accessibility_quick_settings_sync_on">Synkronisering på.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synkronisering avskrudd.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient visning på.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient visning er skrudd av.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient visning er skrudd på.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up notifikasjoner er av.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up notifikasjoner er på.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up ble deaktivert.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads-up ble aktivert.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Batterisparing av.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Batterisparing på.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Batterisparing slått av.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Batterisparing slått på.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamisk flis</string>
   <string name="dynamic_qs_tile_next_alarm_label">Neste alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME-velger</string>
@@ -112,6 +122,7 @@
   <string name="accessibility_quick_settings_live_display_changed_day">Direkteskjerm endret til dagsmodus.</string>
   <string name="accessibility_quick_settings_live_display_changed_night">Direkteskjerm endret til nattmodus.</string>
   <string name="accessibility_quick_settings_live_display_changed_outdoor">Direkteskjerm endret til utendørs.</string>
+  <string name="quick_settings_title_advanced_location">Tre nivåer stedsangivelse</string>
   <string name="accessibility_quick_settings_location_battery_saving">Lokasjonsmodus: strømsparemodus.</string>
   <string name="accessibility_quick_settings_location_gps_only">Lokasjonsmodus: kun sensorer.</string>
   <string name="accessibility_quick_settings_location_high_accuracy">Lokasjonsmodus: høy nøyaktighet.</string>
@@ -122,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Lokasjonsmodus endret til batterisparing.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Lokasjonsmodus endret til bare sensorer.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Lokasjonsmodus endret til høy nøyaktighet.</string>
+  <string name="quick_settings_tiles_category_system">Systemet fliser</string>
+  <string name="quick_settings_tiles_add_tiles">Legge til en flis</string>
 </resources>
diff --git a/packages/SystemUI/res/values-nl/cm_strings.xml b/packages/SystemUI/res/values-nl/cm_strings.xml
index f06cadf..4d0f2e3 100644
--- a/packages/SystemUI/res/values-nl/cm_strings.xml
+++ b/packages/SystemUI/res/values-nl/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Systeemprofielen</string>
   <string name="quick_settings_profiles_off">Profielen uitgeschakeld</string>
+  <string name="quick_settings_heads_up_label">Heads-up</string>
+  <string name="quick_settings_battery_saver_label">Accubesparing</string>
   <string name="accessibility_quick_settings_sync_off">Synchr. uit.</string>
   <string name="accessibility_quick_settings_sync_on">Synchr. aan.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synchr. uitgeschakeld.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Omgevingsdisplay aan.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Omgevingsdisplay uitgeschakeld.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Omgevingsdisplay ingeschakeld.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads-up uit.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads-up aan.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up uitgeschakeld.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads-up ingeschakeld.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Accubesparing uit.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Accubesparing aan.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Accubesparing uitgeschakeld.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Accubesparing ingeschakeld.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamische tegel</string>
   <string name="dynamic_qs_tile_next_alarm_label">Volgend alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Invoermethode</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Locatiemelding gewijzigd naar accubesparing.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Locatiemelding gewijzigd naar alleen apparaat.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Locatiemelding gewijzigd naar grote nauwkeurigheid.</string>
+  <string name="quick_settings_tiles_category_system">Systeemtegels</string>
+  <string name="quick_settings_tiles_add_tiles">Tegel toevoegen</string>
 </resources>
diff --git a/packages/SystemUI/res/values-pl/cm_strings.xml b/packages/SystemUI/res/values-pl/cm_strings.xml
index 01ae7af..8570e2d 100644
--- a/packages/SystemUI/res/values-pl/cm_strings.xml
+++ b/packages/SystemUI/res/values-pl/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profile systemowe</string>
   <string name="quick_settings_profiles_off">Profile wyłączone</string>
+  <string name="quick_settings_heads_up_label">Wyskakujące powiadomienia</string>
+  <string name="quick_settings_battery_saver_label">Oszczędzanie baterii</string>
   <string name="accessibility_quick_settings_sync_off">Synchronizacja wyłączona.</string>
   <string name="accessibility_quick_settings_sync_on">Synchronizacja włączona.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synchronizacja została wyłączona.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Aktywny wyświetlacz włączony.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Aktywny wyświetlacz został wyłączony.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Aktywny wyświetlacz został włączony.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Wyskakujące powiadomienia wyłączone.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Wyskakujące powiadomienia włączone.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Wyskakujące powiadomienia zostały wyłączone.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Wyskakujące powiadomienia zostały włączone.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Oszczędzanie baterii wył.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Oszczędzanie baterii wł.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Oszczędzanie baterii zostało wył.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Oszczędzanie baterii zostało wł.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamiczne przełączniki</string>
   <string name="dynamic_qs_tile_next_alarm_label">Następny alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Przełącznik klawiatury</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Zgłaszanie lokalizacji przeszło w tryb oszczędzania energii.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Zgłaszanie lokalizacji przeszło w tryb \"tylko czujniki\".</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Zgłaszanie lokalizacji przeszło w tryb wysokiej dokładności.</string>
+  <string name="quick_settings_tiles_category_system">Kafelki systemowe</string>
+  <string name="quick_settings_tiles_add_tiles">Dodaj kafelek</string>
 </resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/cm_strings.xml b/packages/SystemUI/res/values-pt-rBR/cm_strings.xml
index 29548ec..454ca5c 100644
--- a/packages/SystemUI/res/values-pt-rBR/cm_strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfis de sistema</string>
   <string name="quick_settings_profiles_off">Perfis desativados</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Economizador de bateria</string>
   <string name="accessibility_quick_settings_sync_off">Sincr. desl.</string>
   <string name="accessibility_quick_settings_sync_on">Sincr. lig.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sincronização desligada.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Tela ambiente ativado.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Tela ambiente desligado.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Tela ambiente ligado.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up desativado.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up ativado.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up desligado.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up ligado.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Economizador de bateria desligado.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Economizador de bateria ligado.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">O economizador de bateria foi desligado.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">O economizador de bateria foi ligado.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Botões dinâmicos</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próximo alarme</string>
   <string name="dynamic_qs_tile_ime_selector_label">Seletor de IME</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Modo de localização alterado para apenas Wi-Fi e redes móveis.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Modo de localização alterado para apenas GPS.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Modo de localização alterado para GPS, Wi-Fi e redes móveis.</string>
+  <string name="quick_settings_tiles_category_system">Botões de sistema</string>
+  <string name="quick_settings_tiles_add_tiles">Adicionar um botão</string>
 </resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/cm_strings.xml b/packages/SystemUI/res/values-pt-rPT/cm_strings.xml
index 9962325..c60ba6d 100644
--- a/packages/SystemUI/res/values-pt-rPT/cm_strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfis de sistema</string>
   <string name="quick_settings_profiles_off">Perfis desativados</string>
+  <string name="quick_settings_heads_up_label">Notificações pop-up</string>
+  <string name="quick_settings_battery_saver_label">Economizador de bateria</string>
   <string name="accessibility_quick_settings_sync_off">Sincronização desligada.</string>
   <string name="accessibility_quick_settings_sync_on">Sincronização ligada.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sincronização foi desligada.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Visualização de ambiente ligada.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Visualização de ambiente desligou.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Visualização de ambiente ligou.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Notificações pop-up desligadas.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Notificações pop-up ligadas.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Notificações pop-up desligaram.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Notificações pop-up ligaram.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Economizador de bateria desligado.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Economizador de bateria ligado.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">O economizador de bateria desligou.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">O economizador de bateria ligou.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Mosaicos dinâmicos</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próximo alarme</string>
   <string name="dynamic_qs_tile_ime_selector_label">Seletor de IME</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Modo de localização alterado para poupança de bateria.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Modo de localização alterado para apenas no dispositivo.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Modo de localização alterado para alta precisão.</string>
+  <string name="quick_settings_tiles_category_system">Mosaicos do sistema</string>
+  <string name="quick_settings_tiles_add_tiles">Adicionar um mosaico</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ro/cm_strings.xml b/packages/SystemUI/res/values-ro/cm_strings.xml
index 83dcc8a..ef755f6 100644
--- a/packages/SystemUI/res/values-ro/cm_strings.xml
+++ b/packages/SystemUI/res/values-ro/cm_strings.xml
@@ -21,6 +21,7 @@
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <string name="left_shortcut_hint">Glisați dreapta pentru %1$s</string>
   <string name="right_shortcut_hint">Glisați stânga pentru %1$s</string>
+  <string name="lockscreen_default_target">Implicit</string>
   <string name="select_application">Selectați aplicația</string>
   <string name="lockscreen_choose_action_title">Alege acțiunea</string>
   <string name="lockscreen_none_target">Nimic</string>
@@ -53,6 +54,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profile de sistem</string>
   <string name="quick_settings_profiles_off">Profilele sunt dezactivate</string>
+  <string name="quick_settings_heads_up_label">Atenționare</string>
   <string name="accessibility_quick_settings_sync_off">Sincronizare oprită.</string>
   <string name="accessibility_quick_settings_sync_on">Sincronizare pornită.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sincronizare oprită.</string>
diff --git a/packages/SystemUI/res/values-ru/cm_strings.xml b/packages/SystemUI/res/values-ru/cm_strings.xml
index ee3b9a7..75c8f55 100644
--- a/packages/SystemUI/res/values-ru/cm_strings.xml
+++ b/packages/SystemUI/res/values-ru/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Системные профили</string>
   <string name="quick_settings_profiles_off">Профили отключены</string>
+  <string name="quick_settings_heads_up_label">Всплывающие уведомления</string>
+  <string name="quick_settings_battery_saver_label">Энергосбережение</string>
   <string name="accessibility_quick_settings_sync_off">Синхронизация отключена.</string>
   <string name="accessibility_quick_settings_sync_on">Синхронизация включена.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Синхронизация отключена.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Индикация событий экраном включена.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Индикация событий экраном отключена.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Индикация событий экраном включена.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Всплывающие уведомления отключены.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Всплывающие уведомления включены.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Всплывающие уведомления отключены.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Всплывающие уведомления включены.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Режим энергосбережения выключен.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Режим энергосбережения включён.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Режим энергосбережения выключен.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Режим энергосбережения включён.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Динамическая плитка</string>
   <string name="dynamic_qs_tile_next_alarm_label">Следующий будильник</string>
   <string name="dynamic_qs_tile_ime_selector_label">Выбор метода ввода</string>
@@ -123,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Служба отправки местоположения переключена в режим экономии батареи.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Для отправки местоположения используются только данные GPS.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Служба отправки местоположения переключена в режим высокой точности.</string>
+  <string name="quick_settings_tiles_category_system">Системные плитки</string>
+  <string name="quick_settings_tiles_add_tiles">Добавление плитки</string>
 </resources>
diff --git a/packages/SystemUI/res/values-sk/cm_strings.xml b/packages/SystemUI/res/values-sk/cm_strings.xml
index 9f3d042..6be4ea1 100644
--- a/packages/SystemUI/res/values-sk/cm_strings.xml
+++ b/packages/SystemUI/res/values-sk/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Systémové profily</string>
   <string name="quick_settings_profiles_off">Profily zakázané</string>
+  <string name="quick_settings_heads_up_label">Plávajúce oznámenia</string>
+  <string name="quick_settings_battery_saver_label">Šetrič batérie</string>
   <string name="accessibility_quick_settings_sync_off">Synch. vyp.</string>
   <string name="accessibility_quick_settings_sync_on">Synch. zap.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synchronizácia vypnutá.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambientné zobrazenie zakázané.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambientné zobrazenie povolené.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambientné zobrazenie zakázané.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Plávajúce oznámenia zakázané.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Plávajúce oznámenia povolené.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Plávajúce oznámenia zakázané.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Plávajúce oznámenia povolené.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Šetrič batérie vypnutý.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Šetrič batérie zapnutý.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Šetrič batérie vypnutý.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Šetrič batérie zapnutý.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamické dlaždice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Ďalší budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výber IME</string>
diff --git a/packages/SystemUI/res/values-sl/cm_strings.xml b/packages/SystemUI/res/values-sl/cm_strings.xml
index b081eac..0668c43 100644
--- a/packages/SystemUI/res/values-sl/cm_strings.xml
+++ b/packages/SystemUI/res/values-sl/cm_strings.xml
@@ -23,7 +23,7 @@
   <string name="right_shortcut_hint">Povlecite levo za %1$s</string>
   <string name="lockscreen_message">Tapnite ikono na levi ali desni, da ponovno dodelite bližnjico zaslona za zaklepanje.</string>
   <string name="lockscreen_default_target">Privzeto</string>
-  <string name="select_application">Izberite program</string>
+  <string name="select_application">Izberite aplikacijo</string>
   <string name="lockscreen_choose_action_title">Izberite dejanje</string>
   <string name="lockscreen_none_target">Brez</string>
   <string name="navbar_dialog_title">Izberite dejanje za dodelitev</string>
@@ -37,7 +37,7 @@
   <string name="navbar_menu_big_button">Menijski gumb</string>
   <string name="accessibility_dpad_left">Kazalec levo</string>
   <string name="accessibility_dpad_right">Kazalec desno</string>
-  <string name="advanced_dev_option_wipe_app">Izbriši podatke programe</string>
+  <string name="advanced_dev_option_wipe_app">Izbriši podatke aplikacije</string>
   <string name="advanced_dev_option_force_stop">Vsili ustavitev</string>
   <string name="advanced_dev_option_uninstall">Odstrani</string>
   <string name="accessibility_notification_brightness">Svetlost lučke</string>
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Sistemski profili</string>
   <string name="quick_settings_profiles_off">Profili onemogočeni</string>
+  <string name="quick_settings_heads_up_label">Obvestila na zaslonu</string>
+  <string name="quick_settings_battery_saver_label">Ohranjevalnik baterije</string>
   <string name="accessibility_quick_settings_sync_off">Sinhronizacija izklopljena.</string>
   <string name="accessibility_quick_settings_sync_on">Sinhronizacija vklopljena.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Sinhronizacija izklopljena.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Okoliški zaslon vklopljen.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Okoliški zaslon izklopljen.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Okoliški zaslon vklopljen.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Obvestila na zas. izk.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Obvestila na zas. vkl.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Obvestila na zaslonu izklopljena.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Obvestila na zaslonu vklopljena.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Ohranjevalnik baterije izklopljen.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Ohranjevalnik baterije vklopljen.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Ohranjevalnik baterije izklopljen.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Ohranjevalnik baterije vklopljen.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dinamične ploščice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Naslednja budilka</string>
   <string name="dynamic_qs_tile_ime_selector_label">Izbirnik IME</string>
@@ -123,4 +133,7 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Poročanje o lokaciji spremenjeno v način varčevanja energije.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Poročanje o lokaciji spremenjeno v način \'samo tipala\'.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Poročanje o lokaciji spremenjen v način visoke natančnosti.</string>
+  <string name="quick_settings_tiles_category_system">Sistemske ploščice</string>
+  <string name="quick_settings_tiles_add_tiles">Dodaj ploščico</string>
+  <string name="hotspot_apm_message">Povezava z mobilnimi omrežji ni možna v načinu za letalo. Onemogočite način za letalo in poskusite znova.</string>
 </resources>
diff --git a/packages/SystemUI/res/values-sr/cm_strings.xml b/packages/SystemUI/res/values-sr/cm_strings.xml
index 37a8f69..8b41c34 100644
--- a/packages/SystemUI/res/values-sr/cm_strings.xml
+++ b/packages/SystemUI/res/values-sr/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Профили система</string>
   <string name="quick_settings_profiles_off">Профили онемогућени</string>
+  <string name="quick_settings_heads_up_label">Искачуће поруке</string>
+  <string name="quick_settings_battery_saver_label">Уштеда батерије</string>
   <string name="accessibility_quick_settings_sync_off">Синхрон. искључено.</string>
   <string name="accessibility_quick_settings_sync_on">Синхрон. укључено.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Синхронизација је искључена.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Амбијент приказ укључен.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Амбијент приказ ће бити искључен.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Амбијент приказ ће бити укључен.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Искачуће поруке искључене.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Искачуће поруке укључене.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Искачуће поруке ће бити искључене.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Искачуће поруке ће бити укључене.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Уштеда батерије искључена.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Уштеда батерије укључена.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Уштеда батерије је искључена.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Уштеда батерије је укључена.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Динамичне плочице</string>
   <string name="dynamic_qs_tile_next_alarm_label">Следећи аларм</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME бирач</string>
@@ -123,4 +133,7 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Извештај о локацији промењен у режим уштеде батерије.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Извештај о локацији промењен у режим само сензора.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Извештај о локацији промењен у режим високе прецизности.</string>
+  <string name="quick_settings_tiles_category_system">Плочице система</string>
+  <string name="quick_settings_tiles_add_tiles">Додај плочицу</string>
+  <string name="hotspot_apm_message">Није се могуће конектовати на мобилне мреже док је режим авиона омогућен. Онемогући режим авиона и пробај поново.</string>
 </resources>
diff --git a/packages/SystemUI/res/values-sv/cm_strings.xml b/packages/SystemUI/res/values-sv/cm_strings.xml
index 7d0f40b..9577a38 100644
--- a/packages/SystemUI/res/values-sv/cm_strings.xml
+++ b/packages/SystemUI/res/values-sv/cm_strings.xml
@@ -52,6 +52,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Systemprofiler</string>
   <string name="quick_settings_profiles_off">Profiler inaktiverad</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="accessibility_quick_settings_sync_off">Synk av.</string>
   <string name="accessibility_quick_settings_sync_on">Synk på.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Synk inaktiverad.</string>
@@ -78,6 +79,10 @@
   <string name="accessibility_quick_settings_ambient_display_on">Omgivande skärm på.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Omgivande skärm avslagen.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Omgivande skärm påslagen.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up av.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up på.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up avslaget.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up påslaget.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dynamiska bricka</string>
   <string name="dynamic_qs_tile_next_alarm_label">Nästa alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME-väljare</string>
diff --git a/packages/SystemUI/res/values-th/cm_strings.xml b/packages/SystemUI/res/values-th/cm_strings.xml
index fba34af..2651986 100644
--- a/packages/SystemUI/res/values-th/cm_strings.xml
+++ b/packages/SystemUI/res/values-th/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">โปรไฟล์ระบบ</string>
   <string name="quick_settings_profiles_off">โปรไฟล์ถูกปิดอยู่</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">ประหยัดแบตเตอรี่</string>
   <string name="accessibility_quick_settings_sync_off">ปิดการซิงค์</string>
   <string name="accessibility_quick_settings_sync_on">การซิงค์เปิดอยู่</string>
   <string name="accessibility_quick_settings_sync_changed_off">การซิงค์ปิดอยู่</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">เปิดหน้าจอแวดล้อม</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">หน้าจอแวดล้อมปิดอยู่</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">หน้าจอแวดล้อมเปิดอยู่</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up ปิดอยู่</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up เปิดอยู่</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up ปิดอยู่</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up เปิดอยู่</string>
+  <string name="accessibility_quick_settings_battery_saver_off">ตัวประหยัดแบตเตอรี่ปิดอยู่</string>
+  <string name="accessibility_quick_settings_battery_saver_on">ตัวประหยัดแบตเตอรี่เปิดอยู่</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">ตัวประหยัดแบตเตอรีถูกปิด</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">ตัวประหยัดแบตเตอรีถูกเปิด</string>
   <string name="quick_settings_dynamic_tile_detail_title">ไทล์แบบไดนามิก</string>
   <string name="dynamic_qs_tile_next_alarm_label">การปลุกครั้งต่อไป</string>
   <string name="dynamic_qs_tile_ime_selector_label">ตัวเลือก IME</string>
diff --git a/packages/SystemUI/res/values-tr/cm_strings.xml b/packages/SystemUI/res/values-tr/cm_strings.xml
index ebf75e0..a70ea9e 100644
--- a/packages/SystemUI/res/values-tr/cm_strings.xml
+++ b/packages/SystemUI/res/values-tr/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Sistem profilleri</string>
   <string name="quick_settings_profiles_off">Profiller devre dışı</string>
+  <string name="quick_settings_heads_up_label">Bildirim pencereleri</string>
+  <string name="quick_settings_battery_saver_label">Pil tasarrufu</string>
   <string name="accessibility_quick_settings_sync_off">Eşitleme kapalı.</string>
   <string name="accessibility_quick_settings_sync_on">Eşitleme açık.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Eşitleme kapatıldı.</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Bildirim ekranı açık.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Bildirim ekranı kapatıldı.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Bildirim ekranı açıldı.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Bildirim pencereleri kapalı.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Bildirim pencereleri açık.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Bildirim pencereleri kapatıldı.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Bildirim pencereleri açıldı.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Pil tasarrufu kapalı.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Pil tasarrufu açık.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Pil tasarrufu kapatıldı.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Pil tasarrufu açıldı.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Dinamik kare</string>
   <string name="dynamic_qs_tile_next_alarm_label">Sonraki alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME seçici</string>
diff --git a/packages/SystemUI/res/values-uk/cm_strings.xml b/packages/SystemUI/res/values-uk/cm_strings.xml
index 05e3d4e..7168559 100644
--- a/packages/SystemUI/res/values-uk/cm_strings.xml
+++ b/packages/SystemUI/res/values-uk/cm_strings.xml
@@ -16,9 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <string name="left_shortcut_hint">Проведіть вправо для %1$s</string>
   <string name="right_shortcut_hint">Проведіть вліво для %1$s</string>
+  <string name="lockscreen_message">Натисніть на іконку ліворуч або праворуч для зміни ярлика екрану блокування.</string>
+  <string name="lockscreen_default_target">За замовчуванням</string>
   <string name="select_application">Вибрати програму</string>
   <string name="lockscreen_choose_action_title">Виберіть дію</string>
   <string name="lockscreen_none_target">НІчого</string>
@@ -36,11 +40,23 @@
   <string name="advanced_dev_option_wipe_app">Стерти дані програм</string>
   <string name="advanced_dev_option_force_stop">Примусово зупинити</string>
   <string name="advanced_dev_option_uninstall">Деінсталювати</string>
+  <string name="accessibility_notification_brightness">Яскравість</string>
   <string name="accessibility_quick_settings_profiles_off">Профілі вимкнено.</string>
   <string name="accessibility_quick_settings_profiles">Профіль: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="accessibility_quick_settings_profiles_changed_off">Профілі вимкнено.</string>
   <string name="accessibility_quick_settings_profiles_changed">Профіль змінено на <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Ініціалізація\u2026</string>
+  <string name="led_notification_title">Індикатор подій</string>
+  <string name="led_notification_text">Світлодіод увімкнено параметрами</string>
+  <string name="qs_tile_edit_header_instruction">Натисніть і утримуйте плитку, щоб змінити</string>
+  <string name="quick_settings_edit_label">Редагувати плитки</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Не вдалося видалити кнопку редагування</string>
+  <string name="qs_tiles_reset_confirmation">Відновити налаштування плиток за замовчуванням?</string>
+  <string name="quick_settings_tile_reset_to_default">Відновити за замовчуванням</string>
+  <string name="quick_settings_title_header">Заголовок</string>
+  <string name="quick_settings_title_tiles">Плитки</string>
+  <string name="quick_settings_title_show_weather">Показати погоду</string>
+  <string name="quick_settings_title_enlarge_first_row">Збільшити перший рядок</string>
   <string name="screen_pinning_description_no_navbar">Триматиме це перед Вами, доки не відкріпите. Торкніться й утримуйте кнопку «Назад», щоб відкріпити.</string>
   <string name="quick_settings_custom_tile_detail_title">Власна плитка</string>
   <string name="quick_settings_remove">Видалити плитку</string>
@@ -49,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Системні профілі</string>
   <string name="quick_settings_profiles_off">Профілі вимкнуто</string>
+  <string name="quick_settings_heads_up_label">Спливаючі сповіщення</string>
+  <string name="quick_settings_battery_saver_label">Енергозбереження</string>
   <string name="accessibility_quick_settings_sync_off">Синхронізацію вимкнено.</string>
   <string name="accessibility_quick_settings_sync_on">Синхронізацію увімкнено.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Синхронізацію вимкнено.</string>
@@ -62,12 +80,18 @@
   <string name="quick_settings_lockscreen_label_enforced">Блокування екрану ввімкнено</string>
   <string name="accessibility_quick_settings_screen_timeout">Вимкнення екрана через: <xliff:g id="timeout" example="30 seconds">%s</xliff:g> секунд.</string>
   <string name="accessibility_quick_settings_screen_timeout_changed">Вимкнення екрана відбувається через <xliff:g id="timeout" example="30 seconds">%s</xliff:g> секунд бездіяльності.</string>
+  <string name="qs_tile_performance">Енергоспоживання</string>
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Режим батареї: збереження енергії.</string>
   <string name="accessibility_quick_settings_perf_profile_bal">Режим батареї: збалансований режим.</string>
   <string name="accessibility_quick_settings_perf_profile_perf">Режим батареї: висока продуктивність.</string>
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Енергоспоживання: енергоефективне.</string>
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">Енергоспоживання: продуктивне.</string>
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Акумулятор тепер в режимі економії енергії.</string>
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Режим акумулятора змінено на збалансований.</string>
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Режим акумулятора змінено для високої продуктивності.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Енергоспоживання змінено на ефективне.</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Енергоспоживання змінено на продуктивне.</string>
+  <string name="quick_settings_performance_profile_detail_title">Енергоспоживання</string>
   <string name="accessibility_quick_settings_lock_screen_off">Блокування екрана вимкнено.</string>
   <string name="accessibility_quick_settings_lock_screen_on">Блокування екрана увімкнено.</string>
   <string name="accessibility_quick_settings_lock_screen_changed_off">Блокування екрана вимкнено.</string>
@@ -76,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display увімкнено.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient дисплей вимкнено.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display увімкнено.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Спливаючі сповіщення вимкнено.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Спливаючі сповіщення увімкнено.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Спливаючі сповіщення вимкнено.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Спливаючі сповіщення увімкнено.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Енергозбереження вимкнено.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Енергозбереження увімкнено.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Енергозбереження вимкнено.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Енергозбереження увімкнено.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Динамічні плитки</string>
   <string name="dynamic_qs_tile_next_alarm_label">Наступний сигнал</string>
   <string name="dynamic_qs_tile_ime_selector_label">Вибір способу вводу</string>
@@ -90,6 +122,7 @@
   <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay у денному режимі.</string>
   <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay у нічному режимі.</string>
   <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay у режимі «На вулиці».</string>
+  <string name="quick_settings_title_advanced_location">Параметри відправки геоданих</string>
   <string name="accessibility_quick_settings_location_battery_saving">Надсилання місця розташування: економія батареї.</string>
   <string name="accessibility_quick_settings_location_gps_only">Надсилання місця розташування: тільки датчики.</string>
   <string name="accessibility_quick_settings_location_high_accuracy">Надсилання місця розташування: висока точність.</string>
@@ -100,4 +133,6 @@
   <string name="accessibility_quick_settings_location_changed_battery_saving">Визначення місцезнаходження у режимі економії батареї.</string>
   <string name="accessibility_quick_settings_location_changed_gps_only">Визначення місцезнаходження тепер використовує лише датчики пристрою.</string>
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Визначення місцезнаходження у режимі високої точності.</string>
+  <string name="quick_settings_tiles_category_system">Системні плитки</string>
+  <string name="quick_settings_tiles_add_tiles">Додати плитку</string>
 </resources>
diff --git a/packages/SystemUI/res/values-vi/cm_strings.xml b/packages/SystemUI/res/values-vi/cm_strings.xml
index f343c99..d094a3e 100644
--- a/packages/SystemUI/res/values-vi/cm_strings.xml
+++ b/packages/SystemUI/res/values-vi/cm_strings.xml
@@ -49,6 +49,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Cấu hình hệ thống</string>
   <string name="quick_settings_profiles_off">Cấu hình bị vô hiệu hóa</string>
+  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_battery_saver_label">Trình tiết kiệm pin</string>
   <string name="accessibility_quick_settings_sync_off">Tắt đồng bộ.</string>
   <string name="accessibility_quick_settings_sync_on">Bật đồng bộ.</string>
   <string name="accessibility_quick_settings_sync_changed_off">Đã tắt đồng bộ.</string>
@@ -82,6 +84,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">Hiển thị môi trường xung quanh bật.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">Hiển thị môi trường xung quanh đã tắt.</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">Hiển thị môi trường xung quanh đã bật.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up tắt.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up bật.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up đã tắt.</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up đã bật.</string>
+  <string name="accessibility_quick_settings_battery_saver_off">Trình tiết kiệm pin: Tắt.</string>
+  <string name="accessibility_quick_settings_battery_saver_on">Trình tiết kiệm pin: Bật.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Đã tắt Trinh tiết kiệm pin.</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Đã bật Trình tiết kiệm pin.</string>
   <string name="quick_settings_dynamic_tile_detail_title">Kiểu xếp cạnh nhau động</string>
   <string name="dynamic_qs_tile_next_alarm_label">Báo thức tiếp theo</string>
   <string name="dynamic_qs_tile_ime_selector_label">Trình chọn IME</string>
diff --git a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
index 184413e..085d8ae 100644
--- a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
@@ -65,6 +65,8 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">情景模式</string>
   <string name="quick_settings_profiles_off">已禁用情景模式</string>
+  <string name="quick_settings_heads_up_label">浮动通知</string>
+  <string name="quick_settings_battery_saver_label">省电模式</string>
   <string name="accessibility_quick_settings_sync_off">同步关闭。</string>
   <string name="accessibility_quick_settings_sync_on">同步开启。</string>
   <string name="accessibility_quick_settings_sync_changed_off">同步已关闭。</string>
@@ -98,6 +100,14 @@
   <string name="accessibility_quick_settings_ambient_display_on">开启环境显示。</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">环境显示已关闭。</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">环境显示已开启。</string>
+  <string name="accessibility_quick_settings_heads_up_off">浮动通知关。</string>
+  <string name="accessibility_quick_settings_heads_up_on">浮动通知开。</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">浮动通知已关闭。</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">浮动通知已开启。</string>
+  <string name="accessibility_quick_settings_battery_saver_off">省电模式关闭。</string>
+  <string name="accessibility_quick_settings_battery_saver_on">省电模式开启。</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_off">已关闭省电模式。</string>
+  <string name="accessibility_quick_settings_battery_saver_changed_on">已开启省电模式。</string>
   <string name="quick_settings_dynamic_tile_detail_title">动态按钮</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一个闹铃</string>
   <string name="dynamic_qs_tile_ime_selector_label">输入法选择器</string>
diff --git a/packages/SystemUI/res/values-zh-rHK/cm_strings.xml b/packages/SystemUI/res/values-zh-rHK/cm_strings.xml
index 4ade399..9d6d7ed 100644
--- a/packages/SystemUI/res/values-zh-rHK/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/cm_strings.xml
@@ -43,6 +43,7 @@
   <string name="quick_settings_compass_label">指南針</string>
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">系統設定檔</string>
+  <string name="quick_settings_heads_up_label">浮動通知</string>
   <string name="accessibility_quick_settings_sync_off">已關閉同步。</string>
   <string name="accessibility_quick_settings_sync_on">已開啟同步。</string>
   <string name="accessibility_quick_settings_sync_changed_off">同步已關閉。</string>
@@ -65,6 +66,10 @@
   <string name="accessibility_quick_settings_lock_screen_on">已開啟鎖定螢幕功能。</string>
   <string name="accessibility_quick_settings_lock_screen_changed_off">已關閉鎖定螢幕功能。</string>
   <string name="accessibility_quick_settings_lock_screen_changed_on">已開啟鎖定螢幕功能。</string>
+  <string name="accessibility_quick_settings_heads_up_off">已關閉浮動通知。</string>
+  <string name="accessibility_quick_settings_heads_up_on">已開啟浮動通知。</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">已關閉浮動通知。</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">已開啟浮動通知。</string>
   <string name="quick_settings_dynamic_tile_detail_title">動態方塊</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index 8d46c24..b0953db 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -44,6 +44,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">系統設定檔</string>
   <string name="quick_settings_profiles_off">已停用設定檔</string>
+  <string name="quick_settings_heads_up_label">浮動通知</string>
   <string name="accessibility_quick_settings_sync_off">同步關閉</string>
   <string name="accessibility_quick_settings_sync_on">同步開啟</string>
   <string name="accessibility_quick_settings_sync_changed_off">同步已關閉</string>
@@ -58,6 +59,10 @@
   <string name="accessibility_quick_settings_ambient_display_on">環境顯示開啟</string>
   <string name="accessibility_quick_settings_ambient_display_changed_off">環境顯示已關閉</string>
   <string name="accessibility_quick_settings_ambient_display_changed_on">環境顯示已開啟</string>
+  <string name="accessibility_quick_settings_heads_up_off">浮動通知關閉</string>
+  <string name="accessibility_quick_settings_heads_up_on">浮動通知開啟</string>
+  <string name="accessibility_quick_settings_heads_up_changed_off">浮動通知已關閉</string>
+  <string name="accessibility_quick_settings_heads_up_changed_on">浮動通知已開啟</string>
   <string name="quick_settings_dynamic_tile_detail_title">動態磚</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml
index cfad226..86b87e4 100644
--- a/packages/SystemUI/res/values/cm_strings.xml
+++ b/packages/SystemUI/res/values/cm_strings.xml
@@ -89,6 +89,7 @@
     <string name="quick_settings_title_header">Header</string>
     <string name="quick_settings_title_tiles">Tiles</string>
     <string name="quick_settings_title_show_weather">Show weather</string>
+    <string name="quick_settings_title_show_brightness_slider">Show brightness slider</string>
     <string name="quick_settings_title_enlarge_first_row">Enlarge first row</string>
 
     <!-- Screen pinning dialog description (for devices without navbar) -->
@@ -237,4 +238,7 @@
     <string name="quick_settings_tiles_category_system">System tiles</string>
     <!-- detail header when adding a tile -->
     <string name="quick_settings_tiles_add_tiles">Add a tile</string>
+
+    <!-- Hotspot dialog message -->
+    <string name="hotspot_apm_message">Unable to connect to mobile networks while Airplane mode is enabled. Disable Airplane mode and try again.</string>
 </resources>
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 563dfa1..17fadbd 100755
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -1671,7 +1671,9 @@ public class KeyguardViewMediator extends SystemUI {
             // only play "unlock" noises if not on a call (since the incall UI
             // disables the keyguard)
             if (TelephonyManager.EXTRA_STATE_IDLE.equals(mPhoneState)) {
-                playSounds(false);
+                if (mShowing && mDeviceInteractive) {
+                    playSounds(false);
+                }
             }
 
             setShowingLocked(false);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
index 5769f58..0c5b71b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
@@ -202,8 +202,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 } else {
                     final int adjustedPosition = mEditing ? position - 1 : position;
                     QSPage page = mPages.get(adjustedPosition);
-
-                    container.addView(page, position);
+                    container.addView(page);
                     return page;
                 }
             }
@@ -376,6 +375,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             r.tile.setListening(mListening);
         }
         mFooter.setListening(mListening);
+        mQsPanelTop.setListening(mListening);
         if (mListening) {
             refreshAllTiles();
         }
@@ -512,6 +512,8 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     + tiles + "]");
         }
 
+        int currentViewPagerPage = mViewPager.getCurrentItem();
+
         if (mLastDragRecord != null && mRecords.indexOf(mLastDragRecord) == -1) {
             // the last removed record might be stored in mLastDragRecord if we just shifted
             // re-add it to the list so we'll clean it up below
@@ -527,6 +529,11 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         while (iterator.hasPrevious()) {
             DragTileRecord dr = (DragTileRecord) iterator.previous();
 
+            if (dr.page >= 0) {
+                // clean up view
+                mPages.get(dr.page).removeView(dr.tileView);
+            }
+
             if (tiles.contains(dr.tile)) {
                 if (DEBUG_TILES) {
                     Log.i(TAG, "caching tile: " + dr.tile);
@@ -536,8 +543,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 if (DEBUG_TILES) {
                     Log.i(TAG, "removing tile: " + dr.tile);
                 }
-                // clean up view
-                mPages.get(dr.page).removeView(dr.tileView);
 
                 // remove record
                 iterator.remove();
@@ -547,19 +552,21 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     final int childCount = mPages.get(dr.page).getChildCount();
 
                     if (childCount == 0) {
-                        // if current page is the current max page COUNT (off by 1) then move back
                         final int currentIndex = mViewPager.getCurrentItem();
-                        if (currentIndex == (getCurrentMaxPageCount()) + (mEditing ? 1 : 0)) {
-                            mViewPager.setCurrentItem(currentIndex - 1, false);
-                            mPagerAdapter.startUpdate(mViewPager);
-                            final int pageIndex = mEditing ? currentIndex - 1 : currentIndex;
-                            mPages.remove(pageIndex);
-                            mPagerAdapter.finishUpdate(mViewPager);
-                            mPagerAdapter.notifyDataSetChanged();
+                        if (currentIndex > 0 && currentViewPagerPage == currentIndex) {
+                            // if we are about to remove the page we are currently on, move back
+                            currentViewPagerPage--;
                         }
+                        final int pageIndex = dr.page + (mEditing ? 1 : 0);
+                        mPagerAdapter.startUpdate(mViewPager);
+                        mPagerAdapter.destroyItem(mViewPager, pageIndex, mPages.get(dr.page));
+                        mPagerAdapter.finishUpdate(mViewPager);
+                        mPagerAdapter.notifyDataSetChanged();
                     }
                 }
             }
+            dr.page = -1;
+            dr.destinationPage = -1;
         }
 
         // at this point recordMap should have all retained tiles, no new or old tiles
@@ -568,8 +575,14 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             Log.i(TAG, "record map delta: " + delta);
         }
         mRecords.ensureCapacity(tiles.size());
+
         mPagerAdapter.notifyDataSetChanged();
 
+        // even though we explicitly destroy old pages, without this call,
+        // the viewpager doesn't seem to want to pick up the fact that we have less pages
+        // and allows "empty" scrolls to the right where there is no page.
+        mViewPager.setAdapter(mPagerAdapter);
+
         // add new tiles
         for (int i = 0; i < tiles.size(); i++) {
             QSTile<?> tile = tiles.get(i);
@@ -601,10 +614,8 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     }
                     Collections.swap(mRecords, indexOf, i);
 
-                    record.destinationPage = tileDestPage;
-                    ensureDestinationPage(record);
                 }
-
+                record.destinationPage = tileDestPage;
             }
             if (record.page == -1) {
                 // add the view
@@ -616,6 +627,9 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             }
         }
 
+        // restore the visible page
+        mViewPager.setCurrentItem(currentViewPagerPage, false);
+
         if (isShowingDetail()) {
             mDetail.bringToFront();
         }
@@ -625,16 +639,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         requestLayout();
     }
 
-    private void ensureDestinationPage(DragTileRecord record) {
-        if (record.destinationPage != record.page) {
-            if (record.page >= 0) {
-                getPage(record.page).removeView(record.tileView);
-            }
-            getPage(record.destinationPage).addView(record.tileView);
-            record.page = record.destinationPage;
-        }
-    }
-
     private DragTileRecord makeRecord(final QSTile<?> tile) {
         if (DEBUG_TILES) {
             Log.d(TAG, "+++ makeRecord() called with " + "tile = [" + tile + "]");
@@ -729,13 +733,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         mHost.remove(spec);
     }
 
-    public void ensurePagerState() {
-        if (!isShowingDetail()) {
-            final boolean pagingEnabled = getVisibleTilePageCount() > 1 || mDragging || mEditing;
-            mViewPager.setPagingEnabled(pagingEnabled);
-        }
-    }
-
     public int getTilesPerPage(boolean firstPage) {
         if ((!mFirstRowLarge && firstPage) || !firstPage) {
             return QSTileHost.TILES_PER_PAGE + 1;
@@ -759,7 +756,8 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         mPageIndicator.measure(exactly(width), atMost(mPageIndicatorHeight));
         mFooter.getView().measure(exactly(width), MeasureSpec.UNSPECIFIED);
 
-        int h = mViewPager.getMeasuredHeight() + mPageIndicatorHeight;
+        int h = getRowTop(getCurrentMaxRow() + 1) + mPanelPaddingBottom;
+
         if (mFooter.hasFooter()) {
             h += mFooter.getView().getMeasuredHeight();
         }
@@ -854,12 +852,10 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         if (!isShowingDetail() && !isClosingDetail()) {
             mQsPanelTop.bringToFront();
         }
-
-        ensurePagerState();
     }
 
     protected int getRowTop(int row) {
-        int baseHeight = mBrightnessView.getMeasuredHeight();
+        int baseHeight = mQsPanelTop.getMeasuredHeight();
         if (row <= 0) return baseHeight;
         return baseHeight + mLargeCellHeight - mDualTileUnderlap + (row - 1) * mCellHeight;
     }
@@ -1728,22 +1724,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         }
     }
 
-    @Override
-    protected void setGridContentVisibility(boolean visible) {
-        int newVis = visible ? VISIBLE : INVISIBLE;
-        for (int i = 0; i < mRecords.size(); i++) {
-            TileRecord tileRecord = mRecords.get(i);
-            if (tileRecord.tileView.getVisibility() != GONE) {
-                tileRecord.tileView.setVisibility(newVis);
-            }
-        }
-        mQsPanelTop.setVisibility(showBrightnessSlider() ? newVis : GONE);
-        if (mGridContentVisible != visible) {
-            MetricsLogger.visibility(mContext, MetricsLogger.QS_PANEL, newVis);
-        }
-        mGridContentVisible = visible;
-    }
-
     public void updateResources() {
         final Resources res = mContext.getResources();
         final int columns = Math.max(1, res.getInteger(R.integer.quick_settings_num_columns));
@@ -1755,11 +1735,11 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         mDualTileUnderlap = res.getDimensionPixelSize(R.dimen.qs_dual_tile_padding_vertical);
         mBrightnessPaddingTop = res.getDimensionPixelSize(R.dimen.qs_brightness_padding_top);
         mPageIndicatorHeight = res.getDimensionPixelSize(R.dimen.qs_panel_page_indicator_height);
+        if (mColumns != columns) {
+            mColumns = columns;
+            if (isLaidOut()) postInvalidate();
+        }
         if (isLaidOut()) {
-            if (mColumns != columns) {
-                mColumns = columns;
-                postInvalidate();
-            }
             for (TileRecord r : mRecords) {
                 r.tile.clearState();
             }
@@ -1774,6 +1754,12 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         return mCurrentlyAnimating.contains(t);
     }
 
+    public void cleanup() {
+        if (mSettingsObserver != null) {
+            mSettingsObserver.unobserve();
+        }
+    }
+
     public static class TilesListAdapter extends BaseExpandableListAdapter
             implements QSTile.DetailAdapter {
 
@@ -2107,6 +2093,10 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         return mRecords.indexOf(mDraggingRecord) >= 0;
     }
 
+    public boolean isOnSettingsPage() {
+        return mEditing && mViewPager.getCurrentItem() == 0;
+    }
+
     public void goToSettingsPage() {
         if (mEditing) {
             mViewPager.setCurrentItem(0, true);
@@ -2144,6 +2134,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     CMSettings.Secure.QS_USE_MAIN_TILES, 1, currentUserId) == 1;
             if (firstRowLarge != mFirstRowLarge) {
                 mFirstRowLarge = firstRowLarge;
+                setTiles(new ArrayList<QSTile<?>>()); // clear out states
                 setTiles(mHost.getTiles());
             }
         }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPage.java b/packages/SystemUI/src/com/android/systemui/qs/QSPage.java
index 57b559e..b06ad35 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPage.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPage.java
@@ -97,7 +97,7 @@ public class QSPage extends ViewGroup {
             record.tileView.measure(exactly(cw), exactly(ch));
             previousView = record.tileView.updateAccessibilityOrder(previousView);
         }
-        setMeasuredDimension(width, exactly(mGridHeight));
+        setMeasuredDimension(width, mGridHeight);
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
index bfff5f2..35cd929 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
@@ -20,7 +20,11 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.annotation.Nullable;
+import android.app.ActivityManager;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.os.Handler;
+import android.os.UserHandle;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -29,6 +33,10 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.android.systemui.R;
+import com.android.systemui.cm.UserContentObserver;
+import com.android.systemui.settings.ToggleSlider;
+
+import cyanogenmod.providers.CMSettings;
 
 public class QSPanelTopView extends FrameLayout {
 
@@ -46,10 +54,14 @@ public class QSPanelTopView extends FrameLayout {
     private boolean mDisplayingInstructions = false;
     private boolean mDisplayingTrash = false;
     private boolean mDisplayingToast = false;
+    public boolean mHasBrightnessSliderToDisplay = true;
 
     private AnimatorSet mAnimator;
     private ImageView mDropTargetIcon;
 
+    private SettingsObserver mSettingsObserver;
+    private boolean mListening;
+
     public QSPanelTopView(Context context, @Nullable AttributeSet attrs) {
         this(context, attrs, 0);
     }
@@ -62,6 +74,7 @@ public class QSPanelTopView extends FrameLayout {
                           int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         setFocusable(true);
+        mSettingsObserver = new SettingsObserver(new Handler());
     }
 
     @Override
@@ -100,13 +113,19 @@ public class QSPanelTopView extends FrameLayout {
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         final int width = MeasureSpec.getSize(widthMeasureSpec);
         mBrightnessView.measure(QSDragPanel.exactly(width), MeasureSpec.UNSPECIFIED);
-        int dh = mBrightnessView.getMeasuredHeight();
+        mEditTileInstructionView.measure(QSDragPanel.exactly(width), MeasureSpec.UNSPECIFIED);
+        mToastView.measure(QSDragPanel.exactly(width), MeasureSpec.UNSPECIFIED);
+
+        // if we are showing a brightness slider, always fit to that, otherwise only
+        // declare a height when editing.
+        int dh = mHasBrightnessSliderToDisplay ? mBrightnessView.getMeasuredHeight()
+                : mEditing ? mEditTileInstructionView.getMeasuredHeight() : 0;
 
         mDropTarget.measure(QSDragPanel.exactly(width), QSDragPanel.atMost(dh));
         mEditTileInstructionView.measure(QSDragPanel.exactly(width), QSDragPanel.atMost(dh));
         mToastView.measure(QSDragPanel.exactly(width), QSDragPanel.atMost(dh));
 
-        setMeasuredDimension(width, QSDragPanel.exactly(mBrightnessView.getMeasuredHeight()));
+        setMeasuredDimension(width, dh);
     }
 
     @Override
@@ -178,38 +197,36 @@ public class QSPanelTopView extends FrameLayout {
             mAnimator.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationStart(Animator animation) {
-                    setLayerType(LAYER_TYPE_HARDWARE, null);
-
-                    mDropTarget.setLayerType(LAYER_TYPE_HARDWARE, null);
-                    mEditTileInstructionView.setLayerType(LAYER_TYPE_HARDWARE, null);
-                    mBrightnessView.setLayerType(LAYER_TYPE_HARDWARE, null);
-                    mToastView.setLayerType(LAYER_TYPE_HARDWARE, null);
-
-                    mDropTarget.setVisibility(View.VISIBLE);
-                    mEditTileInstructionView.setVisibility(View.VISIBLE);
-                    mBrightnessView.setVisibility(View.VISIBLE);
-                    mToastView.setVisibility(View.VISIBLE);
-
-                    if (showToast) {
-                        mToastView.bringToFront();
+                    // if the view is already visible, keep it visible on animation start
+                    // to animate it out, otherwise set it as invisible (to not affect view height)
+                    mEditTileInstructionView.setVisibility(
+                            getVisibilityForAnimation(mEditTileInstructionView, showInstructions));
+                    mDropTarget.setVisibility(
+                            getVisibilityForAnimation(mDropTarget, showTrash));
+                    mToastView.setVisibility(
+                            getVisibilityForAnimation(mToastView, showToast));
+                    if (mHasBrightnessSliderToDisplay) {
+                        mBrightnessView.setVisibility(
+                                getVisibilityForAnimation(mBrightnessView, showBrightness));
                     }
                 }
 
                 @Override
                 public void onAnimationEnd(Animator animation) {
                     mToastView.setVisibility(showToast ? View.VISIBLE : View.GONE);
-                    mEditTileInstructionView.setVisibility(showInstructions ? View.VISIBLE : View.GONE);
+                    mEditTileInstructionView.setVisibility(showInstructions
+                            ? View.VISIBLE : View.GONE);
                     mDropTarget.setVisibility(showTrash ? View.VISIBLE : View.GONE);
-                    mBrightnessView.setVisibility(showBrightness ? View.VISIBLE : View.GONE);
+                    if (mHasBrightnessSliderToDisplay) {
+                        mBrightnessView.setVisibility(showBrightness ? View.VISIBLE : View.GONE);
+                    }
 
-                    setLayerType(LAYER_TYPE_NONE, null);
+                    mAnimator = null;
 
-                    mDropTarget.setLayerType(LAYER_TYPE_NONE, null);
-                    mEditTileInstructionView.setLayerType(LAYER_TYPE_NONE, null);
-                    mBrightnessView.setLayerType(LAYER_TYPE_NONE, null);
-                    mToastView.setLayerType(LAYER_TYPE_NONE, null);
+                    requestLayout();
 
                     if (showToast) {
+                        mToastView.bringToFront();
                         mToastView.postDelayed(new Runnable() {
                             @Override
                             public void run() {
@@ -230,12 +247,19 @@ public class QSPanelTopView extends FrameLayout {
         }
     };
 
+    private int getVisibilityForAnimation(View view, boolean show) {
+        if (show || view.getVisibility() != View.GONE) {
+            return View.VISIBLE;
+        }
+        return View.INVISIBLE;
+    }
+
     private void animateToState() {
         post(mAnimateRunnable);
     }
+
     private Animator animateView(View v, boolean show) {
-        return ObjectAnimator.ofFloat(v, "translationY",
-                show ? 0 : -mBrightnessView.getMeasuredHeight());
+        return ObjectAnimator.ofFloat(v, "translationY", show ? 0 : -getMeasuredHeight());
     }
 
     private Animator showBrightnessSlider(boolean show) {
@@ -253,4 +277,66 @@ public class QSPanelTopView extends FrameLayout {
     private Animator showToast(boolean show) {
         return animateView(mToastView, show);
     }
+
+    public void setListening(boolean listening) {
+        if (mListening == listening) return;
+        mListening = listening;
+        if (mListening) {
+            mSettingsObserver.observe();
+        } else {
+            mSettingsObserver.unobserve();
+        }
+
+    }
+
+    class SettingsObserver extends UserContentObserver {
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        @Override
+        protected void observe() {
+            super.observe();
+
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(CMSettings.System.getUriFor(
+                    CMSettings.System.QS_SHOW_BRIGHTNESS_SLIDER), false, this, UserHandle.USER_ALL);
+            update();
+        }
+
+        @Override
+        protected void unobserve() {
+            super.unobserve();
+
+            ContentResolver resolver = mContext.getContentResolver();
+            resolver.unregisterContentObserver(this);
+        }
+
+        @Override
+        public void update() {
+            ContentResolver resolver = mContext.getContentResolver();
+            int currentUserId = ActivityManager.getCurrentUser();
+            boolean showSlider = CMSettings.System.getIntForUser(resolver,
+                    CMSettings.System.QS_SHOW_BRIGHTNESS_SLIDER, 1, currentUserId) == 1;
+            if (showSlider != mHasBrightnessSliderToDisplay) {
+                if (mAnimator != null) {
+                    mAnimator.cancel(); // cancel everything we're animating
+                    mAnimator = null;
+                }
+                mHasBrightnessSliderToDisplay = showSlider;
+                if (mBrightnessView != null) {
+                    mBrightnessView.setVisibility(showSlider ? View.VISIBLE : View.GONE);
+
+                    // as per showBrightnessSlider() in QSPanel.java, we look it up on-the-go
+                    ToggleSlider brightnessSlider = (ToggleSlider) findViewById(R.id.brightness_slider);
+                    if (brightnessSlider != null) {
+                        brightnessSlider.setVisibility(showSlider ? View.VISIBLE : View.GONE);
+                    }
+
+                }
+                getParent().requestLayout();
+                animateToState();
+            }
+        }
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSSettings.java b/packages/SystemUI/src/com/android/systemui/qs/QSSettings.java
index d90c991..7766ca4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSSettings.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSSettings.java
@@ -20,23 +20,25 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
+
 import com.android.systemui.R;
 import com.android.systemui.statusbar.phone.QSTileHost;
 import com.android.systemui.statusbar.phone.SystemUIDialog;
 
-public class QSSettings extends LinearLayout {
+public class QSSettings extends ScrollView {
+
     private QSTileHost mHost;
 
     private boolean mAdapterEditingState;
 
-    public QSSettings(Context context) {
-        super(context);
-    }
-
     public QSSettings(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
+        setFillViewport(true);
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSViewPager.java b/packages/SystemUI/src/com/android/systemui/qs/QSViewPager.java
index 01c48b1..3dc5d27 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSViewPager.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSViewPager.java
@@ -14,7 +14,7 @@ public class QSViewPager extends ViewPager {
     private static final String TAG = "QSViewPager";
 
     protected static final float SCROLL_PERCENT = .10f;
-    private boolean mPagingEnabled;
+
     QSDragPanel mDragPanel;
 
     public QSViewPager(Context context) {
@@ -34,7 +34,6 @@ public class QSViewPager extends ViewPager {
     public boolean canScrollHorizontally(int direction) {
         if (direction < 0
                 && mDragPanel.isDragging()
-                && mPagingEnabled
                 && getCurrentItem() == 1) {
             // can't scroll left while not editing, OR dragging on the first page
             return false;
@@ -49,7 +48,7 @@ public class QSViewPager extends ViewPager {
             View child = getChildAt(i);
             child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
             int h = child.getMeasuredHeight();
-            if (h > height) height = h;
+            if (h > height && !(child instanceof QSSettings)) height = h;
         }
         heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ -103,30 +102,4 @@ public class QSViewPager extends ViewPager {
             Log.e(TAG, "can't start fake drag?");
         }
     }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent event) {
-        if (mPagingEnabled) {
-            return super.onInterceptTouchEvent(event);
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (mPagingEnabled) {
-            return super.onTouchEvent(event);
-        }
-        return false;
-    }
-
-    public void setPagingEnabled(boolean enabled) {
-        if (mPagingEnabled == enabled) return;
-        mPagingEnabled = enabled;
-        //Log.i(TAG, "setPagingEnabled() called with " + "enabled = [" + enabled + "]");
-        if (getCurrentItem() > 0 && !mPagingEnabled) {
-            //Log.w(TAG, "resetting to item 0 because paging is disabled.");
-            setCurrentItem(0, true);
-        }
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
index 4173efc..d1b167e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -21,12 +21,14 @@ import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.provider.Settings;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.systemui.Prefs;
 import com.android.systemui.R;
 import com.android.systemui.qs.QSTile;
 import com.android.systemui.qs.UsageTracker;
+import com.android.systemui.statusbar.phone.SystemUIDialog;
 import com.android.systemui.statusbar.policy.HotspotController;
 
 /** Quick settings tile: Hotspot **/
@@ -72,6 +74,17 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
 
     @Override
     protected void handleClick() {
+        boolean airplaneMode = (Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) == 1);
+        if (airplaneMode) {
+            SystemUIDialog d = new SystemUIDialog(mContext);
+            d.setTitle(R.string.quick_settings_hotspot_label);
+            d.setMessage(R.string.hotspot_apm_message);
+            d.setPositiveButton(com.android.internal.R.string.ok, null);
+            d.setShowForAllUsers(true);
+            d.show();
+            return;
+        }
         final boolean isEnabled = (Boolean) mState.value;
         MetricsLogger.action(mContext, getMetricsCategory(), !isEnabled);
         mController.setHotspotEnabled(!isEnabled);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
index b25390e..abc9acd 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java
@@ -20,6 +20,7 @@ package com.android.systemui.qs.tiles;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.os.Looper;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
@@ -131,16 +132,28 @@ public class WifiTile extends QSTile<QSTile.SignalState> {
     protected void handleUpdateState(SignalState state, Object arg) {
         state.visible = true;
         if (DEBUG) Log.d(TAG, "handleUpdateState arg=" + arg);
-        CallbackInfo cb = (CallbackInfo) arg;
-        if (cb == null) {
+        final CallbackInfo cb;
+        if (arg == null) {
             cb = mSignalCallback.mInfo;
+        } else {
+            cb = (CallbackInfo) arg;
         }
 
         boolean wifiConnected = cb.enabled && (cb.wifiSignalIconId > 0) && (cb.enabledDesc != null);
         boolean wifiNotConnected = (cb.wifiSignalIconId > 0) && (cb.enabledDesc == null);
         boolean enabledChanging = state.enabled != cb.enabled;
         if (enabledChanging) {
-            mDetailAdapter.setItemsVisible(cb.enabled);
+            if (Looper.myLooper() == Looper.getMainLooper()) {
+                // on main thread, bypass the handler
+                mDetailAdapter.setItemsVisible(cb.enabled);
+            } else {
+                mUiHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mDetailAdapter.setItemsVisible(cb.enabled);
+                    }
+                });
+            }
             fireToggleStateChanged(cb.enabled);
         }
         state.enabled = cb.enabled;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
index d38c704..2233d13 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
@@ -203,8 +203,10 @@ public class SignalClusterView
         post(new Runnable() {
             @Override
             public void run() {
-                mVpnVisible = mSC.isVpnEnabled();
-                apply();
+                if (mSC != null) {
+                    mVpnVisible = mSC.isVpnEnabled();
+                    apply();
+                }
             }
         });
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index bac835c..db5446e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -63,7 +63,7 @@ import com.android.systemui.EventLogConstants;
 import com.android.systemui.EventLogTags;
 import com.android.systemui.R;
 import com.android.systemui.qs.QSContainer;
-import com.android.systemui.qs.QSPanel;
+import com.android.systemui.qs.QSDragPanel;
 import com.android.systemui.statusbar.ExpandableNotificationRow;
 import com.android.systemui.statusbar.ExpandableView;
 import com.android.systemui.statusbar.FlingAnimationUtils;
@@ -119,7 +119,7 @@ public class NotificationPanelView extends PanelView implements
     private KeyguardUserSwitcher mKeyguardUserSwitcher;
     private KeyguardStatusBarView mKeyguardStatusBar;
     private QSContainer mQsContainer;
-    private QSPanel mQsPanel;
+    private QSDragPanel mQsPanel;
     private KeyguardStatusView mKeyguardStatusView;
     private ObservableScrollView mScrollView;
     private TextView mClockView;
@@ -248,7 +248,7 @@ public class NotificationPanelView extends PanelView implements
     private Handler mHandler = new Handler();
     private SettingsObserver mSettingsObserver;
 
-    private boolean mOneFingerQuickSettingsIntercept;
+    private int mOneFingerQuickSettingsIntercept;
     private boolean mDoubleTapToSleepEnabled;
     private int mStatusBarHeaderHeight;
     private GestureDetector mDoubleTapGesture;
@@ -281,7 +281,7 @@ public class NotificationPanelView extends PanelView implements
         mKeyguardStatusBar = (KeyguardStatusBarView) findViewById(R.id.keyguard_header);
         mKeyguardStatusView = (KeyguardStatusView) findViewById(R.id.keyguard_status_view);
         mQsContainer = (QSContainer) findViewById(R.id.quick_settings_container);
-        mQsPanel = (QSPanel) findViewById(R.id.quick_settings_panel);
+        mQsPanel = (QSDragPanel) findViewById(R.id.quick_settings_panel);
         mClockView = (TextView) findViewById(R.id.clock_view);
         mScrollView = (ObservableScrollView) findViewById(R.id.scroll_view);
         mScrollView.setFocusable(false);
@@ -628,6 +628,14 @@ public class NotificationPanelView extends PanelView implements
             MetricsLogger.count(mContext, COUNTER_PANEL_OPEN_PEEK, 1);
             return true;
         }
+        if (mQsPanel.isOnSettingsPage() && isInQsArea(event.getX(), event.getY(), false)
+                && mQsExpanded) {
+            mIntercepting = false;
+            // we explicitly do not intercept the touch event here to let the qs settings page
+            // scroll as necessary while not blocking horizontal swipes and allowing the panel
+            // to be collapsed when grabbed below the qs settings page as well.
+            return false;
+        }
         if (!isFullyCollapsed() && onQsIntercept(event)) {
             return true;
         }
@@ -861,9 +869,14 @@ public class NotificationPanelView extends PanelView implements
     }
 
     private boolean isInQsArea(float x, float y) {
+        return isInQsArea(x, y, true);
+    }
+
+    private boolean isInQsArea(float x, float y, boolean includeNotifications) {
         return (x >= mScrollView.getX() && x <= mScrollView.getX() + mScrollView.getWidth()) &&
-                (y <= mNotificationStackScroller.getBottomMostNotificationBottom()
-                || y <= mQsContainer.getY() + mQsContainer.getHeight());
+                ((includeNotifications
+                        && y <= mNotificationStackScroller.getBottomMostNotificationBottom())
+                        || y <= mQsContainer.getY() + mQsContainer.getHeight());
     }
 
     private boolean isOpenQsEvent(MotionEvent event) {
@@ -884,9 +897,17 @@ public class NotificationPanelView extends PanelView implements
         final float w = getMeasuredWidth();
         final float x = event.getX();
         float region = (w * (1.f/4.f)); // TODO overlay region fraction?
-        final boolean showQsOverride = mOneFingerQuickSettingsIntercept &&
-                (isLayoutRtl() ? (x < region) : (w - region < x)
-                        && mStatusBarState == StatusBarState.SHADE);
+        boolean showQsOverride = false;
+
+        switch (mOneFingerQuickSettingsIntercept) {
+            case 1: // Right side pulldown
+                showQsOverride = isLayoutRtl() ? (x < region) : (w - region < x);
+                break;
+            case 2: // Left side pulldown
+                showQsOverride = isLayoutRtl() ? (w - region < x) : (x < region);
+                break;
+        }
+        showQsOverride &= mStatusBarState == StatusBarState.SHADE;
 
         return twoFingerDrag || showQsOverride || stylusButtonClickDrag || mouseButtonClickDrag;
     }
@@ -2592,7 +2613,7 @@ public class NotificationPanelView extends PanelView implements
         public void update() {
             ContentResolver resolver = mContext.getContentResolver();
             mOneFingerQuickSettingsIntercept = CMSettings.System.getInt(
-                    resolver, CMSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 1) == 1;
+                    resolver, CMSettings.System.STATUS_BAR_QUICK_QS_PULLDOWN, 1);
             mDoubleTapToSleepEnabled = CMSettings.System.getInt(
                     resolver, CMSettings.System.DOUBLE_TAP_SLEEP_GESTURE, 1) == 1;
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index 9a8fa98..f5cdcd1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.phone;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
 import android.animation.ValueAnimator;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -26,6 +27,7 @@ import android.content.res.Resources;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
+import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewTreeObserver;
 import android.view.animation.AnimationUtils;
@@ -90,6 +92,20 @@ public abstract class PanelView extends FrameLayout {
 
     private final PerformanceManager mPerf;
 
+    private boolean mUpdateExpandOnLayout;
+    private View.OnLayoutChangeListener mLayoutChangeListener = new OnLayoutChangeListener() {
+        @Override
+        public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                int oldLeft, int oldTop, int oldRight, int oldBottom) {
+            // update expand height
+            if (mHeightAnimator != null && mExpanding && mUpdateExpandOnLayout) {
+                final int maxPanelHeight = getMaxPanelHeight();
+                final PropertyValuesHolder[] values = mHeightAnimator.getValues();
+                values[0].setFloatValues(maxPanelHeight);
+            }
+        }
+    };
+
     /**
      * Whether an instant expand request is currently pending and we are just waiting for layout.
      */
@@ -641,7 +657,7 @@ public abstract class PanelView extends FrameLayout {
         flingToHeight(vel, expand, target, collapseSpeedUpFactor, expandBecauseOfFalsing);
     }
 
-    protected void flingToHeight(float vel, boolean expand, float target,
+    protected void flingToHeight(float vel, final boolean expand, float target,
             float collapseSpeedUpFactor, boolean expandBecauseOfFalsing) {
         // Hack to make the expand transition look nice when clear all button is visible - we make
         // the animation only to the last notification, and then jump to the maximum panel height so
@@ -662,6 +678,7 @@ public abstract class PanelView extends FrameLayout {
             if (expandBecauseOfFalsing) {
                 vel = 0;
             }
+            mUpdateExpandOnLayout = isFullyCollapsed();
             mFlingAnimationUtils.apply(animator, mExpandedHeight, target, vel, getHeight());
             if (expandBecauseOfFalsing) {
                 animator.setDuration(350);
@@ -684,12 +701,18 @@ public abstract class PanelView extends FrameLayout {
             private boolean mCancelled;
 
             @Override
+            public void onAnimationStart(Animator animation) {
+                if (expand) PanelView.this.addOnLayoutChangeListener(mLayoutChangeListener);
+            }
+
+            @Override
             public void onAnimationCancel(Animator animation) {
                 mCancelled = true;
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
+                if (expand) PanelView.this.removeOnLayoutChangeListener(mLayoutChangeListener);
                 if (clearAllExpandHack && !mCancelled) {
                     setExpandedHeightInternal(getMaxPanelHeight());
                 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 6e104ad..41fd86a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1168,6 +1168,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                 mBrightnessMirrorController = new BrightnessMirrorController(mStatusBarWindowContent);
             }
             mQSPanel.setBrightnessMirror(mBrightnessMirrorController);
+            mQSPanel.setTiles(mQSTileHost.getTiles());
             mHeader.setQSPanel(mQSPanel);
             mQSTileHost.setCallback(new QSTileHost.Callback() {
                 @Override
@@ -1182,6 +1183,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
                 @Override
                 public void setEditing(final boolean editing) {
+                    if (mState != StatusBarState.SHADE) {
+                        return;
+                    }
                     mHandler.post(new Runnable() {
                         @Override
                         public void run() {
@@ -1198,6 +1202,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
                 @Override
                 public void goToSettingsPage() {
+                    if (mState != StatusBarState.SHADE) {
+                        return;
+                    }
                     setEditing(true);
                     mHandler.postDelayed(new Runnable() {
                         @Override
@@ -1223,9 +1230,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                                 Log.e(TAG, "Unable to unregister custom tile listener", e);
                             }
 
-                            // clear out old tile states and views
-                            mQSPanel.setTiles(new ArrayList<QSTile<?>>());
-
                             mQSTileHost.resetTiles();
 
                             // reregister service
@@ -3734,7 +3738,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         }
 
         mQSPanel.getHost().setCustomTileListenerService(null);
-        mQSPanel.setTiles(new ArrayList<QSTile<?>>());
+        mQSPanel.setListening(false);
 
         makeStatusBarView();
         repositionNavigationBar();
@@ -3772,7 +3776,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             @Override
             public void onGlobalLayout() {
                 mStatusBarWindow.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                mQSPanel.setTiles(mQSTileHost.getTiles());
                 mCommandQueue.resume();
                 mRecreating = false;
             }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
index 1b17899..ed4880b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
@@ -182,6 +182,9 @@ public class PhoneStatusBarPolicy implements Callback {
         // bluetooth status
         updateBluetooth();
 
+        //Update initial tty mode
+        updateTTYMode();
+
         // Alarm clock
         mService.setIcon(SLOT_ALARM_CLOCK, R.drawable.stat_sys_alarm, 0, null);
         mService.setIconVisibility(SLOT_ALARM_CLOCK, false);
@@ -391,6 +394,29 @@ public class PhoneStatusBarPolicy implements Callback {
         }
     }
 
+    private boolean isWiredHeadsetOn() {
+        AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        return audioManager.isWiredHeadsetOn();
+    }
+
+    private final void updateTTYMode() {
+        int ttyMode = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.PREFERRED_TTY_MODE, TelecomManager.TTY_MODE_OFF);
+        boolean enabled = ttyMode != TelecomManager.TTY_MODE_OFF;
+        if (DEBUG) Log.v(TAG, "updateTTYMode: enabled: " + enabled);
+        if (enabled && isWiredHeadsetOn()) {
+            // TTY is on
+            if (DEBUG) Log.v(TAG, "updateTTYMode: set TTY on");
+            mService.setIcon(SLOT_TTY, R.drawable.stat_sys_tty_mode, 0,
+                    mContext.getString(R.string.accessibility_tty_enabled));
+            mService.setIconVisibility(SLOT_TTY, true);
+        } else {
+            // TTY is off
+            if (DEBUG) Log.v(TAG, "updateTTYMode: set TTY off");
+            mService.setIconVisibility(SLOT_TTY, false);
+        }
+    }
+
     private void updateCast() {
         boolean isCasting = false;
         for (CastDevice device : mCast.getCastDevices()) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index a6593f5..5fbf46e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -231,9 +231,18 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
 
         // RenderThread is doing more harm than good when touching the header (to expand quick
         // settings), so disable it for this view
-        ((RippleDrawable) getBackground()).setForceSoftware(true);
-        ((RippleDrawable) mSettingsButton.getBackground()).setForceSoftware(true);
-        ((RippleDrawable) mSystemIconsSuperContainer.getBackground()).setForceSoftware(true);
+        Drawable d = getBackground();
+        if (d instanceof RippleDrawable) {
+            ((RippleDrawable) d).setForceSoftware(true);
+        }
+        d = mSettingsButton.getBackground();
+        if (d instanceof RippleDrawable) {
+            ((RippleDrawable) d).setForceSoftware(true);
+        }
+        d = mSystemIconsSuperContainer.getBackground();
+        if (d instanceof RippleDrawable) {
+            ((RippleDrawable) d).setForceSoftware(true);
+        }
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
index aa2f0d3..3ed18c9 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -959,6 +959,12 @@ public class VolumeDialog {
         }
     };
 
+    public void cleanup() {
+        mController.removeCallback(mControllerCallbackH);
+        mZenFooter.cleanup();
+        mAccessibility.cleanup();
+    }
+
     private final class H extends Handler {
         private static final int SHOW = 1;
         private static final int DISMISS = 2;
@@ -1081,26 +1087,7 @@ public class VolumeDialog {
 
         public void init() {
             mMgr = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
-            mDialogView.addOnAttachStateChangeListener(new OnAttachStateChangeListener() {
-                @Override
-                public void onViewDetachedFromWindow(View v) {
-                    if (D.BUG) Log.d(TAG, "onViewDetachedFromWindow");
-                    // noop
-                }
-
-                @Override
-                public void onViewAttachedToWindow(View v) {
-                    if (D.BUG) Log.d(TAG, "onViewAttachedToWindow");
-                    updateFeedbackEnabled();
-                }
-            });
-            mDialogView.setAccessibilityDelegate(this);
-            mMgr.addAccessibilityStateChangeListener(new AccessibilityStateChangeListener() {
-                @Override
-                public void onAccessibilityStateChanged(boolean enabled) {
-                    updateFeedbackEnabled();
-                }
-            });
+            mDialogView.addOnAttachStateChangeListener(mOnAttachStateChangeListener);
             updateFeedbackEnabled();
         }
 
@@ -1111,6 +1098,10 @@ public class VolumeDialog {
             return super.onRequestSendAccessibilityEvent(host, child, event);
         }
 
+        public void cleanup() {
+            mDialogView.removeOnAttachStateChangeListener(mOnAttachStateChangeListener);
+        }
+
         private void updateFeedbackEnabled() {
             mFeedbackEnabled = computeFeedbackEnabled();
         }
@@ -1126,6 +1117,21 @@ public class VolumeDialog {
             }
             return false;
         }
+
+        private OnAttachStateChangeListener mOnAttachStateChangeListener =
+                new OnAttachStateChangeListener() {
+            @Override
+            public void onViewDetachedFromWindow(View v) {
+                if (D.BUG) Log.d(TAG, "onViewDetachedFromWindow");
+                // noop
+            }
+
+            @Override
+            public void onViewAttachedToWindow(View v) {
+                if (D.BUG) Log.d(TAG, "onViewAttachedToWindow");
+                updateFeedbackEnabled();
+            }
+        };
     }
 
     private static class VolumeRow {
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
index 1083f40..742b18b 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java
@@ -43,7 +43,7 @@ public class VolumeDialogComponent implements VolumeComponent {
     private final Context mContext;
     private final VolumeDialogController mController;
     private final ZenModeController mZenModeController;
-    private final VolumeDialog mDialog;
+    private VolumeDialog mDialog;
     private final VolumePolicy mVolumePolicy = new VolumePolicy(
             true,  // volumeDownToEnterSilent
             true,  // volumeUpToExitSilent
@@ -138,4 +138,11 @@ public class VolumeDialogComponent implements VolumeComponent {
         }
     };
 
+    public void recreateDialog() {
+        if (mDialog != null) mDialog.cleanup();
+
+        mDialog = new VolumeDialog(mContext, WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY,
+                mController, mZenModeController, mVolumeDialogCallback);
+        applyConfiguration();
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
index e49ff50..fa0de7d 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeUI.java
@@ -97,9 +97,8 @@ public class VolumeUI extends SystemUI {
         getVolumeComponent().onConfigurationChanged(newConfig);
 
         if (isThemeChange(newConfig)) {
-            // TODO: implement initPanel() if needed
-            //initPanel();
             mContext.recreateTheme();
+            mVolumeComponent.recreateDialog();
         }
         mConfiguration.setTo(newConfig);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
index af7ee08..0fb80c0 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
@@ -69,17 +69,19 @@ public class ZenFooter extends LinearLayout {
         mSpTexts.add(mEndNowButton);
     }
 
+    private ZenModeController.Callback mZenModeCallback = new ZenModeController.Callback() {
+        @Override
+        public void onZenChanged(int zen) {
+            setZen(zen);
+        }
+        @Override
+        public void onConfigChanged(ZenModeConfig config) {
+            setConfig(config);
+        }
+    };
+
     public void init(final ZenModeController controller) {
-        controller.addCallback(new ZenModeController.Callback() {
-            @Override
-            public void onZenChanged(int zen) {
-                setZen(zen);
-            }
-            @Override
-            public void onConfigChanged(ZenModeConfig config) {
-                setConfig(config);
-            }
-        });
+        controller.addCallback(mZenModeCallback);
         mEndNowButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -142,4 +144,8 @@ public class ZenFooter extends LinearLayout {
         mSpTexts.update();
     }
 
+    public void cleanup() {
+        mController.removeCallback(mZenModeCallback);
+    }
+
 }