From 86879d1fa584685df2dff98beb8381004aa98bf3 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Sat, 27 Aug 2016 14:23:12 -0700
Subject: [PATCH 1/8] Automatic translation import

Change-Id: I7c1f2ebb5c41b171d3a5defff0884d08ffee2514
Ticket: -
---
 cm/res/res/values-bs-rBA/strings.xml | 70 ++++++++++++++++++++++++++++
 cm/res/res/values-ca/strings.xml     |  7 +++
 cm/res/res/values-cs/strings.xml     |  7 +++
 cm/res/res/values-de/strings.xml     |  6 ++-
 cm/res/res/values-el/strings.xml     |  9 ++++
 cm/res/res/values-es-rCO/strings.xml | 70 ++++++++++++++++++++++++++++
 cm/res/res/values-ga-rIE/strings.xml | 70 ++++++++++++++++++++++++++++
 cm/res/res/values-hu/strings.xml     |  9 ++++
 cm/res/res/values-ja/strings.xml     |  7 +++
 cm/res/res/values-nb/strings.xml     | 15 ++++--
 cm/res/res/values-nl/strings.xml     |  7 +++
 cm/res/res/values-pt-rBR/strings.xml |  7 +++
 cm/res/res/values-pt-rPT/strings.xml |  7 +++
 cm/res/res/values-ru/strings.xml     | 25 ++++++----
 cm/res/res/values-sr/strings.xml     |  1 +
 cm/res/res/values-sv/strings.xml     |  1 +
 cm/res/res/values-zh-rCN/strings.xml |  7 +++
 17 files changed, 311 insertions(+), 14 deletions(-)
 create mode 100644 cm/res/res/values-bs-rBA/strings.xml
 create mode 100644 cm/res/res/values-es-rCO/strings.xml
 create mode 100644 cm/res/res/values-ga-rIE/strings.xml

diff --git a/cm/res/res/values-bs-rBA/strings.xml b/cm/res/res/values-bs-rBA/strings.xml
new file mode 100644
index 00000000..babdb88d
--- /dev/null
+++ b/cm/res/res/values-bs-rBA/strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 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">
+  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
+  <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
+  <!-- Labels for the MODIFY_PROFILES permission. -->
+  <!-- Labels for the HARDWARE_ABSTRACTION_ACCESS permission. -->
+  <!-- Labels for the WRITE_ALARMS permission. -->
+  <!-- Labels for the MANAGE_ALARMS permission. -->
+  <!-- Labels for the READ_ALARMS permission. -->
+  <!-- Labels for the WRITE_SETTINGS permission -->
+  <!-- Labels for the WRITE_SECURE_SETTINGS permission -->
+  <!-- Labels for the MANAGE_PERSISTENT_STORAGE permission. -->
+  <!-- Labels for the ACCESS_APP_SUGGESTIONS permission -->
+  <!-- Label to show for a service that is running because it is observing the user's custom tiles. -->
+  <!-- Labels for the PROTECTED_APP permission. -->
+  <!-- Profiles -->
+  <!-- Names of default profiles. -->
+  <!-- Names of application groups. -->
+  <!-- Name of wildcard profile. -->
+  <!-- Performance profiles -->
+  <!-- LiveDisplay strings -->
+  <!-- Third party keyguard permission label -->
+  <!-- Third party keyguard permission description -->
+  <!-- Device specific settings -->
+  <!-- Touchscreen gestures -->
+  <!-- Touchscreen gesture haptic feedback -->
+  <!-- Theme installation error notification -->
+  <!-- Theme reset notification -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Performance manager permission title -->
+  <!-- Performance manager permission description -->
+  <!-- Access live lock screen manager service permission label -->
+  <!-- Access live lock screen manager service permission description -->
+  <!-- Privileged access live lock screen manager service permission label -->
+  <!-- Privileged access live lock screen manager service permission description -->
+  <!-- Live lock screen manager service provider permission label -->
+  <!-- Live lock screen manager service provider permission description -->
+  <!-- Weather Service strings -->
+  <!-- DataUsageProvider write permission title -->
+  <!-- DataUsageProvider write permission description -->
+  <!-- DataUsageProvider read permission title -->
+  <!-- DataUsageProvider read permission description -->
+  <!-- LiveDisplay manager permission -->
+  <!-- CMAudioService - observe session changes permission -->
+  <!-- CMAudioService - observe session changes permission -->
+  <!-- QuickSettings: Themes tile -->
+  <!-- Custom booot dexopt -->
+</resources>
diff --git a/cm/res/res/values-ca/strings.xml b/cm/res/res/values-ca/strings.xml
index bec3957c..1bed171e 100644
--- a/cm/res/res/values-ca/strings.xml
+++ b/cm/res/res/values-ca/strings.xml
@@ -184,4 +184,11 @@
   <string name="qs_themes_label">Temes</string>
   <string name="qs_themes_content_description">Personalitza els teus temes</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">S\'estan iniciant les aplicacions\u2026</string>
+  <string name="android_upgrading_fstrim">S\'està optimitzant l\'emmagatzematge\u2026</string>
+  <string name="android_upgrading_complete">S\'està preparant per a iniciar\u2026</string>
+  <string name="android_upgrading_complete_details">Optimització completada.</string>
+  <string name="android_preparing_apk">S\'està preparant %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">S\'estan preparant les aplicacions\u2026</string>
+  <string name="android_upgrading_apk">%1$d de %2$d aplicacions</string>
 </resources>
diff --git a/cm/res/res/values-cs/strings.xml b/cm/res/res/values-cs/strings.xml
index 02ecd0df..e78f6caf 100644
--- a/cm/res/res/values-cs/strings.xml
+++ b/cm/res/res/values-cs/strings.xml
@@ -184,4 +184,11 @@
   <string name="qs_themes_label">Motivy</string>
   <string name="qs_themes_content_description">Vlastní nastavení motivu</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Spouštění aplikací\u2026</string>
+  <string name="android_upgrading_fstrim">Optimalizace úložiště\u2026</string>
+  <string name="android_upgrading_complete">Příprava spuštění\u2026</string>
+  <string name="android_upgrading_complete_details">Optimalizace dokončena.</string>
+  <string name="android_preparing_apk">Příprava aplikace %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Příprava aplikací\u2026</string>
+  <string name="android_upgrading_apk">%1$d z %2$d aplikací</string>
 </resources>
diff --git a/cm/res/res/values-de/strings.xml b/cm/res/res/values-de/strings.xml
index 3d9c2f22..8b7e23d0 100644
--- a/cm/res/res/values-de/strings.xml
+++ b/cm/res/res/values-de/strings.xml
@@ -178,15 +178,17 @@
   <string name="permlab_observe_audio_sessions">Audiositzungsänderungen überwachen</string>
   <string name="permdesc_observe_audio_sessions">Erlaubt einer App, die Erstellung und Löschung von Audio-Streams zu überwachen.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">Audiositzungsänderungen verwalten</string>
+  <string name="permdesc_manage_audio_sessions">Ermöglicht einer App, Audiostream-Aktualisierungen zu senden.</string>
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">Designs</string>
   <string name="qs_themes_content_description">Passen Sie Ihr Design an</string>
   <!-- Custom booot dexopt -->
   <string name="android_upgrading_starting_apps">Apps werden gestartet\u2026</string>
   <string name="android_upgrading_fstrim">Speicher wird optimiert\u2026</string>
-  <string name="android_upgrading_complete">Start wir vorbereitet\u2026</string>
+  <string name="android_upgrading_complete">Start wird vorbereitet\u2026</string>
   <string name="android_upgrading_complete_details">Optimierung abgeschlossen.</string>
-  <string name="android_preparing_apk">%1$s wir vorbereitet\u2026</string>
+  <string name="android_preparing_apk">%1$s wird vorbereitet\u2026</string>
   <string name="android_preparing_apk_obscured">Apps werden vorbereitet\u2026</string>
   <string name="android_upgrading_apk">%1$d von %2$d Apps</string>
 </resources>
diff --git a/cm/res/res/values-el/strings.xml b/cm/res/res/values-el/strings.xml
index 718c4d87..e40bc52a 100644
--- a/cm/res/res/values-el/strings.xml
+++ b/cm/res/res/values-el/strings.xml
@@ -178,8 +178,17 @@
   <string name="permlab_observe_audio_sessions">παρατήρηση αλλαγών στις συνεδρίες ήχου</string>
   <string name="permdesc_observe_audio_sessions">Επιτρέπει σε μια εφαρμογή να παρατηρεί τις ροές ήχου να δημιουργούνται και να καταστρέφονται.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">διαχείριση αλλαγών στις συνεδρίες ήχου</string>
+  <string name="permdesc_manage_audio_sessions">Επιτρέπει σε μια εφαρμογή να στέλνει ενημερώσεις στη ροή ήχου.</string>
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">Θέματα</string>
   <string name="qs_themes_content_description">Προσαρμόστε το θέμα σας</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Εκκίνηση εφαρμογών\u2026</string>
+  <string name="android_upgrading_fstrim">Βελτιστοποίηση αποθ. χώρου\u2026</string>
+  <string name="android_upgrading_complete">Προετοιμασία για εκκίνηση\u2026</string>
+  <string name="android_upgrading_complete_details">Η βελτιστοποίηση ολοκληρώθηκε.</string>
+  <string name="android_preparing_apk">Προετοιμασία %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Προετοιμασία εφαρμογών\u2026</string>
+  <string name="android_upgrading_apk">%1$d από %2$d εφαρμογές</string>
 </resources>
diff --git a/cm/res/res/values-es-rCO/strings.xml b/cm/res/res/values-es-rCO/strings.xml
new file mode 100644
index 00000000..babdb88d
--- /dev/null
+++ b/cm/res/res/values-es-rCO/strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 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">
+  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
+  <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
+  <!-- Labels for the MODIFY_PROFILES permission. -->
+  <!-- Labels for the HARDWARE_ABSTRACTION_ACCESS permission. -->
+  <!-- Labels for the WRITE_ALARMS permission. -->
+  <!-- Labels for the MANAGE_ALARMS permission. -->
+  <!-- Labels for the READ_ALARMS permission. -->
+  <!-- Labels for the WRITE_SETTINGS permission -->
+  <!-- Labels for the WRITE_SECURE_SETTINGS permission -->
+  <!-- Labels for the MANAGE_PERSISTENT_STORAGE permission. -->
+  <!-- Labels for the ACCESS_APP_SUGGESTIONS permission -->
+  <!-- Label to show for a service that is running because it is observing the user's custom tiles. -->
+  <!-- Labels for the PROTECTED_APP permission. -->
+  <!-- Profiles -->
+  <!-- Names of default profiles. -->
+  <!-- Names of application groups. -->
+  <!-- Name of wildcard profile. -->
+  <!-- Performance profiles -->
+  <!-- LiveDisplay strings -->
+  <!-- Third party keyguard permission label -->
+  <!-- Third party keyguard permission description -->
+  <!-- Device specific settings -->
+  <!-- Touchscreen gestures -->
+  <!-- Touchscreen gesture haptic feedback -->
+  <!-- Theme installation error notification -->
+  <!-- Theme reset notification -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Performance manager permission title -->
+  <!-- Performance manager permission description -->
+  <!-- Access live lock screen manager service permission label -->
+  <!-- Access live lock screen manager service permission description -->
+  <!-- Privileged access live lock screen manager service permission label -->
+  <!-- Privileged access live lock screen manager service permission description -->
+  <!-- Live lock screen manager service provider permission label -->
+  <!-- Live lock screen manager service provider permission description -->
+  <!-- Weather Service strings -->
+  <!-- DataUsageProvider write permission title -->
+  <!-- DataUsageProvider write permission description -->
+  <!-- DataUsageProvider read permission title -->
+  <!-- DataUsageProvider read permission description -->
+  <!-- LiveDisplay manager permission -->
+  <!-- CMAudioService - observe session changes permission -->
+  <!-- CMAudioService - observe session changes permission -->
+  <!-- QuickSettings: Themes tile -->
+  <!-- Custom booot dexopt -->
+</resources>
diff --git a/cm/res/res/values-ga-rIE/strings.xml b/cm/res/res/values-ga-rIE/strings.xml
new file mode 100644
index 00000000..babdb88d
--- /dev/null
+++ b/cm/res/res/values-ga-rIE/strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 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">
+  <!-- Label for the CyanogenMod system components when they are shown to the user. -->
+  <!-- Labels for the READ_MSIM_PHONE_STATE permission. -->
+  <!-- Labels for the MODIFY_MSIM_PHONE_STATE permission. -->
+  <!-- Labels for the MODIFY_PROFILES permission. -->
+  <!-- Labels for the HARDWARE_ABSTRACTION_ACCESS permission. -->
+  <!-- Labels for the WRITE_ALARMS permission. -->
+  <!-- Labels for the MANAGE_ALARMS permission. -->
+  <!-- Labels for the READ_ALARMS permission. -->
+  <!-- Labels for the WRITE_SETTINGS permission -->
+  <!-- Labels for the WRITE_SECURE_SETTINGS permission -->
+  <!-- Labels for the MANAGE_PERSISTENT_STORAGE permission. -->
+  <!-- Labels for the ACCESS_APP_SUGGESTIONS permission -->
+  <!-- Label to show for a service that is running because it is observing the user's custom tiles. -->
+  <!-- Labels for the PROTECTED_APP permission. -->
+  <!-- Profiles -->
+  <!-- Names of default profiles. -->
+  <!-- Names of application groups. -->
+  <!-- Name of wildcard profile. -->
+  <!-- Performance profiles -->
+  <!-- LiveDisplay strings -->
+  <!-- Third party keyguard permission label -->
+  <!-- Third party keyguard permission description -->
+  <!-- Device specific settings -->
+  <!-- Touchscreen gestures -->
+  <!-- Touchscreen gesture haptic feedback -->
+  <!-- Theme installation error notification -->
+  <!-- Theme reset notification -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Performance manager permission title -->
+  <!-- Performance manager permission description -->
+  <!-- Access live lock screen manager service permission label -->
+  <!-- Access live lock screen manager service permission description -->
+  <!-- Privileged access live lock screen manager service permission label -->
+  <!-- Privileged access live lock screen manager service permission description -->
+  <!-- Live lock screen manager service provider permission label -->
+  <!-- Live lock screen manager service provider permission description -->
+  <!-- Weather Service strings -->
+  <!-- DataUsageProvider write permission title -->
+  <!-- DataUsageProvider write permission description -->
+  <!-- DataUsageProvider read permission title -->
+  <!-- DataUsageProvider read permission description -->
+  <!-- LiveDisplay manager permission -->
+  <!-- CMAudioService - observe session changes permission -->
+  <!-- CMAudioService - observe session changes permission -->
+  <!-- QuickSettings: Themes tile -->
+  <!-- Custom booot dexopt -->
+</resources>
diff --git a/cm/res/res/values-hu/strings.xml b/cm/res/res/values-hu/strings.xml
index 2cc51fdd..182c1ec4 100644
--- a/cm/res/res/values-hu/strings.xml
+++ b/cm/res/res/values-hu/strings.xml
@@ -179,8 +179,17 @@
   <string name="permlab_observe_audio_sessions">audió munkamenet változásainak megfigyelése</string>
   <string name="permdesc_observe_audio_sessions">Lehetővé teszi az alkalmazás számára, hogy megfigyelje ahogy az audió folyamok létrejönnek és elpusztulnak.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">audió munkamenet változások kezelése</string>
+  <string name="permdesc_manage_audio_sessions">Lehetővé teszi az alkalmazás számára, hogy audio stream frissítéseket küldjön.</string>
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">Témák</string>
   <string name="qs_themes_content_description">Téma testreszabása</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Alkalmazások indítása\u2026</string>
+  <string name="android_upgrading_fstrim">Tároló optimalizálása\u2026</string>
+  <string name="android_upgrading_complete">Felkészülés az indulásra\u2026</string>
+  <string name="android_upgrading_complete_details">Optimalizálás befejezve.</string>
+  <string name="android_preparing_apk">%1$s előkészítése\u2026</string>
+  <string name="android_preparing_apk_obscured">Alkalmazások előkészítése\u2026</string>
+  <string name="android_upgrading_apk">%1$d / %2$d alkalmazás</string>
 </resources>
diff --git a/cm/res/res/values-ja/strings.xml b/cm/res/res/values-ja/strings.xml
index 131d9b83..88a81744 100644
--- a/cm/res/res/values-ja/strings.xml
+++ b/cm/res/res/values-ja/strings.xml
@@ -137,4 +137,11 @@
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">テーマ</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">アプリを開始しています\u2026</string>
+  <string name="android_upgrading_fstrim">ストレージを最適化しています\u2026</string>
+  <string name="android_upgrading_complete">開始するための準備をしています\u2026</string>
+  <string name="android_upgrading_complete_details">最適化が完了しました。</string>
+  <string name="android_preparing_apk">%1$sを準備しています\u2026</string>
+  <string name="android_preparing_apk_obscured">アプリを準備しています\u2026</string>
+  <string name="android_upgrading_apk">%2$d個中%1$d個目のアプリ</string>
 </resources>
diff --git a/cm/res/res/values-nb/strings.xml b/cm/res/res/values-nb/strings.xml
index 0f2a4382..2d7191de 100644
--- a/cm/res/res/values-nb/strings.xml
+++ b/cm/res/res/values-nb/strings.xml
@@ -57,7 +57,7 @@
   <string name="permlab_managePersistentStorage">administrere permanent lager</string>
   <string name="permdesc_managePersistentStorage">Gir en app tilgang til å lese eller skrive egenskaper, som kan overleve gjenoppretting av fabrikkinnstillinger.</string>
   <!-- Labels for the ACCESS_APP_SUGGESTIONS permission -->
-  <string name="permlab_accessAppSuggestions">tilgang app forslag</string>
+  <string name="permlab_accessAppSuggestions">tilgang til app-forslag</string>
   <string name="permdesc_accessAppSuggestions">Tillat en app tilgang til app forslag.</string>
   <!-- Label to show for a service that is running because it is observing the user's custom tiles. -->
   <string name="custom_tile_listener_binding_label">Egendefinerte flis lytter</string>
@@ -160,9 +160,9 @@
   <string name="permdesc_weather_read">Tillater en app å lese av innholdet fra vær leverandøren.</string>
   <string name="permlab_weather_write">oppdatere vær leverandør</string>
   <string name="permdesc_weather_write">Tillater en app å oppdatere innholdet til vær leverandøren.</string>
-  <string name="permlab_weather_bind">binde seg som en vær leverandør tjeneste</string>
-  <string name="permdesc_weather_bind">Tillater en app å bli identifisert som en vær leverandør tjeneste.</string>
-  <string name="permlab_weather_access_mgr">få tilgang til vær-tjeneste</string>
+  <string name="permlab_weather_bind">bind som en værleverandør tjeneste</string>
+  <string name="permdesc_weather_bind">Tillater en app å bli identifisert som en værleverandør tjeneste.</string>
+  <string name="permlab_weather_access_mgr">få tilgang til værtjeneste</string>
   <string name="permdesc_weather_access_mgr">Tillater en app å få tilgang til værtjenesten i systemet. Skal aldri være nødvendig for normale apper.</string>
   <!-- DataUsageProvider write permission title -->
   <string name="permlab_dataUsageWrite">endre databruk databasen</string>
@@ -185,4 +185,11 @@
   <string name="qs_themes_label">Temaer</string>
   <string name="qs_themes_content_description">Tilpass temaet ditt</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Starter apper\u2026</string>
+  <string name="android_upgrading_fstrim">Optimaliserer lagring\u2026</string>
+  <string name="android_upgrading_complete">Gjør klar til oppstart\u2026</string>
+  <string name="android_upgrading_complete_details">Optimalisering er fullført.</string>
+  <string name="android_preparing_apk">Gjør klar %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Gjør klar apper\u2026</string>
+  <string name="android_upgrading_apk">%1$d av %2$d apper</string>
 </resources>
diff --git a/cm/res/res/values-nl/strings.xml b/cm/res/res/values-nl/strings.xml
index 4eab7858..3ae573de 100644
--- a/cm/res/res/values-nl/strings.xml
+++ b/cm/res/res/values-nl/strings.xml
@@ -164,4 +164,11 @@
   <string name="qs_themes_label">Thema\'s</string>
   <string name="qs_themes_content_description">Thema aanpassen</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Apps starten\u2026</string>
+  <string name="android_upgrading_fstrim">Opslag optimaliseren\u2026</string>
+  <string name="android_upgrading_complete">Voorbereiden om te starten\u2026</string>
+  <string name="android_upgrading_complete_details">Optimaliseren voltooid.</string>
+  <string name="android_preparing_apk">%1$s voorbereiden\u2026</string>
+  <string name="android_preparing_apk_obscured">Apps voorbereiden\u2026</string>
+  <string name="android_upgrading_apk">%1$d van %2$d apps</string>
 </resources>
diff --git a/cm/res/res/values-pt-rBR/strings.xml b/cm/res/res/values-pt-rBR/strings.xml
index 6547ed7e..46a2a61f 100644
--- a/cm/res/res/values-pt-rBR/strings.xml
+++ b/cm/res/res/values-pt-rBR/strings.xml
@@ -185,4 +185,11 @@
   <string name="qs_themes_label">Temas</string>
   <string name="qs_themes_content_description">Personalizar os seus temas</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Inicializando apps\u2026</string>
+  <string name="android_upgrading_fstrim">Otimizando o armazenamento\u2026</string>
+  <string name="android_upgrading_complete">Preparando para iniciar\u2026</string>
+  <string name="android_upgrading_complete_details">Otimização concluída.</string>
+  <string name="android_preparing_apk">Preparando %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Preparando apps\u2026</string>
+  <string name="android_upgrading_apk">%1$d de %2$d apps</string>
 </resources>
diff --git a/cm/res/res/values-pt-rPT/strings.xml b/cm/res/res/values-pt-rPT/strings.xml
index e73faba2..68a5be51 100644
--- a/cm/res/res/values-pt-rPT/strings.xml
+++ b/cm/res/res/values-pt-rPT/strings.xml
@@ -185,4 +185,11 @@
   <string name="qs_themes_label">Temas</string>
   <string name="qs_themes_content_description">Personalize o seu tema</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">A iniciar as aplicações\u2026</string>
+  <string name="android_upgrading_fstrim">A otimizar o armazenamento\u2026</string>
+  <string name="android_upgrading_complete">A preparar para iniciar\u2026</string>
+  <string name="android_upgrading_complete_details">Otimização concluída.</string>
+  <string name="android_preparing_apk">A preparar %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">A preparar as aplicações\u2026</string>
+  <string name="android_upgrading_apk">%1$d de %2$d aplicações</string>
 </resources>
diff --git a/cm/res/res/values-ru/strings.xml b/cm/res/res/values-ru/strings.xml
index 95940171..b21ecf34 100644
--- a/cm/res/res/values-ru/strings.xml
+++ b/cm/res/res/values-ru/strings.xml
@@ -109,7 +109,7 @@
   <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay переключён в ночной режим.</string>
   <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay переключён в режим «на улице».</string>
   <!-- Third party keyguard permission label -->
-  <string name="permlab_thirdPartyKeyguard">Сторонний экран блокировки</string>
+  <string name="permlab_thirdPartyKeyguard">cторонний экран блокировки</string>
   <!-- Third party keyguard permission description -->
   <string name="permdesc_thirdPartyKeyguard">Приложение сможет работать в качестве небезопасного метода блокировки экрана.</string>
   <!-- Device specific settings -->
@@ -145,7 +145,7 @@
   <!-- Access live lock screen manager service permission label -->
   <string name="permlab_accessLiveLockScreenService">доступ к управлению живым экраном блокировки</string>
   <!-- Access live lock screen manager service permission description -->
-  <string name="permdesc_accessLiveLockScreenService">Позволяет приложению получить доступ к управлению живым экраном блокировки.</string>
+  <string name="permdesc_accessLiveLockScreenService">Приложение сможет получать доступ к службе управления живым экраном блокировки.</string>
   <!-- Privileged access live lock screen manager service permission label -->
   <string name="permlab_accessLiveLockScreenServicePrivate">доступ к управлению живым экраном блокировки</string>
   <!-- Privileged access live lock screen manager service permission description -->
@@ -156,30 +156,39 @@
   <string name="permdesc_accessLiveLockScreenServiceProvider">Позволяет службе предоставить доступ к управлению живым экраном блокировки.</string>
   <!-- Weather Service strings -->
   <string name="permlab_weather_read">чтение данных о погоде</string>
-  <string name="permdesc_weather_read">Разрешает приложению читать данные от поставщика погоды.</string>
+  <string name="permdesc_weather_read">Приложение сможет считывать данные от поставщика погоды.</string>
   <string name="permlab_weather_write">обновление поставщика погоды</string>
-  <string name="permdesc_weather_write">Разрешает приложению обновлять данные поставщика погоды.</string>
+  <string name="permdesc_weather_write">Приложение сможет обновлять данные поставщика погоды.</string>
   <string name="permlab_weather_bind">привязать как службу поставщика погоды</string>
-  <string name="permdesc_weather_bind">Разрешает, чтобы приложение определялось как служба поставщика погоды.</string>
+  <string name="permdesc_weather_bind">Приложение сможет выступать в качестве службы поставщика погоды.</string>
   <string name="permlab_weather_access_mgr">доступ к службе погоды</string>
   <string name="permdesc_weather_access_mgr">Приложение сможет получать доступ к службе погоды в системе. Это разрешение не используется обычными приложениями.</string>
   <!-- DataUsageProvider write permission title -->
   <string name="permlab_dataUsageWrite">изменить данные об использовании БД</string>
   <!-- DataUsageProvider write permission description -->
-  <string name="permdesc_dataUsageWrite">Разрешает приложению обновлять данные об использовании БД.</string>
+  <string name="permdesc_dataUsageWrite">Приложение сможет обновлять содержимое БД использования данных.</string>
   <!-- DataUsageProvider read permission title -->
   <string name="permlab_dataUsageRead">чтение данных об использовании БД</string>
   <!-- DataUsageProvider read permission description -->
-  <string name="permdesc_dataUsageRead">Разрешает приложению читать данные об использовании БД.</string>
+  <string name="permdesc_dataUsageRead">Приложение сможет считывать содержимое БД использования данных.</string>
   <!-- LiveDisplay manager permission -->
   <string name="permlab_manageLiveDisplay">управление настройками LiveDisplay</string>
-  <string name="permdesc_manageLiveDisplay">Разрешает приложению изменять расширенные настройки экрана.</string>
+  <string name="permdesc_manageLiveDisplay">Приложение сможет изменять расширенные настройки экрана.</string>
   <!-- CMAudioService - observe session changes permission -->
   <string name="permlab_observe_audio_sessions">просмотр изменений аудиосеансов</string>
   <string name="permdesc_observe_audio_sessions">Приложение сможет просматривать аудиопотоки, которые создаются или уничтожаются.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">управление изменениями аудиосеансов</string>
+  <string name="permdesc_manage_audio_sessions">Приложение сможет изменять параметры аудиопотоков.</string>
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">Темы</string>
   <string name="qs_themes_content_description">Настройте свою тему</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Запуск приложений\u2026</string>
+  <string name="android_upgrading_fstrim">Оптимизация накопителя\u2026</string>
+  <string name="android_upgrading_complete">Подготовка к запуску\u2026</string>
+  <string name="android_upgrading_complete_details">Оптимизация завершена.</string>
+  <string name="android_preparing_apk">Подготовка %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Подготовка приложений\u2026</string>
+  <string name="android_upgrading_apk">%1$d из %2$d приложений</string>
 </resources>
diff --git a/cm/res/res/values-sr/strings.xml b/cm/res/res/values-sr/strings.xml
index b250e32f..18bf18e9 100644
--- a/cm/res/res/values-sr/strings.xml
+++ b/cm/res/res/values-sr/strings.xml
@@ -178,6 +178,7 @@
   <string name="permlab_observe_audio_sessions">посматрај промене аудио сесије</string>
   <string name="permdesc_observe_audio_sessions">Дозвољава апликацији да посматра ток аудиа док је креиран и прекинут.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">управљај променама аудио сесије</string>
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">Теме</string>
   <string name="qs_themes_content_description">Прилагодите вашу тему</string>
diff --git a/cm/res/res/values-sv/strings.xml b/cm/res/res/values-sv/strings.xml
index 39d25708..23b55faa 100644
--- a/cm/res/res/values-sv/strings.xml
+++ b/cm/res/res/values-sv/strings.xml
@@ -148,5 +148,6 @@
   <!-- CMAudioService - observe session changes permission -->
   <!-- CMAudioService - observe session changes permission -->
   <!-- QuickSettings: Themes tile -->
+  <string name="qs_themes_label">Teman</string>
   <!-- Custom booot dexopt -->
 </resources>
diff --git a/cm/res/res/values-zh-rCN/strings.xml b/cm/res/res/values-zh-rCN/strings.xml
index c6ece45a..eadf677c 100644
--- a/cm/res/res/values-zh-rCN/strings.xml
+++ b/cm/res/res/values-zh-rCN/strings.xml
@@ -184,4 +184,11 @@
   <string name="qs_themes_label">主题</string>
   <string name="qs_themes_content_description">自定义您的主题</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">正在启动应用\u2026</string>
+  <string name="android_upgrading_fstrim">正在优化存储\u2026</string>
+  <string name="android_upgrading_complete">正在准备启动\u2026</string>
+  <string name="android_upgrading_complete_details">优化完成。</string>
+  <string name="android_preparing_apk">正在准备 %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">正在准备应用\u2026</string>
+  <string name="android_upgrading_apk">%2$d 个中的 %1$d 个应用</string>
 </resources>

From 70da0ef9dcebf8425f65a7288872aff384c8a5dc Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Sat, 27 Aug 2016 20:33:08 -0700
Subject: [PATCH 2/8] Automatic translation import

Change-Id: I40d9cfd605acd7af9349354de5e06c45c17932c0
Ticket: -

From 662cb516428ffe8483295714ad2b38f8613e482c Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Tue, 30 Aug 2016 16:00:36 -0700
Subject: [PATCH 3/8] cmsdk: fix visible check in hasChanged

Previously the visible check was comparing the newly set value to
itself. Now we cache the old value, set new value, and can do a proper
comparison.

Change-Id: Idbe921bfe9e311551d6bfbad432c647c129f376e
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 .../cyanogenmod/externalviews/ExternalViewProperties.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java
index 2b4404d9..e8adddf8 100644
--- a/sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java
+++ b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java
@@ -84,12 +84,12 @@ public class ExternalViewProperties {
         if (mDecorView != null) {
             mDecorView.getHitRect(mHitRect);
         }
-        boolean visible = mView.getLocalVisibleRect(mHitRect);
-        mVisible = visible;
+        boolean wasVisible = mVisible;
+        mVisible = mView.getLocalVisibleRect(mHitRect);
 
         // Check if anything actually changed
         return previousX != newX || previousY != newY
                 || previousWidth != mWidth || previousHeight != mHeight
-                || mVisible != visible;
+                || mVisible != wasVisible;
     }
 }

From f15f366c625a02bfe5987eb14e3a29a66b27b676 Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Tue, 6 Sep 2016 20:06:59 -0700
Subject: [PATCH 4/8] Automatic translation import

Change-Id: Ia86641b028e5799beed97b40fe3f0c9326ceeacd
Ticket: -
---
 cm/res/res/values-bg/strings.xml |  2 +-
 cm/res/res/values-ca/strings.xml |  2 +-
 cm/res/res/values-da/strings.xml |  7 +++++++
 cm/res/res/values-hr/strings.xml |  7 +++++++
 cm/res/res/values-nb/strings.xml | 10 +++++-----
 cm/res/res/values-nl/strings.xml |  8 ++++++++
 cm/res/res/values-pl/strings.xml |  2 ++
 7 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/cm/res/res/values-bg/strings.xml b/cm/res/res/values-bg/strings.xml
index 09303c4a..4c80f719 100644
--- a/cm/res/res/values-bg/strings.xml
+++ b/cm/res/res/values-bg/strings.xml
@@ -190,5 +190,5 @@
   <string name="android_upgrading_complete_details">Оптимизацията е завършена.</string>
   <string name="android_preparing_apk">Подготовка на %1$s\u2026</string>
   <string name="android_preparing_apk_obscured">Подготовка на приложенията\u2026</string>
-  <string name="android_upgrading_apk">%1$d із %2$d приложения</string>
+  <string name="android_upgrading_apk">%1$d от %2$d приложения</string>
 </resources>
diff --git a/cm/res/res/values-ca/strings.xml b/cm/res/res/values-ca/strings.xml
index 1bed171e..1cebba43 100644
--- a/cm/res/res/values-ca/strings.xml
+++ b/cm/res/res/values-ca/strings.xml
@@ -124,7 +124,7 @@
   <string name="theme_install_error_title">No ha pogut instal·lar el tema</string>
   <string name="theme_install_error_message">No s\'ha pogut instal·lar <xliff:g id="theme">%1$s</xliff:g></string>
   <!-- Theme reset notification -->
-  <string name="theme_reset_notification_title">Reestableix el tema</string>
+  <string name="theme_reset_notification_title">Restableix el tema</string>
   <string name="theme_reset_notification_message">El tema del sistema s\'ha restaurat degut a múltiples fallades d\'aplicacions.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessThemeService">accés al servei de temes</string>
diff --git a/cm/res/res/values-da/strings.xml b/cm/res/res/values-da/strings.xml
index 39e9b99d..49f262da 100644
--- a/cm/res/res/values-da/strings.xml
+++ b/cm/res/res/values-da/strings.xml
@@ -184,4 +184,11 @@
   <string name="qs_themes_label">Temaer</string>
   <string name="qs_themes_content_description">Tilpas dit tema</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Starter apps\u2026</string>
+  <string name="android_upgrading_fstrim">Optimerer lager\u2026</string>
+  <string name="android_upgrading_complete">Forbereder start\u2026</string>
+  <string name="android_upgrading_complete_details">Optimering afsluttet.</string>
+  <string name="android_preparing_apk">Forbereder %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Forbereder apps\u2026</string>
+  <string name="android_upgrading_apk">%1$d af %2$d apps</string>
 </resources>
diff --git a/cm/res/res/values-hr/strings.xml b/cm/res/res/values-hr/strings.xml
index 759e6c76..7e1bb8e9 100644
--- a/cm/res/res/values-hr/strings.xml
+++ b/cm/res/res/values-hr/strings.xml
@@ -184,4 +184,11 @@
   <string name="qs_themes_label">Teme</string>
   <string name="qs_themes_content_description">Prilagodite svoju temu</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Pokretanje aplikacija\u2026</string>
+  <string name="android_upgrading_fstrim">Optimiziranje pohrane\u2026</string>
+  <string name="android_upgrading_complete">Priprema za pokretanje\u2026</string>
+  <string name="android_upgrading_complete_details">Optimizacija dovršena.</string>
+  <string name="android_preparing_apk">Priprema %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Priprema aplikacija\u2026</string>
+  <string name="android_upgrading_apk">%1$d od %2$d aplikacija</string>
 </resources>
diff --git a/cm/res/res/values-nb/strings.xml b/cm/res/res/values-nb/strings.xml
index 2d7191de..132778f7 100644
--- a/cm/res/res/values-nb/strings.xml
+++ b/cm/res/res/values-nb/strings.xml
@@ -104,10 +104,10 @@
   <string name="accessibility_quick_settings_live_display_night">LiveDisplay: natt modus.</string>
   <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: utendørs modus.</string>
   <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay slått av.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay byttet til automatisk modus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay byttet til dag modus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay byttet til natt modus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay byttet til utendørs modus.</string>
+  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay endret til automatisk modus.</string>
+  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay endret til dagsmodus.</string>
+  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay endret til nattmodus.</string>
+  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay endret til utendørs modus.</string>
   <!-- Third party keyguard permission label -->
   <string name="permlab_thirdPartyKeyguard">tredjeparts låseskjerm</string>
   <!-- Third party keyguard permission description -->
@@ -174,7 +174,7 @@
   <string name="permdesc_dataUsageRead">Tillater en app å lese av innholdet i databruk databasen.</string>
   <!-- LiveDisplay manager permission -->
   <string name="permlab_manageLiveDisplay">behandle LiveDisplay innstillinger</string>
-  <string name="permdesc_manageLiveDisplay">Tillater en app å konfigurere avanserte skjerm innstillinger.</string>
+  <string name="permdesc_manageLiveDisplay">Tillater en app å konfigurere avanserte skjerminnstillinger.</string>
   <!-- CMAudioService - observe session changes permission -->
   <string name="permlab_observe_audio_sessions">observere lyd-økt endringer</string>
   <string name="permdesc_observe_audio_sessions">Tillater en app å observere om lyd-strømmer blir lagd eller ødelagt.</string>
diff --git a/cm/res/res/values-nl/strings.xml b/cm/res/res/values-nl/strings.xml
index 3ae573de..997ea2a5 100644
--- a/cm/res/res/values-nl/strings.xml
+++ b/cm/res/res/values-nl/strings.xml
@@ -144,17 +144,25 @@
   <string name="permdesc_perfAccessDesc">Hiermee kan de app toegang krijgen tot de prestatieservice. Nooit vereist voor normale apps.</string>
   <!-- Access live lock screen manager service permission label -->
   <!-- Access live lock screen manager service permission description -->
+  <string name="permdesc_accessLiveLockScreenService">Hiermee kan de app toegang krijgen tot het geanimeerd vergrendelingsschermbeheer.</string>
   <!-- Privileged access live lock screen manager service permission label -->
   <!-- Privileged access live lock screen manager service permission description -->
+  <string name="permdesc_accessLiveLockScreenServicePrivate">Hiermee kunnen systeemapps toegang tot het geanimeerd vergrendelingsschermbeheer.</string>
   <!-- Live lock screen manager service provider permission label -->
   <!-- Live lock screen manager service provider permission description -->
   <!-- Weather Service strings -->
   <string name="permlab_weather_read">weer lezen</string>
+  <string name="permdesc_weather_read">Hiermee kan de app de inhoud van de weeraanbieder lezen.</string>
+  <string name="permdesc_weather_write">Hiermee kan de app de inhoud van de weeraanbieder vernieuwen.</string>
+  <string name="permdesc_weather_bind">Hiermee kan de app zich identificeren als weeraanbiederservice.</string>
   <string name="permlab_weather_access_mgr">toegang tot weerservice</string>
+  <string name="permdesc_weather_access_mgr">Hiermee kan de app toegang krijgen tot de weerservice van het systeem. Nooit vereist voor normale apps.</string>
   <!-- DataUsageProvider write permission title -->
   <!-- DataUsageProvider write permission description -->
+  <string name="permdesc_dataUsageWrite">Hiermee kan de app de inhoud van de database met gegevensgebruik bijwerken.</string>
   <!-- DataUsageProvider read permission title -->
   <!-- DataUsageProvider read permission description -->
+  <string name="permdesc_dataUsageRead">Hiermee kan de app de inhoud van de database met gegevensgebruik lezen.</string>
   <!-- LiveDisplay manager permission -->
   <string name="permlab_manageLiveDisplay">LiveDisplay-instellingen beheren</string>
   <string name="permdesc_manageLiveDisplay">Hiermee kan de app geavanceerde beeldscherminstellingen wijzigen.</string>
diff --git a/cm/res/res/values-pl/strings.xml b/cm/res/res/values-pl/strings.xml
index e76482e6..3eb75179 100644
--- a/cm/res/res/values-pl/strings.xml
+++ b/cm/res/res/values-pl/strings.xml
@@ -178,6 +178,8 @@
   <string name="permlab_observe_audio_sessions">obserwuj zmiany sesji audio</string>
   <string name="permdesc_observe_audio_sessions">Zezwalaj aplikacji na obserwowanie utworzenia lub zamknięcia strumienia dźwięku.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">zarządza zmianami sesji audio</string>
+  <string name="permdesc_manage_audio_sessions">Pozwala aplikacji na wysyłanie aktualizacji strumienia audio.</string>
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">Motywy</string>
   <string name="qs_themes_content_description">Dostosuj swój motyw</string>

From fceb077b6f4e691f031b027e1584e82ce350a5a6 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Mon, 12 Sep 2016 16:18:22 +0200
Subject: [PATCH 5/8] Don't unboundedly enqueue transition messages.

As long as the light sensor is providing values, each value change will
enqueue a transition message, which may queue up. Stop doing that and
ensure only one transition message is queued at any given time.

Change-Id: I6e9c5b265066089ff9e0cea7237c2023ed1af30c
---
 .../platform/internal/display/AmbientLuxObserver.java            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/display/AmbientLuxObserver.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/display/AmbientLuxObserver.java
index f0d67aa9..3bca9cbb 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/display/AmbientLuxObserver.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/display/AmbientLuxObserver.java
@@ -118,6 +118,7 @@ public class AmbientLuxObserver {
                         // check again in case we didn't get any
                         // more readings because the sensor settled
                         if (mRingBuffer.size() > 1) {
+                            removeMessages(MSG_TRANSITION);
                             sendEmptyMessageDelayed(MSG_TRANSITION, mThresholdDuration / 2);
                         }
                         break;

From 06aec1f6f25949db0bd991f54f2ac4e05c891fa2 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Wed, 14 Sep 2016 15:23:14 -0700
Subject: [PATCH 6/8] themes: Relabel theme dir after creation

After creating the theme directory it will be labeled as a
system_data_file.  By calling SELinux.restorecon() the directory
will be correctly labeled as a themeservice_app_data_file

Change-Id: I73a28da883a467bf8859d879dbe22962424e4a23
TICKET: NIGHTLIES-3349
---
 .../platform/internal/ThemeManagerServiceBroker.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerServiceBroker.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerServiceBroker.java
index 771c5372..c46608c5 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerServiceBroker.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/ThemeManagerServiceBroker.java
@@ -23,6 +23,7 @@ import android.os.FileUtils;
 import android.os.IBinder;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
+import android.os.SELinux;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.StructStat;
@@ -257,7 +258,10 @@ public class ThemeManagerServiceBroker extends BrokerableCMSystemService<IThemeS
     public void onBootPhase(int phase) {
         if (phase == PHASE_SYSTEM_SERVICES_READY) {
             // create the main theme directory for brokered service
-            createDirIfNotExists(ThemeUtils.SYSTEM_THEME_PATH);
+            if (createDirIfNotExists(ThemeUtils.SYSTEM_THEME_PATH)) {
+                // ensure it has the correct selinux label after creation
+                SELinux.restorecon(ThemeUtils.SYSTEM_THEME_PATH);
+            }
 
             if (shouldMigrateFilePermissions()) {
                 migrateFilePermissions();
@@ -354,13 +358,15 @@ public class ThemeManagerServiceBroker extends BrokerableCMSystemService<IThemeS
         return false;
     }
 
-    private static void createDirIfNotExists(String dirPath) {
+    private static boolean createDirIfNotExists(String dirPath) {
         final File dir = new File(dirPath);
         if (!dir.exists()) {
             if (dir.mkdir()) {
                 FileUtils.setPermissions(dir, FileUtils.S_IRWXU |
                         FileUtils.S_IRWXG| FileUtils.S_IRWXO, -1, -1);
+                return true;
             }
         }
+        return false;
     }
 }

From 2f32195b3a657b009361236ca3cacc5301b4cca1 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Sun, 25 Sep 2016 00:16:01 -0700
Subject: [PATCH 7/8] Automatic translation import

Change-Id: I01b303114376f6f8fe72d873d8cf3ce46ee05fd0
Ticket: -
---
 cm/res/res/values-eo/strings.xml     |  1 -
 cm/res/res/values-gl-rES/strings.xml | 57 ++++++++++++++++++++++++++++
 cm/res/res/values-iw/strings.xml     |  7 ++++
 cm/res/res/values-nl/strings.xml     |  5 +++
 cm/res/res/values-pl/strings.xml     |  5 +++
 cm/res/res/values-pt-rPT/strings.xml |  4 +-
 cm/res/res/values-sv/strings.xml     |  7 ++++
 7 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/cm/res/res/values-eo/strings.xml b/cm/res/res/values-eo/strings.xml
index a3b518f4..393cf93a 100644
--- a/cm/res/res/values-eo/strings.xml
+++ b/cm/res/res/values-eo/strings.xml
@@ -17,7 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Label for the CyanogenMod system components when they are shown to the user. -->
-  <string name="cyanogenmod_system_label">CyanogenMod sistemo</string>
   <string name="permlab_publishCustomTile">Krei propran kahelon en la rapida agordilo</string>
   <string name="permdesc_publishCustomTile">Permesas aplikaĵon publikigi rapidan agordilan kahelon.</string>
   <string name="permlab_bindCustomTileListenerService">ligita al propra kahela aŭskultada servo</string>
diff --git a/cm/res/res/values-gl-rES/strings.xml b/cm/res/res/values-gl-rES/strings.xml
index 30008b7c..2289b3e9 100644
--- a/cm/res/res/values-gl-rES/strings.xml
+++ b/cm/res/res/values-gl-rES/strings.xml
@@ -98,6 +98,16 @@
   <string name="live_display_outdoor">Exteriores (iluminado)</string>
   <string name="live_display_outdoor_summary">Utilizar tan só os axustes de exteriores</string>
   <string name="live_display_hint">O modo LiveDisplay pode axudar coa dor de ollos e a conciliar o sono. Preme aquí para probalo!</string>
+  <string name="accessibility_quick_settings_live_display_off">LiveDisplay desactivado.</string>
+  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modo automático.</string>
+  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modo día.</string>
+  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modo noite.</string>
+  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modo exteriores.</string>
+  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay desactivado.</string>
+  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay mudado ao modo automático.</string>
+  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay mudado ao modo día.</string>
+  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay mudado ao modo noite.</string>
+  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay mudado ao modo exteriores.</string>
   <!-- Third party keyguard permission label -->
   <string name="permlab_thirdPartyKeyguard">bloqueo de pantalla de terceiros</string>
   <!-- Third party keyguard permission description -->
@@ -105,34 +115,81 @@
   <!-- Device specific settings -->
   <string name="device_settings_app_name">Axustes avanzados</string>
   <!-- Touchscreen gestures -->
+  <string name="screen_gestures_panel_title">Xestos</string>
   <!-- Touchscreen gesture haptic feedback -->
   <string name="touchscreen_gesture_extras">Extras</string>
   <string name="touchscreen_gesture_haptic_feedback">Resposta háptica</string>
   <string name="touchscreen_gesture_haptic_feedback_summary">Vibrar cando un xesto é detectado</string>
   <!-- Theme installation error notification -->
+  <string name="theme_install_error_title">Non se puido instalar o tema</string>
+  <string name="theme_install_error_message">Non se puido instalar <xliff:g id="theme">%1$s</xliff:g></string>
   <!-- Theme reset notification -->
+  <string name="theme_reset_notification_title">Restabelecer o tema</string>
+  <string name="theme_reset_notification_message">Restableceuse o tema debido a varios fallos da aplicación.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_accessThemeService">acceso ao servizo de temas</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_accessThemeService">Permitir que unha aplicación acceda aos temas. Non debería ser necesario para aplicacións normais.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readThemes">ler a información do seu tema</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readThemesDesc">Permitir que a aplicación lea os seus temas e 
+       determine cal deles está en uso.</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_writeThemes">modificar os seus temas</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_writeThemesDesc">Permitir que a aplicación insira novos temas e modifique o que estea en uso.</string>
   <!-- Performance manager permission title -->
+  <string name="permlab_perfAccess">acceso ao xestor de rendemento</string>
   <!-- Performance manager permission description -->
+  <string name="permdesc_perfAccessDesc">Permite que unha aplicación acceda ao servizo de rendemento. Non debería ser necesario para aplicación normais.</string>
   <!-- Access live lock screen manager service permission label -->
+  <string name="permlab_accessLiveLockScreenService">acceder ao administrador de servizos de pantalla animada bloqueada</string>
   <!-- Access live lock screen manager service permission description -->
+  <string name="permdesc_accessLiveLockScreenService">Permite a un aplicativo acceder ao servizo de administración de pantalla animada bloqueada.</string>
   <!-- Privileged access live lock screen manager service permission label -->
+  <string name="permlab_accessLiveLockScreenServicePrivate">acceder ao administrador de servizo de pantalla animada bloqueada</string>
   <!-- Privileged access live lock screen manager service permission description -->
+  <string name="permdesc_accessLiveLockScreenServicePrivate">Permite ás aplicacións do sistema acceder ao servizo de administración de pantalla animada bloqueada.</string>
   <!-- Live lock screen manager service provider permission label -->
+  <string name="permlab_accessLiveLockScreenServiceProvider">fornecer o servizo de administración de pantalla de bloqueo</string>
   <!-- Live lock screen manager service provider permission description -->
+  <string name="permdesc_accessLiveLockScreenServiceProvider">Permite a un servizo fornecer o servizo de administración de pantalla animada bloqueada.</string>
   <!-- Weather Service strings -->
+  <string name="permlab_weather_read">ler o tempo</string>
+  <string name="permdesc_weather_read">Permite que unha aplicación ler o contido desde o fornecedor de clima.</string>
+  <string name="permlab_weather_write">actualizar o fornecedor de clima</string>
+  <string name="permdesc_weather_write">Permite que unha aplicación actualice o contido do fornecedor do clima.</string>
+  <string name="permlab_weather_bind">establecer como un servizo fornecedor de clima</string>
+  <string name="permdesc_weather_bind">Permite que unha aplicación poida ser identificada como un servizo fornecedor de clima.</string>
+  <string name="permlab_weather_access_mgr">acceder ao servizo de clima</string>
+  <string name="permdesc_weather_access_mgr">Permite que unha aplicación acceder ao servizo de clima do sistema. Nunca debería ser necesario para aplicacións normais.</string>
   <!-- DataUsageProvider write permission title -->
+  <string name="permlab_dataUsageWrite">modificar os datos de uso da base de datos</string>
   <!-- DataUsageProvider write permission description -->
+  <string name="permdesc_dataUsageWrite">Permite que unha aplicación poida actualizar os datos do contido da base de datos.</string>
   <!-- DataUsageProvider read permission title -->
+  <string name="permlab_dataUsageRead">ler os datos de uso da base de datos</string>
   <!-- DataUsageProvider read permission description -->
+  <string name="permdesc_dataUsageRead">Permite que unha aplicación poida ler os contidos da base de datos de uso de datos.</string>
   <!-- LiveDisplay manager permission -->
+  <string name="permlab_manageLiveDisplay">xestionar os axustes de LiveDisplay</string>
+  <string name="permdesc_manageLiveDisplay">Permite que unha aplicación poida configurar os axustes de pantalla avanzados.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_observe_audio_sessions">observar os cambios na sesión de son</string>
+  <string name="permdesc_observe_audio_sessions">Permite a unha aplicación observar os fluxos de son que se crean e se destrúen.</string>
   <!-- CMAudioService - observe session changes permission -->
+  <string name="permlab_manage_audio_sessions">xestionar os trocos da sesión de son</string>
+  <string name="permdesc_manage_audio_sessions">Permite a unha aplicación enviar actualizacións de fluxo de son.</string>
   <!-- QuickSettings: Themes tile -->
+  <string name="qs_themes_label">Temas</string>
+  <string name="qs_themes_content_description">Personalice o seu tema</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Iniciando as aplicacións\u2026</string>
+  <string name="android_upgrading_fstrim">Optimizando o almacenamento\u2026</string>
+  <string name="android_upgrading_complete">Preparando para iniciar\u2026</string>
+  <string name="android_upgrading_complete_details">Optimización completada.</string>
+  <string name="android_preparing_apk">Preparando %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Preparando aplicacións\u2026</string>
+  <string name="android_upgrading_apk">%1$d de %2$d aplicacións</string>
 </resources>
diff --git a/cm/res/res/values-iw/strings.xml b/cm/res/res/values-iw/strings.xml
index 8737f5d1..aa295bce 100644
--- a/cm/res/res/values-iw/strings.xml
+++ b/cm/res/res/values-iw/strings.xml
@@ -184,4 +184,11 @@
   <string name="qs_themes_label">ערכות עיצוב</string>
   <string name="qs_themes_content_description">התאם אישית את ערכת הנושא שלך</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">מפעיל יישומים\u2026</string>
+  <string name="android_upgrading_fstrim">מבצע אופטימיזציה לאחסון\u2026</string>
+  <string name="android_upgrading_complete">מתכונן להפעלה\u2026</string>
+  <string name="android_upgrading_complete_details">אופטימיזציה הושלמה.</string>
+  <string name="android_preparing_apk">מכין את %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">מכין יישומים\u2026</string>
+  <string name="android_upgrading_apk">%1$d מתוך %2$d יישומים</string>
 </resources>
diff --git a/cm/res/res/values-nl/strings.xml b/cm/res/res/values-nl/strings.xml
index 997ea2a5..6611c654 100644
--- a/cm/res/res/values-nl/strings.xml
+++ b/cm/res/res/values-nl/strings.xml
@@ -143,16 +143,21 @@
   <!-- Performance manager permission description -->
   <string name="permdesc_perfAccessDesc">Hiermee kan de app toegang krijgen tot de prestatieservice. Nooit vereist voor normale apps.</string>
   <!-- Access live lock screen manager service permission label -->
+  <string name="permlab_accessLiveLockScreenService">toegang tot geanimeerd vergrendelingsschermbeheer</string>
   <!-- Access live lock screen manager service permission description -->
   <string name="permdesc_accessLiveLockScreenService">Hiermee kan de app toegang krijgen tot het geanimeerd vergrendelingsschermbeheer.</string>
   <!-- Privileged access live lock screen manager service permission label -->
+  <string name="permlab_accessLiveLockScreenServicePrivate">toegang tot geanimeerd vergrendelingsschermbeheer</string>
   <!-- Privileged access live lock screen manager service permission description -->
   <string name="permdesc_accessLiveLockScreenServicePrivate">Hiermee kunnen systeemapps toegang tot het geanimeerd vergrendelingsschermbeheer.</string>
   <!-- Live lock screen manager service provider permission label -->
+  <string name="permlab_accessLiveLockScreenServiceProvider">geanimeerd vergrendelingsschermbeheer aanbieden</string>
   <!-- Live lock screen manager service provider permission description -->
+  <string name="permdesc_accessLiveLockScreenServiceProvider">Hiermee kan een service het geanimeerd vergrendelingsschermbeheer aanbieden.</string>
   <!-- Weather Service strings -->
   <string name="permlab_weather_read">weer lezen</string>
   <string name="permdesc_weather_read">Hiermee kan de app de inhoud van de weeraanbieder lezen.</string>
+  <string name="permlab_weather_write">weeraanbieder vernieuwen</string>
   <string name="permdesc_weather_write">Hiermee kan de app de inhoud van de weeraanbieder vernieuwen.</string>
   <string name="permdesc_weather_bind">Hiermee kan de app zich identificeren als weeraanbiederservice.</string>
   <string name="permlab_weather_access_mgr">toegang tot weerservice</string>
diff --git a/cm/res/res/values-pl/strings.xml b/cm/res/res/values-pl/strings.xml
index 3eb75179..89f1c47f 100644
--- a/cm/res/res/values-pl/strings.xml
+++ b/cm/res/res/values-pl/strings.xml
@@ -184,4 +184,9 @@
   <string name="qs_themes_label">Motywy</string>
   <string name="qs_themes_content_description">Dostosuj swój motyw</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Uruchamianie aplikacji\u2026</string>
+  <string name="android_upgrading_complete">Przygotowywanie do uruchomienia\u2026</string>
+  <string name="android_preparing_apk">Przygotowywanie %1$s\u2026</string>
+  <string name="android_preparing_apk_obscured">Przygotowywanie aplikacji\u2026</string>
+  <string name="android_upgrading_apk">%1$d z %2$d aplikacji</string>
 </resources>
diff --git a/cm/res/res/values-pt-rPT/strings.xml b/cm/res/res/values-pt-rPT/strings.xml
index 68a5be51..318dc5d8 100644
--- a/cm/res/res/values-pt-rPT/strings.xml
+++ b/cm/res/res/values-pt-rPT/strings.xml
@@ -81,7 +81,7 @@
   <!-- Name of wildcard profile. -->
   <string name="wildcardProfile">Outro</string>
   <!-- Performance profiles -->
-  <string name="perf_profile_pwrsv">Poupança de energia</string>
+  <string name="perf_profile_pwrsv">Poupança de bateria</string>
   <string name="perf_profile_bal">Equilibrado</string>
   <string name="perf_profile_perf">Desempenho</string>
   <string name="perf_profile_bias_power">Eficiência</string>
@@ -95,7 +95,7 @@
   <string name="live_display_day_summary">Usar apenas as definições de dia</string>
   <string name="live_display_night">Noite</string>
   <string name="live_display_night_summary">Usar apenas as definições de noite</string>
-  <string name="live_display_outdoor">Exterior (sol brilhante)</string>
+  <string name="live_display_outdoor">Exterior (sol forte)</string>
   <string name="live_display_outdoor_summary">Usar apenas as definições de exterior</string>
   <string name="live_display_hint">O LiveDisplay pode ajudar a reduzir a fadiga ocular e ajudá-lo a dormir melhor à noite. Toque aqui para experimentar!</string>
   <string name="accessibility_quick_settings_live_display_off">LiveDisplay desligado.</string>
diff --git a/cm/res/res/values-sv/strings.xml b/cm/res/res/values-sv/strings.xml
index 23b55faa..bfbe8b08 100644
--- a/cm/res/res/values-sv/strings.xml
+++ b/cm/res/res/values-sv/strings.xml
@@ -98,6 +98,10 @@
   <string name="live_display_outdoor">Utomhus (stark sol)</string>
   <string name="live_display_outdoor_summary">Använd endast utomhusläge</string>
   <string name="live_display_hint">LiveDisplay kan minska överansträngning av ögonen och hjälpa dig med nattsömnen. Klicka här för att prova!</string>
+  <string name="accessibility_quick_settings_live_display_off">LiveDisplay av.</string>
+  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automatiskt läge.</string>
+  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dagläge.</string>
+  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nattläge.</string>
   <!-- Third party keyguard permission label -->
   <string name="permlab_thirdPartyKeyguard">tredjepartslåsskärm</string>
   <!-- Third party keyguard permission description -->
@@ -150,4 +154,7 @@
   <!-- QuickSettings: Themes tile -->
   <string name="qs_themes_label">Teman</string>
   <!-- Custom booot dexopt -->
+  <string name="android_upgrading_starting_apps">Startar appar\u2026</string>
+  <string name="android_preparing_apk_obscured">Förbereder appar\u2026</string>
+  <string name="android_upgrading_apk">%1$d av %2$d appar</string>
 </resources>

From c4f27d5b812df3d66c21b4d7ba1d1d216cc0c593 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 1 Mar 2016 09:53:20 -0800
Subject: [PATCH 8/8] Themes: Introduce theme mixes into ThemesContract

Change-Id: I6341bada8e3ef674b272621f90bc9beb28767a59
TICKET: CYNGNOS-2121
---
 api/cm_current.txt                            | 20 ++++
 .../cyanogenmod/providers/ThemesContract.java | 93 +++++++++++++++++++
 system-api/cm_system-current.txt              | 20 ++++
 3 files changed, 133 insertions(+)

diff --git a/api/cm_current.txt b/api/cm_current.txt
index 5a57e676..7f848037 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -1160,6 +1160,26 @@ package cyanogenmod.providers {
     field public static final java.lang.String _ID = "_id";
   }
 
+  public static class ThemesContract.ThemeMixColumns {
+    ctor public ThemesContract.ThemeMixColumns();
+    field public static final android.net.Uri CONTENT_URI;
+    field public static final android.net.Uri PREVIEWS_URI;
+    field public static final java.lang.String TITLE = "title";
+    field public static final java.lang.String _ID = "_id";
+  }
+
+  public static class ThemesContract.ThemeMixEntryColumns {
+    ctor public ThemesContract.ThemeMixEntryColumns();
+    field public static final java.lang.String COMPONENT_ID = "component_id";
+    field public static final java.lang.String COMPONENT_TYPE = "component_type";
+    field public static final android.net.Uri CONTENT_URI;
+    field public static final java.lang.String IS_INSTALLED = "installed";
+    field public static final java.lang.String PACKAGE_NAME = "package_name";
+    field public static final java.lang.String THEME_MIX_ID = "theme_mix_id";
+    field public static final java.lang.String THEME_NAME = "theme_name";
+    field public static final java.lang.String _ID = "_id";
+  }
+
   public static class ThemesContract.ThemesColumns {
     ctor public ThemesContract.ThemesColumns();
     field public static final java.lang.String AUTHOR = "author";
diff --git a/sdk/src/java/cyanogenmod/providers/ThemesContract.java b/sdk/src/java/cyanogenmod/providers/ThemesContract.java
index 78d56cbe..b59d7b35 100644
--- a/sdk/src/java/cyanogenmod/providers/ThemesContract.java
+++ b/sdk/src/java/cyanogenmod/providers/ThemesContract.java
@@ -714,4 +714,97 @@ public class ThemesContract {
             LIVE_LOCK_SCREEN_THUMBNAIL,
         };
     }
+
+    public static class ThemeMixColumns {
+        /**
+         * Uri for accessing theme mixes
+         */
+        public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "theme_mixes");
+
+        /**
+         * Uri for retrieving the previews for the a theme mix.
+         * Querying the themes provider using this URI will return a cursor with a single row
+         * containing all the previews for the components associated with the given theme mix.
+         */
+        public static final Uri PREVIEWS_URI = Uri.withAppendedPath(AUTHORITY_URI,
+                "theme_mix_previews");
+
+        /**
+         * The unique ID for a row.
+         * <P>Type: INTEGER (long)</P>
+         */
+        public static final String _ID = "_id";
+
+        /**
+         * The name of this mix.
+         * <P>Type: TEXT</P>
+         */
+        public static final String TITLE = "title";
+
+    }
+
+    public static class ThemeMixEntryColumns {
+        /**
+         * Uri for accessing theme mix entries.
+         * These are the individual components associated with the saved theme mixes.
+         */
+        public static final Uri CONTENT_URI =
+                Uri.withAppendedPath(AUTHORITY_URI, "theme_mix_entries");
+
+        /**
+         * The unique ID for a row.
+         * <P>Type: INTEGER (long)</P>
+         */
+        public static final String _ID = "_id";
+
+        /**
+         * The unique ID of the theme mix this entry is for
+         * <P>Type: INTEGER (long)</P>
+         */
+        public static final String THEME_MIX_ID = "theme_mix_id";
+
+        /**
+         * The component type this entry is associated with
+         * <P>Type: TEXT</P>
+         * <P>Valid types are:
+         * {@link ThemesColumns#MODIFIES_ALARMS}
+         * {@link ThemesColumns#MODIFIES_BOOT_ANIM}
+         * {@link ThemesColumns#MODIFIES_FONTS}
+         * {@link ThemesColumns#MODIFIES_ICONS}
+         * {@link ThemesColumns#MODIFIES_LAUNCHER}</P>
+         * {@link ThemesColumns#MODIFIES_LIVE_LOCK_SCREEN}
+         * {@link ThemesColumns#MODIFIES_LOCKSCREEN}
+         * {@link ThemesColumns#MODIFIES_NAVIGATION_BAR}
+         * {@link ThemesColumns#MODIFIES_NOTIFICATIONS}
+         * {@link ThemesColumns#MODIFIES_OVERLAYS}
+         * {@link ThemesColumns#MODIFIES_RINGTONES}
+         * {@link ThemesColumns#MODIFIES_STATUS_BAR}
+         */
+        public static final String COMPONENT_TYPE = "component_type";
+
+        /*
+         * The unique ID for the component within a theme.
+         * Always 0 unless multiples of a component exist.
+         * <P>Type: INTEGER (long)</P>
+         */
+        public static final String COMPONENT_ID = "component_id";
+
+        /**
+         * Unique text to identify the theme package associated with this entry.
+         * <P>Type: TEXT</P>
+         */
+        public static final String PACKAGE_NAME = "package_name";
+
+        /**
+         * The name of the theme associated with this entry.
+         * <P>Type: TEXT</P>
+         */
+        public static final String THEME_NAME = "theme_name";
+
+        /**
+         * Whether the theme associated with this entry is currently installed.
+         * <P>Type: INTEGER (0|1)</P>
+         */
+        public static final String IS_INSTALLED = "installed";
+    }
 }
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index 5a57e676..7f848037 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -1160,6 +1160,26 @@ package cyanogenmod.providers {
     field public static final java.lang.String _ID = "_id";
   }
 
+  public static class ThemesContract.ThemeMixColumns {
+    ctor public ThemesContract.ThemeMixColumns();
+    field public static final android.net.Uri CONTENT_URI;
+    field public static final android.net.Uri PREVIEWS_URI;
+    field public static final java.lang.String TITLE = "title";
+    field public static final java.lang.String _ID = "_id";
+  }
+
+  public static class ThemesContract.ThemeMixEntryColumns {
+    ctor public ThemesContract.ThemeMixEntryColumns();
+    field public static final java.lang.String COMPONENT_ID = "component_id";
+    field public static final java.lang.String COMPONENT_TYPE = "component_type";
+    field public static final android.net.Uri CONTENT_URI;
+    field public static final java.lang.String IS_INSTALLED = "installed";
+    field public static final java.lang.String PACKAGE_NAME = "package_name";
+    field public static final java.lang.String THEME_MIX_ID = "theme_mix_id";
+    field public static final java.lang.String THEME_NAME = "theme_name";
+    field public static final java.lang.String _ID = "_id";
+  }
+
   public static class ThemesContract.ThemesColumns {
     ctor public ThemesContract.ThemesColumns();
     field public static final java.lang.String AUTHOR = "author";