Merge remote-tracking branch 'remotes/github/cm-12.1' into HEAD

Issue-Id: RM-170

Change-Id: If629cf409194a650dd9fa76106555dbd5655b34a

49 files changed, 114 insertions, 57 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index e7529e4bd..f8ebfea6c 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Bladsye</string>
   <string name="setting_state_disabled">Gedeaktiveer</string>
   <string name="search_activity_not_found">\'n Soektog aktiwiteit kon nie gevind word nie!</string>
-  <string name="app_not_available">Program nie beskikbaar nie</string>
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 60e122f09..d9e85e56c 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">مقسم إلى صفحات</string>
   <string name="setting_state_disabled">معطل</string>
   <string name="search_activity_not_found">لا يمكن العثور على نشاط بحثي!</string>
-  <string name="app_not_available">التطبيق غير متوافر</string>
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 41a828980..2c83f99a1 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -31,6 +31,7 @@
   <string name="grid_size_condensed">Condensáu</string>
   <string name="grid_size_custom">Personalizar (<xliff:g id="rows">%1$d</xliff:g> \u00d7 <xliff:g id="columns">%2$d</xliff:g>)</string>
   <string name="preferences_interface_homescreen_custom">Esbilla\'l tamañu personalizáu</string>
+  <string name="play_folder_title">Reproducir</string>
   <string name="scroll_effect_text">Efeutu de desplazamientu</string>
   <string name="drawer_sorting_text">Mou d\'ordenación</string>
   <string name="sort_mode_title">Títulu</string>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 566e9e768..cf74ce20e 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -27,7 +27,6 @@
   <string name="widget_adder">Widgets</string>
   <string name="toggle_weight_watcher">Amosar memoria</string>
   <string name="long_press_widget_to_add">Caltén primíu\'l widget que quieras esbillar.</string>
-  <string name="market">Tienda</string>
   <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
   <string name="external_drop_widget_error">Fallu al arrastrar l\'elementu a la pantalla d\'aniciu.</string>
   <string name="external_drop_widget_pick_title">Esbilla un widget p\'amestar</string>
@@ -55,8 +54,6 @@
   <string name="delete_target_label">Desaniciar</string>
   <string name="delete_target_uninstall_label">Desinstalar</string>
   <string name="info_target_label">Información de l\'aplicación</string>
-  <string name="accessibility_search_button">Guetar</string>
-  <string name="accessibility_voice_search_button">Gueta por voz</string>
   <string name="accessibility_all_apps_button">Aplicaciones</string>
   <string name="accessibility_delete_button">Desaniciar</string>
   <string name="delete_zone_label_all_apps_system_app">Desinstalar anovamientu</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 75f1f12b4..9f5eb930b 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Səhifəli</string>
   <string name="setting_state_disabled">LƏĞV EDİLDİ</string>
   <string name="search_activity_not_found">Axtarış fəaliyyəti tapılmadı!</string>
-  <string name="app_not_available">Tətbiq mövcud deyil</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 9e26a28c0..1dfea6512 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Paginada</string>
   <string name="setting_state_disabled">DESHABILITAT</string>
   <string name="search_activity_not_found">No s\'ha pogut trobar una activitat de cerca!</string>
-  <string name="app_not_available">Aplicació no disponible</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 1cab1259f..b385b3f99 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Stránkové</string>
   <string name="setting_state_disabled">ZAKÁZÁNO</string>
   <string name="search_activity_not_found">Vyhledávací aktivita nenalezena!</string>
-  <string name="app_not_available">Aplikace není k dispozici</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 005b64b96..b1bf8d429 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Sideinddelt</string>
   <string name="setting_state_disabled">HANDICAPPET</string>
   <string name="search_activity_not_found">En funktion til søgning findes ikke!</string>
-  <string name="app_not_available">App ikke tilgængelig</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index aec349004..f41903af7 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Seiten</string>
   <string name="setting_state_disabled">DEAKTIVIERT</string>
   <string name="search_activity_not_found">Es konnte keine Suche-Aktivität gefunden werden!</string>
-  <string name="app_not_available">APP nicht verfügbar</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 5b327c1aa..9b8e98e68 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Οριζόντια</string>
   <string name="setting_state_disabled">ΑΠΕΝΕΡΓΟΠΟΙΗΜΕΝΟ</string>
   <string name="search_activity_not_found">Δεν βρέθηκε καμία δραστηριότητα αναζήτησης!</string>
-  <string name="app_not_available">Η εφαρμογή δεν είναι διαθέσιμη</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index ad9b409cb..aaf703131 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Paginado</string>
   <string name="setting_state_disabled">DESHABILITADO</string>
   <string name="search_activity_not_found">¡No se pudo encontrar un asistente de búsqueda!</string>
-  <string name="app_not_available">Aplicación no disponible</string>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index afd4b7b80..d058cef9e 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Leheküljed</string>
   <string name="setting_state_disabled">KEELATUD</string>
   <string name="search_activity_not_found">Otsimise tegevusala ei leitud!</string>
-  <string name="app_not_available">Rakendus pole saadaval</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index ceec41a7b..a2a1ed1e6 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Orrialdeka</string>
   <string name="setting_state_disabled">EZGAITUTA</string>
   <string name="search_activity_not_found">Ezin izan da bilaketa aktibitaterik aurkitu!</string>
-  <string name="app_not_available">Aplikazioa ez dago eskuragarri</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index a3cd308e2..514261787 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">صفحه به صفحه</string>
   <string name="setting_state_disabled">غیرفعال</string>
   <string name="search_activity_not_found">عملگری برای جستجو یافت نشد!</string>
-  <string name="app_not_available">برنامه در دسترس نیست</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 70d314053..d1f8f0ffc 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Vaaka</string>
   <string name="setting_state_disabled">POIS KÄYTÖSTÄ</string>
   <string name="search_activity_not_found">Hakuhistoriaa ei löytynyt!</string>
-  <string name="app_not_available">Sovellus ei käytettävissä</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 50c0dbafe..fceb33252 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Paginée</string>
   <string name="setting_state_disabled">DÉSACTIVÉ</string>
   <string name="search_activity_not_found">Aucune recherche n\'a pu être trouvée !</string>
-  <string name="app_not_available">Application non disponible</string>
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 962ace5aa..3cd30b32d 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">पृष्ठीय</string>
   <string name="setting_state_disabled">अक्षम</string>
   <string name="search_activity_not_found">एक खोज गतिविधि नहीं मिली।</string>
-  <string name="app_not_available">ऐप उपलब्ध नहीं है</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 4140f1e9d..8a783ac40 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Lapozható</string>
   <string name="setting_state_disabled">LETILTVA</string>
   <string name="search_activity_not_found">Keresési tevékenység nem található!</string>
-  <string name="app_not_available">Alkalmazás nem elérhető</string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 89dbcef97..f4f14ae10 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Berhalaman</string>
   <string name="setting_state_disabled">DINONAKTIFKAN</string>
   <string name="search_activity_not_found">Aktivitas pencarian tidak dapat ditemukan!</string>
-  <string name="app_not_available">Aplikasi tidak tersedia</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index db524ea4e..22134dd56 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Paginato</string>
   <string name="setting_state_disabled">DISATTIVATO</string>
   <string name="search_activity_not_found">Impossibile trovare un\'activity di ricerca!</string>
-  <string name="app_not_available">App non disponibile</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 05fb8d01e..ec85c55a3 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">דפים</string>
   <string name="setting_state_disabled">כבוי</string>
   <string name="search_activity_not_found">לא ניתן היה למצוא פעולת חיפוש!</string>
-  <string name="app_not_available">יישום לא זמין</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index cf701b28a..c1c76f813 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">ページ</string>
   <string name="setting_state_disabled">無効</string>
   <string name="search_activity_not_found">検索アクティビティが見つかりませんでした。</string>
-  <string name="app_not_available">アプリが利用できません</string>
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 4989a8041..cd1ec624c 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">ಪುಟವಾದ</string>
   <string name="setting_state_disabled">ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ</string>
   <string name="search_activity_not_found">ಶೋಧನೆ ಚಟುವಟಿಕೆ ಪತ್ತೆಯಾಗಲಿಲ್ಲ!</string>
-  <string name="app_not_available">ಆಪ್ ಲಭ್ಯವಿಲ್ಲ</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 19e5bda8b..e95bc71fc 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">페이징</string>
   <string name="setting_state_disabled">사용 안함</string>
   <string name="search_activity_not_found">검색 작업을 찾아 낼 수 없습니다.</string>
-  <string name="app_not_available">앱을 사용할 수 없음</string>
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index b4a54bbcf..28e8fc50a 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -26,7 +26,6 @@
   <string name="widget_adder">ویدجێتەکان</string>
   <string name="toggle_weight_watcher">پیشاندانی بیرگە</string>
   <string name="long_press_widget_to_add">بیسوو &amp; دەست ڕاگرە بۆ هەڵگرتنی ویجێتێک.</string>
-  <string name="market">فرۆشگا</string>
   <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
   <string name="external_drop_widget_error">نەیتوانی بڕگەکە فڕێداتە سەر ئەم ڕوونمایە.</string>
   <string name="external_drop_widget_pick_title">ویجێت هەڵبژێرە بۆ دروستکردن</string>
@@ -54,8 +53,6 @@
   <string name="delete_target_label">لابردن</string>
   <string name="delete_target_uninstall_label">دامه‌زرانسڕینه‌وه‌</string>
   <string name="info_target_label">زانیاریی بەرنامە</string>
-  <string name="accessibility_search_button">گه‌ڕان</string>
-  <string name="accessibility_voice_search_button">گەڕانی دەنگی</string>
   <string name="accessibility_all_apps_button">بەرنامەکان</string>
   <string name="accessibility_delete_button">لابردن</string>
   <string name="delete_zone_label_all_apps_system_app">دامه‌زرانسڕینه‌وه‌ی بەڕۆژکردنەوە</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index f8736d70d..5ae11260d 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Säiten</string>
   <string name="setting_state_disabled">DESAKTIVÉIEREN</string>
   <string name="search_activity_not_found">Eng Sichaktivitéit konnt net fonnt ginn!</string>
-  <string name="app_not_available">App net disponibel</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index e6d38307f..fdeb17381 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -22,12 +22,13 @@
   <string name="home">Startschierm</string>
   <string name="uid_name">Kär-Appe vun Android</string>
   <string name="activity_not_found">D\'App ass net installéiert.</string>
+  <string name="activity_not_available">App ass net disponibel</string>
   <string name="safemode_shortcut_error">Erofgelueden App am séchere Modus desaktivéiert</string>
+  <string name="safemode_widget_error">Widgeten desaktivéiert am Sécherheetsmodus</string>
   <string name="widgets_tab_label">Widgeten</string>
   <string name="widget_adder">Widgeten</string>
   <string name="toggle_weight_watcher">Späicher uweisen</string>
   <string name="long_press_widget_to_add">Drécken an halen, fir e Widget opzerafen.</string>
-  <string name="market">Geschäft</string>
   <string name="widget_dims_format">%1$d \u00d7 %2$d</string>
   <string name="external_drop_widget_error">Konnt d\'Element net um Startschierm ofleeën.</string>
   <string name="external_drop_widget_pick_title">Widget auswielen den erstallt soll ginn</string>
@@ -55,8 +56,6 @@
   <string name="delete_target_label">Läschen</string>
   <string name="delete_target_uninstall_label">Desinstalléieren</string>
   <string name="info_target_label">App-Info</string>
-  <string name="accessibility_search_button">Sichen</string>
-  <string name="accessibility_voice_search_button">Stëmmsich</string>
   <string name="accessibility_all_apps_button">Appen</string>
   <string name="accessibility_delete_button">Ewechhuelen</string>
   <string name="delete_zone_label_all_apps_system_app">Aktualiséierung desinstalléieren</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index db9997479..cfdfa6b6a 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Puslapiai</string>
   <string name="setting_state_disabled">NELEIDŽIAMA</string>
   <string name="search_activity_not_found">Paieškos veikla negali būti rasta!</string>
-  <string name="app_not_available">Programa nepasiekiama</string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 92f927512..6835349dd 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Sidevekslet</string>
   <string name="setting_state_disabled">DEAKTIVERT</string>
   <string name="search_activity_not_found">Finner ikke en søkeaktivitet!</string>
-  <string name="app_not_available">App ikke tilgjengelig</string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 51bbdbd28..685e329e2 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Met pagina\'s</string>
   <string name="setting_state_disabled">UITGESCHAKELD</string>
   <string name="search_activity_not_found">Geen zoekactiviteit gevonden</string>
-  <string name="app_not_available">App niet beschikbaar</string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 1c93eb9d3..1cc8d90e0 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Strony</string>
   <string name="setting_state_disabled">WYŁĄCZONE</string>
   <string name="search_activity_not_found">Nie można odnaleźć aktywności związanej z wyszukiwaniem!</string>
-  <string name="app_not_available">Aplikacja niedostępna</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 8a1c181bc..daf50efde 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Paginada</string>
   <string name="setting_state_disabled">DESATIVADO</string>
   <string name="search_activity_not_found">Uma atividade de pesquisa não pôde ser encontrada!</string>
-  <string name="app_not_available">App não disponível</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 54bf2ec81..ac8b7f70e 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Paginada</string>
   <string name="setting_state_disabled">DESATIVADO</string>
   <string name="search_activity_not_found">Não foi encontrada nenhuma atividade de pesquisa!</string>
-  <string name="app_not_available">A aplicação não está disponível</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index e4676b89e..c397e3c7b 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Paginat</string>
   <string name="setting_state_disabled">DEZACTIVAT</string>
   <string name="search_activity_not_found">Imposibil de găsit o activitate de căutare!</string>
-  <string name="app_not_available">Aplicația nu este disponibilă</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 9b5c69d2b..78b65d10c 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Постраничное</string>
   <string name="setting_state_disabled">НЕДОСТУПНО</string>
   <string name="search_activity_not_found">Невозможно запустить приложение поиска!</string>
-  <string name="app_not_available">Приложение недоступно</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 1f13b4597..3a8c2208b 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Stránkované</string>
   <string name="setting_state_disabled">ZAKÁZANÉ</string>
   <string name="search_activity_not_found">Aktivita vyhľadávania sa nenašla!</string>
-  <string name="app_not_available">Aplikácia nie je k dispozícii</string>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 74af9a763..ea99bd8cf 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Po straneh</string>
   <string name="setting_state_disabled">ONEMOGOČENO</string>
   <string name="search_activity_not_found">Dejavnosti iskanja ni bilo mogoče najti!</string>
-  <string name="app_not_available">Program ni na voljo</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index f7d5b65fd..baeab81bd 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Поставка</string>
   <string name="setting_state_disabled">ОНЕМОГУЋЕНО</string>
   <string name="search_activity_not_found">Претрага активности не може бити пронађена!</string>
-  <string name="app_not_available">Апликација није доступна</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index a095bd27f..f4ef8d99a 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">หน้า</string>
   <string name="setting_state_disabled">ปิดการใช้งาน</string>
   <string name="search_activity_not_found">ไม่มีกิจกรรมที่ค้นหา!</string>
-  <string name="app_not_available">ไม่สามารถใช้งานแอพได้</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index d147e044b..3546f0485 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Sayfalı</string>
   <string name="setting_state_disabled">DEVRE DIŞI</string>
   <string name="search_activity_not_found">Arama etkinliği bulunamadı!</string>
-  <string name="app_not_available">Uyg. kullanılabilir değil</string>
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 3a33eb592..f66e86869 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Сторінками</string>
   <string name="setting_state_disabled">ВИМКНЕНО</string>
   <string name="search_activity_not_found">Діяльність з пошуку не виявлена!</string>
-  <string name="app_not_available">Додаток недоступний</string>
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 6767fc536..b9002e834 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">Đã đánh số trang</string>
   <string name="setting_state_disabled">ĐÃ TẮT</string>
   <string name="search_activity_not_found">Không tìm thấy hoạt động tìm kiếm!</string>
-  <string name="app_not_available">Ứng dụng không sẵn có</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index dee4424ef..d0177c9b0 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -49,5 +49,4 @@
   <string name="drawer_type_pager">分页</string>
   <string name="setting_state_disabled">已禁用</string>
   <string name="search_activity_not_found">无法找到搜索活动！</string>
-  <string name="app_not_available">应用不可用</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 72fc28f5c..a9ec7bfba 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -47,5 +47,4 @@
   <string name="drawer_type_drawer">垂直</string>
   <string name="drawer_type_pager">分頁</string>
   <string name="search_activity_not_found">找不到搜尋活動！</string>
-  <string name="app_not_available">應用程式不可用</string>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 225e3358e..7602ac107 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -48,6 +48,7 @@
     <!-- Folder titles -->
     <string name="google_title" translatable="false">Google</string>
     <string name="play_folder_title">Play</string>
+    <string name="partner_title" translatable="false"></string>
 
     <!-- Scroll effect -->
     <string name="scroll_effect_text">Scroll effect</string>
diff --git a/res/xml/default_workspace_5x5.xml b/res/xml/default_workspace_5x5.xml
index e8a7f536c..b3b064dba 100644
--- a/res/xml/default_workspace_5x5.xml
+++ b/res/xml/default_workspace_5x5.xml
@@ -141,7 +141,7 @@
         launcher:packageName="com.cyanogenmod.eleven"
         launcher:className="com.cyanogenmod.eleven.ui.activities.HomeActivity"
         launcher:screen="2"
-        launcher:x="0"
+        launcher:x="3"
         launcher:y="4" />
 
     <favorite
@@ -189,7 +189,7 @@
     <resolve
         launcher:container="-101"
         launcher:screen="3"
-        launcher:x="2"
+        launcher:x="3"
         launcher:y="0" >
         <favorite
             launcher:packageName="com.android.browser"
@@ -215,4 +215,4 @@
             launcher:className="com.android.camera.CameraLauncher" />
     </resolve>
 
-</favorites>
\ No newline at end of file
+</favorites>
diff --git a/src/com/android/launcher3/AppDrawerContainer.java b/src/com/android/launcher3/AppDrawerContainer.java
index f67bd9aa4..e87c6b8a4 100644
--- a/src/com/android/launcher3/AppDrawerContainer.java
+++ b/src/com/android/launcher3/AppDrawerContainer.java
@@ -8,8 +8,12 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 public class AppDrawerContainer extends InsettableFrameLayout {
+
+    private int mScrubberHeight;
+
     public AppDrawerContainer(Context context, AttributeSet attrs) {
         super(context, attrs);
+        mScrubberHeight = getResources().getDimensionPixelSize(R.dimen.scrubber_height);
     }
 
     @Override
@@ -18,8 +22,8 @@ public class AppDrawerContainer extends InsettableFrameLayout {
         View view = findViewById(R.id.app_drawer_recyclerview);
         FrameLayout.LayoutParams lp =
                 (FrameLayout.LayoutParams) view.getLayoutParams();
-        int paddingBottom = view.getPaddingBottom() + insets.bottom - mInsets.bottom;
-        int paddingTop = view.getPaddingTop() + insets.top - mInsets.top;
+        int paddingBottom =  mScrubberHeight + insets.bottom - mInsets.bottom;
+        int paddingTop = insets.top - mInsets.top;
         view.setLayoutParams(lp);
         view.setPadding(view.getPaddingLeft(), paddingTop, view.getPaddingRight(), paddingBottom);
 
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index efa203769..c55adfcf6 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -23,12 +23,16 @@ import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Handler;
+import android.os.SystemProperties;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
@@ -44,6 +48,8 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
 
     private static final boolean DEBUG = false;
 
+    private static final String MCC_PROP_NAME = "ro.prebundled.mcc";
+
     private final AppFilter mAppFilter;
     private final BuildInfo mBuildInfo;
     private final LauncherModel mModel;
@@ -210,13 +216,52 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
         DisplayMetrics dm = new DisplayMetrics();
         display.getMetrics(dm);
 
+        Resources resources = context.getResources();
+
         if (dynamicGrid == null) {
             Point smallestSize = new Point();
             Point largestSize = new Point();
             display.getCurrentSizeRange(smallestSize, largestSize);
 
+            String mcc = SystemProperties.get(MCC_PROP_NAME);
+
+            if (!TextUtils.isEmpty(mcc)) {
+                Log.d(TAG, "mcc not empty: " + mcc);
+
+                Configuration tempConfiguration = new Configuration(resources.getConfiguration());
+                boolean shouldUseTempConfig = false;
+
+                try {
+                    tempConfiguration.mcc = Integer.parseInt(mcc);
+                    shouldUseTempConfig = true;
+                } catch (NumberFormatException e) {
+                    // not able to parse mcc, catch exception and exit out of this logic
+                    e.printStackTrace();
+                }
+
+                if (shouldUseTempConfig) {
+                    String publicSrcDir = null;
+                    try {
+                        String packageName = sContext.getPackageName();
+                        publicSrcDir = sContext.getPackageManager().getApplicationInfo(packageName,
+                                0).publicSourceDir;
+                    } catch (PackageManager.NameNotFoundException e) {
+                        e.printStackTrace();
+                    }
+
+                    AssetManager assetManager = new AssetManager();
+                    if (!TextUtils.isEmpty(publicSrcDir)) {
+                        assetManager.addAssetPath(publicSrcDir);
+                    }
+
+                    resources = new Resources(assetManager, new DisplayMetrics(),
+                            tempConfiguration);
+                }
+
+            }
+
             dynamicGrid = new DynamicGrid(context,
-                    context.getResources(),
+                    resources,
                     Math.min(smallestSize.x, smallestSize.y),
                     Math.min(largestSize.x, largestSize.y),
                     realSize.x, realSize.y,
@@ -225,7 +270,7 @@ public class LauncherAppState implements DeviceProfile.DeviceProfileCallbacks {
 
         // Update the icon size
         DeviceProfile grid = dynamicGrid.getDeviceProfile();
-        grid.updateFromConfiguration(context, context.getResources(),
+        grid.updateFromConfiguration(context, resources,
                 realSize.x, realSize.y,
                 dm.widthPixels, dm.heightPixels);
         return dynamicGrid;
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 753f6e746..c754edb13 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -30,6 +30,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.OperationApplicationException;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.AssetManager;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.SQLException;
@@ -40,8 +43,10 @@ import android.database.sqlite.SQLiteStatement;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
+import android.os.SystemProperties;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.SparseArray;
 
@@ -90,6 +95,8 @@ public class LauncherProvider extends ContentProvider {
     static final Uri CONTENT_APPWIDGET_RESET_URI =
             Uri.parse("content://" + AUTHORITY + "/appWidgetReset");
 
+    private static final String MCC_PROP_NAME = "ro.prebundled.mcc";
+
     private DatabaseHelper mOpenHelper;
     private static boolean sJustLoadedFromOldDb;
 
@@ -311,11 +318,57 @@ public class LauncherProvider extends ContentProvider {
         SharedPreferences sp = getContext().getSharedPreferences(spKey, Context.MODE_PRIVATE);
 
         if (sp.getBoolean(EMPTY_DATABASE_CREATED, false)) {
-            Log.d(TAG, "loading default workspace");
+            if (LOGD) Log.d(TAG, "loading default workspace");
 
             AutoInstallsLayout loader = AutoInstallsLayout.get(getContext(),
                     mOpenHelper.mAppWidgetHost, mOpenHelper);
 
+            String mcc = SystemProperties.get(MCC_PROP_NAME);
+
+            if (!TextUtils.isEmpty(mcc)) {
+                if (LOGD) Log.d(TAG, "mcc: " + mcc);
+
+                Configuration tempConfiguration = new Configuration(getContext().getResources().
+                        getConfiguration());
+                boolean shouldUseTempConfig = false;
+
+                try {
+                    tempConfiguration.mcc = Integer.parseInt(mcc);
+                    shouldUseTempConfig = true;
+                } catch (NumberFormatException e) {
+                    // not able to parse mcc, catch exception and exit out of this logic
+                    e.printStackTrace();
+                }
+
+                if (shouldUseTempConfig) {
+                    String publicSrcDir = null;
+                    try {
+                        String packageName = getContext().getPackageName();
+                        publicSrcDir = getContext().getPackageManager().
+                                getApplicationInfo(packageName, 0).publicSourceDir;
+                    } catch (PackageManager.NameNotFoundException e) {
+                        e.printStackTrace();
+                    }
+
+                    AssetManager assetManager = new AssetManager();
+                    if (!TextUtils.isEmpty(publicSrcDir)) {
+                        assetManager.addAssetPath(publicSrcDir);
+                    }
+                    Resources customResources = new Resources(assetManager, new DisplayMetrics(),
+                            tempConfiguration);
+
+                    int mccLayout = LauncherAppState.getInstance()
+                            .getDynamicGrid().getDeviceProfile().defaultLayoutId;
+
+                    if (mccLayout != 0) {
+                        if (LOGD) Log.d(TAG, "mcc layout id: " + mccLayout);
+
+                        loader = new DefaultLayoutParser(getContext(), mOpenHelper.mAppWidgetHost,
+                                mOpenHelper, customResources, mccLayout);
+                    }
+                }
+            }
+
             if (loader == null) {
                 final Partner partner = Partner.get(getContext().getPackageManager());
                 if (partner != null && partner.hasDefaultLayout()) {