diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index c6e2d8cb74..80d8154ba1 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -48,7 +48,7 @@
android:stateNotNeeded="true"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="unspecified"
- android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+ android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
android:resizeableActivity="true"
android:resumeWhilePausing="true"
android:taskAffinity=""
diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml
index bf198b605f..4abf6e150b 100644
--- a/quickstep/AndroidManifest.xml
+++ b/quickstep/AndroidManifest.xml
@@ -80,7 +80,7 @@
android:stateNotNeeded="true"
android:theme="@style/LauncherTheme"
android:screenOrientation="behind"
- android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize"
+ android:configChanges="keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
android:resizeableActivity="true"
android:resumeWhilePausing="true"
android:enableOnBackInvokedCallback="false"
diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml
index 0b03e02122..f7bf7198e1 100644
--- a/quickstep/res/values-af/strings.xml
+++ b/quickstep/res/values-af/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Wys nog # app.}other{Wys nog # apps.}}"
"{count,plural, =1{Wys # rekenaarapp.}other{Wys # rekenaarapps.}}"
"%1$s en %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml
index c8fd27668f..1700823424 100644
--- a/quickstep/res/values-am/strings.xml
+++ b/quickstep/res/values-am/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{ተጨማሪ # መተግበሪያ አሳይ።}one{ተጨማሪ # መተግበሪያ አሳይ።}other{ተጨማሪ # መተግበሪያዎች አሳይ።}}"
"{count,plural, =1{# የዴስክቶፕ መተግበሪያ አሳይ።}one{# የዴስክቶፕ መተግበሪያ አሳይ።}other{# የዴስክቶፕ መተግበሪያዎች አሳይ።}}"
"%1$s እና %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index ca0e1dda9b..38e9f701b2 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{إظهار تطبيق واحد آخر}zero{إظهار # تطبيق آخر}two{إظهار تطبيقَين آخرَين}few{إظهار # تطبيقات أخرى}many{إظهار # تطبيقًا آخر}other{إظهار # تطبيق آخر}}"
"{count,plural, =1{عرض تطبيق واحد متوافق مع الكمبيوتر المكتبي}zero{عرض # تطبيق متوافق مع الكمبيوتر المكتبي}two{عرض تطبيقَين متوافقين مع الكمبيوتر المكتبي}few{عرض # تطبيقات متوافقة مع الكمبيوتر المكتبي}many{عرض # تطبيقًا متوافقًا مع الكمبيوتر المكتبي}other{عرض # تطبيق متوافق مع الكمبيوتر المكتبي}}"
"\"%1$s\" و\"%2$s\""
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 7cd769645c..5ba91634ae 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{আৰু # টা এপ্ দেখুৱাওক।}one{আৰু # টা এপ্ দেখুৱাওক।}other{আৰু # টা এপ্ দেখুৱাওক।}}"
"{count,plural, =1{# টা ডেস্কটপ এপ্ দেখুৱাওক।}one{# টা ডেস্কটপ এপ্ দেখুৱাওক।}other{# টা ডেস্কটপ এপ্ দেখুৱাওক।}}"
"%1$s আৰু %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index f5840abbc9..ab753679b6 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Daha # tətbiqi göstərin.}other{Daha # tətbiqi göstərin.}}"
"{count,plural, =1{# masaüstü tətbiqini göstərin.}other{# masaüstü tətbiqini göstərin.}}"
"%1$s və %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml
index 276a8b9549..d23ba50e0b 100644
--- a/quickstep/res/values-b+sr+Latn/strings.xml
+++ b/quickstep/res/values-b+sr+Latn/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Prikaži još # aplikaciju.}one{Prikaži još # aplikaciju.}few{Prikaži još # aplikacije.}other{Prikaži još # aplikacija.}}"
"{count,plural, =1{Prikaži # aplikaciju za računare.}one{Prikaži # aplikaciju za računare.}few{Prikaži # aplikacije za računare.}other{Prikaži # aplikacija za računare.}}"
"%1$s i %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 0785e0f487..2829fd9962 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Паказаць ячшэ # праграму.}one{Паказаць ячшэ # праграму.}few{Паказаць ячшэ # праграмы.}many{Паказаць ячшэ # праграм.}other{Паказаць ячшэ # праграмы.}}"
"{count,plural, =1{Паказаць # праграму для ПК.}one{Паказаць # праграму для ПК.}few{Паказаць # праграмы для ПК.}many{Паказаць # праграм для ПК.}other{Паказаць # праграмы для ПК.}}"
"%1$s і %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index c26bc6fd93..bb7d7be7c5 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Показване на още # приложение.}other{Показване на още # приложения.}}"
"{count,plural, =1{Показване на # настолно приложение.}other{Показване на # настолни приложения.}}"
"%1$s и %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml
index f7f666bb9e..ebde96d0ab 100644
--- a/quickstep/res/values-bn/strings.xml
+++ b/quickstep/res/values-bn/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{আরও #টি অ্যাপ দেখুন।}one{আরও #টি অ্যাপ দেখুন।}other{আরও #টি অ্যাপ দেখুন।}}"
"{count,plural, =1{#টি ডেস্কটপ অ্যাপ দেখুন।}one{#টি ডেস্কটপ অ্যাপ দেখুন।}other{#টি ডেস্কটপ অ্যাপ দেখুন।}}"
"%1$s ও %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml
index 11671452b2..89cdc285e0 100644
--- a/quickstep/res/values-bs/strings.xml
+++ b/quickstep/res/values-bs/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Prikaži još # aplikaciju.}one{Prikaži još # aplikaciju.}few{Prikaži još # aplikacije.}other{Prikaži još # aplikacija.}}"
"{count,plural, =1{Prikaži # aplikaciju za računar.}one{Prikaži # aplikaciju za računar.}few{Prikaži # aplikacije za računar.}other{Prikaži # aplikacija za računar.}}"
"%1$s i %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index ba8e3c160e..f1768aa47f 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Mostra # aplicació més.}other{Mostra # aplicacions més.}}"
"{count,plural, =1{Mostra # aplicació per a ordinadors.}other{Mostra # aplicacions per a ordinadors.}}"
"%1$s i %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 7f1cd94f9c..6c523ca337 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Zobrazit # další aplikaci.}few{Zobrazit # další aplikace.}many{Zobrazit # další aplikace.}other{Zobrazit # dalších aplikací.}}"
"{count,plural, =1{Zobrazit # aplikaci pro počítač.}few{Zobrazit # aplikace pro počítač.}many{Zobrazit # aplikace pro počítač.}other{Zobrazit # aplikací pro počítač.}}"
"%1$s a %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index 1daf365c49..a8d361212b 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Vis # app mere.}one{Vis # app mere.}other{Vis # apps mere.}}"
"{count,plural, =1{Vis # computerprogram.}one{Vis # computerprogram.}other{Vis # computerprogrammer.}}"
"%1$s og %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml
index b089976936..bc15ca530a 100644
--- a/quickstep/res/values-de/strings.xml
+++ b/quickstep/res/values-de/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{# weitere App anzeigen}other{# weitere Apps anzeigen}}"
"{count,plural, =1{# Desktop-App anzeigen.}other{# Desktop-Apps anzeigen.}}"
"%1$s und %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml
index 66ca90ecbe..c317aa470c 100644
--- a/quickstep/res/values-el/strings.xml
+++ b/quickstep/res/values-el/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Εμφάνιση # ακόμα εφαρμογής.}other{Εμφάνιση # ακόμα εφαρμογών.}}"
"{count,plural, =1{Εμφάνιση # εφαρμογής υπολογιστή.}other{Εμφάνιση # εφαρμογών υπολογιστή.}}"
"%1$s και %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml
index fe5b479bcd..519146b17b 100644
--- a/quickstep/res/values-en-rAU/strings.xml
+++ b/quickstep/res/values-en-rAU/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Show # more app.}other{Show # more apps.}}"
"{count,plural, =1{Show # desktop app.}other{Show # desktop apps.}}"
"%1$s and %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml
index 3bd2bdd85f..4205e49c6c 100644
--- a/quickstep/res/values-en-rCA/strings.xml
+++ b/quickstep/res/values-en-rCA/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Show # more app.}other{Show # more apps.}}"
"{count,plural, =1{Show # desktop app.}other{Show # desktop apps.}}"
"%1$s and %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml
index fe5b479bcd..519146b17b 100644
--- a/quickstep/res/values-en-rGB/strings.xml
+++ b/quickstep/res/values-en-rGB/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Show # more app.}other{Show # more apps.}}"
"{count,plural, =1{Show # desktop app.}other{Show # desktop apps.}}"
"%1$s and %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml
index fe5b479bcd..519146b17b 100644
--- a/quickstep/res/values-en-rIN/strings.xml
+++ b/quickstep/res/values-en-rIN/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Show # more app.}other{Show # more apps.}}"
"{count,plural, =1{Show # desktop app.}other{Show # desktop apps.}}"
"%1$s and %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml
index 52efe9d08b..44afeddbdd 100644
--- a/quickstep/res/values-en-rXC/strings.xml
+++ b/quickstep/res/values-en-rXC/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Show # more app.}other{Show # more apps.}}"
"{count,plural, =1{Show # desktop app.}other{Show # desktop apps.}}"
"%1$s and %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml
index 095b06e2d4..4930c0b6be 100644
--- a/quickstep/res/values-es-rUS/strings.xml
+++ b/quickstep/res/values-es-rUS/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Mostrar # app más.}other{Mostrar # apps más.}}"
"{count,plural, =1{Mostrar # app para computadoras.}other{Mostrar # apps para computadoras.}}"
"%1$s y %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index dbc7caaa88..4b45f5ef07 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Mostrar # aplicación más.}other{Mostrar # aplicaciones más.}}"
"{count,plural, =1{Mostrar # aplicación para ordenadores.}other{Mostrar # aplicaciones para ordenadores.}}"
"%1$s y %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index c53f80c64f..d6b9e7848e 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -73,7 +73,7 @@
"Pühkige kindlasti ekraani alumisest servast üles."
"Hoidke sõrme aknal pisut kauem, enne kui vabastate"
"Pühkige kindlasti otse üles, seejärel peatuge"
- "Õppisite liigutusi kasutama. Liigutuste väljalülitamiseks avage seaded."
+ "Õppisite liigutusi kasutama. Liigutuste väljalülitamiseks avage Seaded."
"Tegite rakenduste vahel vahetamise liigutuse"
"Pühkige rakenduste vahetamiseks"
"Rakenduste vahel vahetamiseks pühkige ekraanikuva alaosast üles, hoidke ja seejärel vabastage."
@@ -140,4 +140,12 @@
"{count,plural, =1{Kuva veel # rakendus.}other{Kuva veel # rakendust.}}"
"{count,plural, =1{Kuva # töölauarakendus.}other{Kuva # töölauarakendust.}}"
"%1$s ja %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml
index ecdacd2465..bcecfeac25 100644
--- a/quickstep/res/values-eu/strings.xml
+++ b/quickstep/res/values-eu/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Erakutsi beste # aplikazio.}other{Erakutsi beste # aplikazio.}}"
"{count,plural, =1{Erakutsi ordenagailuetarako # aplikazio.}other{Erakutsi ordenagailuetarako # aplikazio.}}"
"%1$s eta %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml
index 0dad8016aa..a68d77c856 100644
--- a/quickstep/res/values-fa/strings.xml
+++ b/quickstep/res/values-fa/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{نمایش # برنامه دیگر.}one{نمایش # برنامه دیگر.}other{نمایش # برنامه دیگر.}}"
"{count,plural, =1{نمایش # برنامه رایانه.}one{نمایش # برنامه رایانه.}other{نمایش # برنامه رایانه.}}"
"%1$s و %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 8624fe7b3b..bb0516ccd3 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Näytä # muu sovellus.}other{Näytä # muuta sovellusta.}}"
"{count,plural, =1{Näytä # työpöytäsovellus.}other{Näytä # työpöytäsovellusta.}}"
"%1$s ja %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index 737380057f..dd36f2e5d3 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Afficher # autre application.}one{Afficher # autre application.}other{Afficher # autres applications.}}"
"{count,plural, =1{Afficher # appli de bureau.}one{Afficher # appli de bureau.}other{Afficher # applis de bureau.}}"
"%1$s et %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index f19a435e97..de335bfd57 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Afficher # autre appli}one{Afficher # autre appli}other{Afficher # autre applis}}"
"{count,plural, =1{Afficher # application de bureau.}one{Afficher # application de bureau.}other{Afficher # applications de bureau.}}"
"%1$s et %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 0afb2883ba..b116332d11 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Mostrar # aplicación máis.}other{Mostrar # aplicacións máis.}}"
"{count,plural, =1{Mostrar # aplicación para ordenadores.}other{Mostrar # aplicacións para ordenadores.}}"
"%1$s e %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml
index fd5dca6ca2..efba149909 100644
--- a/quickstep/res/values-gu/strings.xml
+++ b/quickstep/res/values-gu/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{વધુ # ઍપ બતાવો.}one{વધુ # ઍપ બતાવો.}other{વધુ # ઍપ બતાવો.}}"
"{count,plural, =1{# ડેસ્કટૉપ ઍપ બતાવો.}one{# ડેસ્કટૉપ ઍપ બતાવો.}other{# ડેસ્કટૉપ ઍપ બતાવો.}}"
"%1$s અને %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml
index 246bdc71ef..205be273cf 100644
--- a/quickstep/res/values-hi/strings.xml
+++ b/quickstep/res/values-hi/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{# और ऐप्लिकेशन दिखाएं.}one{# और ऐप्लिकेशन दिखाएं.}other{# और ऐप्लिकेशन दिखाएं.}}"
"{count,plural, =1{# डेस्कटॉप ऐप्लिकेशन दिखाएं.}one{# डेस्कटॉप ऐप्लिकेशन दिखाएं.}other{# डेस्कटॉप ऐप्लिकेशन दिखाएं.}}"
"%1$s और %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml
index 0069edabbf..d189268b53 100644
--- a/quickstep/res/values-hr/strings.xml
+++ b/quickstep/res/values-hr/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Prikaži još # aplikaciju}one{Prikaži još # aplikaciju}few{Prikaži još # aplikacije}other{Prikaži još # aplikacija}}"
"{count,plural, =1{Prikaži # računalnu aplikaciju.}one{Prikaži # računalnu aplikaciju.}few{Prikaži # računalne aplikacije.}other{Prikaži # računalnih aplikacija.}}"
"%1$s i %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 162337e388..975966e1de 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{# további alkalmazás megjelenítése.}other{# további alkalmazás megjelenítése.}}"
"{count,plural, =1{# asztali alkalmazás megjelenítése.}other{# asztali alkalmazás megjelenítése.}}"
"%1$s és %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml
index 8919191c81..7e562583f9 100644
--- a/quickstep/res/values-hy/strings.xml
+++ b/quickstep/res/values-hy/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Ցուցադրել ևս # հավելված։}one{Ցուցադրել ևս # հավելված։}other{Ցուցադրել ևս # հավելված։}}"
"{count,plural, =1{Ցույց տալ # համակարգչային հավելված։}one{Ցույց տալ # համակարգչային հավելված։}other{Ցույց տալ # համակարգչային հավելված։}}"
"%1$s և %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml
index ea62b4dd17..d0a7a91494 100644
--- a/quickstep/res/values-in/strings.xml
+++ b/quickstep/res/values-in/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Tampilkan # aplikasi lainnya.}other{Tampilkan # aplikasi lainnya.}}"
"{count,plural, =1{Tampilkan # aplikasi desktop.}other{Tampilkan # aplikasi desktop.}}"
"%1$s dan %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 3e204ce0a7..34e5f26e42 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Sýna # forrit í viðbót.}one{Sýna # forrit í viðbót.}other{Sýna # forrit í viðbót.}}"
"{count,plural, =1{Sýna # skjáborðsforrit.}one{Sýna # skjáborðsforrit.}other{Sýna # skjáborðsforrit.}}"
"%1$s og %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index f295b0730f..a5d11f856c 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Mostra # altra app.}other{Mostra altre # app.}}"
"{count,plural, =1{Mostra # app desktop.}other{Mostra # app desktop.}}"
"%1$s e %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index 037deec6d9..30c53d5bdd 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{הצגת אפליקציה אחת (#) נוספת.}one{הצגת # אפליקציות נוספות.}two{הצגת # אפליקציות נוספות.}other{הצגת # אפליקציות נוספות.}}"
"{count,plural, =1{הצגת אפליקציה אחת (#) למחשב.}one{הצגת # אפליקציות למחשב.}two{הצגת # אפליקציות למחשב.}other{הצגת # אפליקציות למחשב.}}"
"%1$s ו-%2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml
index ef335f2a16..ead3c19208 100644
--- a/quickstep/res/values-ja/strings.xml
+++ b/quickstep/res/values-ja/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{他 # 件のアプリを表示できます。}other{他 # 件のアプリを表示できます。}}"
"{count,plural, =1{# 個のデスクトップ アプリが表示されます。}other{# 個のデスクトップ アプリが表示されます。}}"
"%1$s と %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml
index 6da246ab9a..bcc28b489c 100644
--- a/quickstep/res/values-ka/strings.xml
+++ b/quickstep/res/values-ka/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{#-ით მეტი აპის ჩენება}other{#-ით მეტი აპის ჩვენება.}}"
"{count,plural, =1{# დესკტოპის აპის ჩვენება.}other{# დესკტოპის აპის ჩვენება.}}"
"%1$s და %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml
index 20a1d5945e..0002024413 100644
--- a/quickstep/res/values-kk/strings.xml
+++ b/quickstep/res/values-kk/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Тағы # қолданбаны көрсету.}other{Тағы # қолданбаны көрсету.}}"
"{count,plural, =1{Компьютерге арналған # қолданбаны көрсету}other{Компьютерге арналған # қолданбаны көрсету}}"
"%1$s және %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 6d5e6f1492..8c38c48777 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{បង្ហាញកម្មវិធី # ទៀត។}other{បង្ហាញកម្មវិធី # ទៀត។}}"
"{count,plural, =1{បង្ហាញកម្មវិធីកុំព្យូទ័រ #។}other{បង្ហាញកម្មវិធីកុំព្យូទ័រ #។}}"
"%1$s និង %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml
index 10ab9224bf..1231157c2e 100644
--- a/quickstep/res/values-kn/strings.xml
+++ b/quickstep/res/values-kn/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{ಇನ್ನೂ # ಆ್ಯಪ್ ಅನ್ನು ತೋರಿಸಿ.}one{ಇನ್ನೂ # ಆ್ಯಪ್ಗಳನ್ನು ತೋರಿಸಿ.}other{ಇನ್ನೂ # ಆ್ಯಪ್ಗಳನ್ನು ತೋರಿಸಿ.}}"
"{count,plural, =1{# ಡೆಸ್ಕ್ಟಾಪ್ ಆ್ಯಪ್ ತೋರಿಸಿ.}one{# ಡೆಸ್ಕ್ಟಾಪ್ ಆ್ಯಪ್ಗಳನ್ನು ತೋರಿಸಿ.}other{# ಡೆಸ್ಕ್ಟಾಪ್ ಆ್ಯಪ್ಗಳನ್ನು ತೋರಿಸಿ.}}"
"%1$s ಮತ್ತು %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 24934f9fef..e0fc21f0c3 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{앱 #개 더 표시}other{앱 #개 더 표시}}"
"{count,plural, =1{데스크톱 앱 #개를 표시합니다.}other{데스크톱 앱 #개를 표시합니다.}}"
"%1$s 및 %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml
index 525a248499..fbb1c42ff6 100644
--- a/quickstep/res/values-ky/strings.xml
+++ b/quickstep/res/values-ky/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Дагы # колдонмону көрсөтүү.}other{Дагы # колдонмону көрсөтүү.}}"
"{count,plural, =1{# иш такта колдонмосун көрсөтүү.}other{# иш такта колдонмосун көрсөтүү.}}"
"%1$s жана %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index b5a7ebbf72..bb363300ae 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{ສະແດງອີກ # ແອັບ.}other{ສະແດງອີກ # ແອັບ.}}"
"{count,plural, =1{ສະແດງແອັບເດັສທັອບ # ລາຍການ.}other{ສະແດງແອັບເດັສທັອບ # ລາຍການ.}}"
"%1$s ແລະ %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 4817e25adb..b5dceb6415 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Rodyti dar # programą.}one{Rodyti dar # programą.}few{Rodyti dar # programas.}many{Rodyti dar # programos.}other{Rodyti dar # programų.}}"
"{count,plural, =1{Rodyti # darbalaukio programą.}one{Rodyti # darbalaukio programą.}few{Rodyti # darbalaukio programas.}many{Rodyti # darbalaukio programos.}other{Rodyti # darbalaukio programų.}}"
"„%1$s“ ir „%2$s“"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index aa80b7e6ba..2b6208a629 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Rādīt vēl # lietotni}zero{Rādīt vēl # lietotnes}one{Rādīt vēl # lietotni}other{Rādīt vēl # lietotnes}}"
"{count,plural, =1{Rādīt # datora lietotni.}zero{Rādīt # datora lietotnes.}one{Rādīt # datora lietotni.}other{Rādīt # datora lietotnes.}}"
"“%1$s” un “%2$s”"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml
index 039ee9f0fb..6b8c592ff8 100644
--- a/quickstep/res/values-mk/strings.xml
+++ b/quickstep/res/values-mk/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Прикажи уште # апликација.}one{Прикажи уште # апликација.}other{Прикажи уште # апликации.}}"
"{count,plural, =1{Прикажи # апликација за компјутер.}one{Прикажи # апликација за компјутер.}other{Прикажи # апликации за компјутер.}}"
"%1$s и %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml
index 8fbc8f7100..d401c20aaa 100644
--- a/quickstep/res/values-ml/strings.xml
+++ b/quickstep/res/values-ml/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{# ആപ്പ് കൂടി കാണിക്കുക.}other{# ആപ്പുകൾ കൂടി കാണിക്കുക.}}"
"{count,plural, =1{# ഡെസ്ക്ടോപ്പ് ആപ്പ് കാണിക്കുക.}other{# ഡെസ്ക്ടോപ്പ് ആപ്പുകൾ കാണിക്കുക.}}"
"%1$s, %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml
index d5e41057e3..4491c37531 100644
--- a/quickstep/res/values-mn/strings.xml
+++ b/quickstep/res/values-mn/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Өөр # аппыг харуулна уу.}other{Өөр # аппыг харуулна уу.}}"
"{count,plural, =1{Компьютерын # аппыг харуулна уу.}other{Компьютерын # аппыг харуулна уу.}}"
"%1$s болон %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml
index cbce562153..3938fd4dc7 100644
--- a/quickstep/res/values-mr/strings.xml
+++ b/quickstep/res/values-mr/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{आणखी # अॅप दाखवा.}other{आणखी # अॅप्स दाखवा.}}"
"{count,plural, =1{# डेस्कटॉप अॅप दाखवा.}other{# डेस्कटॉप अॅप्स दाखवा.}}"
"%1$s आणि %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml
index cc1ecdd7c1..0db53d6579 100644
--- a/quickstep/res/values-ms/strings.xml
+++ b/quickstep/res/values-ms/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Tunjukkan # lagi apl.}other{Tunjukkan # lagi apl.}}"
"{count,plural, =1{Tunjukkan # apl desktop.}other{Tunjukkan # apl desktop.}}"
"%1$s dan %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index 0b3a708e38..4ac838a794 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{နောက်ထပ်အက်ပ် # ခု ပြပါ။}other{နောက်ထပ်အက်ပ် # ခု ပြပါ။}}"
"{count,plural, =1{ဒက်စတော့ အက်ပ် # ခု ပြပါ။}other{ဒက်စတော့ အက်ပ် # ခု ပြပါ။}}"
"%1$s နှင့် %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 655ffecc02..46bf14b5b5 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Vis # app til.}other{Vis # apper til.}}"
"{count,plural, =1{Vis # datamaskinprogram.}other{Vis # datamaskinprogrammer.}}"
"%1$s og %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index 3554aa5c10..07437caf19 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{थप # एप देखाउनुहोस्।}other{थप # वटा एप देखाउनुहोस्।}}"
"{count,plural, =1{# डेस्कटप एप देखाउनुहोस्।}other{# वटा डेस्कटप एप देखाउनुहोस्।}}"
"%1$s र %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml
index c5cebdb71a..3dedd7b040 100644
--- a/quickstep/res/values-nl/strings.xml
+++ b/quickstep/res/values-nl/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Nog # app tonen.}other{Nog # apps tonen.}}"
"{count,plural, =1{# desktop-app tonen.}other{# desktop-apps tonen.}}"
"%1$s en %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 765935e408..67a5b139d4 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{ଅଧିକ #ଟି ଆପ ଦେଖାନ୍ତୁ।}other{ଅଧିକ #ଟି ଆପ୍ସ ଦେଖାନ୍ତୁ।}}"
"{count,plural, =1{# ଡେସ୍କଟପ ଆପ ଦେଖାନ୍ତୁ।}other{# ଡେସ୍କଟପ ଆପ୍ସ ଦେଖାନ୍ତୁ।}}"
"%1$s ଏବଂ %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml
index 769608b0ca..78f1c7951f 100644
--- a/quickstep/res/values-pa/strings.xml
+++ b/quickstep/res/values-pa/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{# ਹੋਰ ਐਪ ਦਿਖਾਓ।}one{# ਹੋਰ ਐਪ ਦਿਖਾਓ।}other{# ਹੋਰ ਐਪਾਂ ਦਿਖਾਓ।}}"
"{count,plural, =1{# ਡੈਸਕਟਾਪ ਐਪ ਦਿਖਾਓ।}one{# ਡੈਸਕਟਾਪ ਐਪ ਦਿਖਾਓ।}other{# ਡੈਸਕਟਾਪ ਐਪਾਂ ਦਿਖਾਓ।}}"
"%1$s ਅਤੇ %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml
index 752764fbdc..41ac736ce6 100644
--- a/quickstep/res/values-pl/strings.xml
+++ b/quickstep/res/values-pl/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Pokaż jeszcze # aplikację.}few{Pokaż jeszcze # aplikacje.}many{Pokaż jeszcze # aplikacji.}other{Pokaż jeszcze # aplikacji.}}"
"{count,plural, =1{Pokaż # aplikację komputerową.}few{Pokaż # aplikacje komputerowe.}many{Pokaż # aplikacji komputerowych.}other{Pokaż # aplikacji komputerowej.}}"
"%1$s i %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml
index a692e69b3e..f674d687f3 100644
--- a/quickstep/res/values-pt-rPT/strings.xml
+++ b/quickstep/res/values-pt-rPT/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Mostrar mais # app.}other{Mostrar mais # apps.}}"
"{count,plural, =1{Mostrar # app para computador.}other{Mostrar # apps para computador.}}"
"%1$s e %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml
index dd3c037829..4f3d75ade1 100644
--- a/quickstep/res/values-pt/strings.xml
+++ b/quickstep/res/values-pt/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Mostrar mais # app.}one{Mostrar mais # app.}other{Mostrar mais # apps.}}"
"{count,plural, =1{Mostrar # app para computador.}one{Mostrar # app para computador.}other{Mostrar # apps para computador.}}"
"%1$s e %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml
index 7efeda27fb..dee1ac613e 100644
--- a/quickstep/res/values-ro/strings.xml
+++ b/quickstep/res/values-ro/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Afișează încă # aplicație}few{Afișează încă # aplicații}other{Afișează încă # de aplicații}}"
"{count,plural, =1{Afișează # aplicație pentru computer.}few{Afișează # aplicații pentru computer.}other{Afișează # de aplicații pentru computer.}}"
"%1$s și %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml
index e8d1ddb441..a78561a687 100644
--- a/quickstep/res/values-ru/strings.xml
+++ b/quickstep/res/values-ru/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Показать ещё # приложение}one{Показать ещё # приложение}few{Показать ещё # приложения}many{Показать ещё # приложений}other{Показать ещё # приложения}}"
"{count,plural, =1{Показать # компьютерное приложение.}one{Показать # компьютерное приложение.}few{Показать # компьютерных приложения.}many{Показать # компьютерных приложений.}other{Показать # компьютерного приложения.}}"
"%1$s и %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 9d1c3121ae..c1dfa9df78 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{තවත් # යෙදුමක් පෙන්වන්න.}one{තවත් යෙදුම් #ක් පෙන්වන්න.}other{තවත් යෙදුම් #ක් පෙන්වන්න.}}"
"{count,plural, =1{# ඩෙස්ක්ටොප් යෙදුමක් පෙන්වන්න.}one{ඩෙස්ක්ටොප් යෙදුම් # ක් පෙන්වන්න.}other{ඩෙස්ක්ටොප් යෙදුම් # ක් පෙන්වන්න.}}"
"%1$s සහ %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index a573b4569a..51f09aa1a8 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Zobraziť # ďalšiu aplikáciu.}few{Zobraziť # ďalšie aplikácie.}many{Show # more apps.}other{Zobraziť # ďalších aplikácií.}}"
"{count,plural, =1{Zobraziť # aplikáciu pre počítač.}few{Zobraziť # aplikácie pre počítač.}many{Show # desktop apps.}other{Zobraziť # aplikácií pre počítač.}}"
"%1$s a %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml
index 355dc61464..ea1fd45cbe 100644
--- a/quickstep/res/values-sl/strings.xml
+++ b/quickstep/res/values-sl/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Pokaži še # aplikacijo.}one{Pokaži še # aplikacijo.}two{Pokaži še # aplikaciji.}few{Pokaži še # aplikacije.}other{Pokaži še # aplikacij.}}"
"{count,plural, =1{Prikaz # aplikacije za namizni računalnik.}one{Prikaz # aplikacije za namizni računalnik.}two{Prikaz # aplikacij za namizni računalnik.}few{Prikaz # aplikacij za namizni računalnik.}other{Prikaz # aplikacij za namizni računalnik.}}"
"%1$s in %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index 71eca07288..6cc894a2d0 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Shfaq # aplikacion tjetër.}other{Shfaq # aplikacione të tjera.}}"
"{count,plural, =1{Shfaq # aplikacion për desktop.}other{Shfaq # aplikacione për desktop.}}"
"%1$s dhe %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml
index 34bcb1c28e..7828868511 100644
--- a/quickstep/res/values-sr/strings.xml
+++ b/quickstep/res/values-sr/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Прикажи још # апликацију.}one{Прикажи још # апликацију.}few{Прикажи још # апликације.}other{Прикажи још # апликација.}}"
"{count,plural, =1{Прикажи # апликацију за рачунаре.}one{Прикажи # апликацију за рачунаре.}few{Прикажи # апликације за рачунаре.}other{Прикажи # апликација за рачунаре.}}"
"%1$s и %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 723cb82797..4fecddd977 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Visa # app till.}other{Visa # appar till.}}"
"{count,plural, =1{Visa # datorapp.}other{Visa # datorappar.}}"
"%1$s och %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml
index 6a3f624576..3c4e5e538d 100644
--- a/quickstep/res/values-sw/strings.xml
+++ b/quickstep/res/values-sw/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Onyesha programu # zaidi.}other{Onyesha programu # zaidi.}}"
"{count,plural, =1{Onyesha programu # ya kompyuta ya mezani.}other{Onyesha programu # za kompyuta ya mezani.}}"
"%1$s na %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml
index 90ff5eaa0c..b259dbf124 100644
--- a/quickstep/res/values-ta/strings.xml
+++ b/quickstep/res/values-ta/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{மேலும் # ஆப்ஸைக் காட்டு.}other{மேலும் # ஆப்ஸைக் காட்டு.}}"
"{count,plural, =1{# டெஸ்க்டாப் ஆப்ஸைக் காட்டு.}other{# டெஸ்க்டாப் ஆப்ஸைக் காட்டு.}}"
"%1$s மற்றும் %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml
index c32f360592..20fc77da8b 100644
--- a/quickstep/res/values-te/strings.xml
+++ b/quickstep/res/values-te/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{మరో # యాప్ను చూడండి.}other{మరో # యాప్లను చూడండి.}}"
"{count,plural, =1{# డెస్క్టాప్ యాప్ను చూపండి.}other{# డెస్క్టాప్ యాప్లను చూపండి.}}"
"%1$s, %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml
index f1fd49b25b..4adcc525cb 100644
--- a/quickstep/res/values-th/strings.xml
+++ b/quickstep/res/values-th/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{แสดงเพิ่มเติมอีก # แอป}other{แสดงเพิ่มเติมอีก # แอป}}"
"{count,plural, =1{แสดงแอปบนเดสก์ท็อป # รายการ}other{แสดงแอปบนเดสก์ท็อป # รายการ}}"
"%1$s และ %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index f0e231166d..66ecc00a6c 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Magpakita ng # pang app.}one{Magpakita ng # pang app.}other{Magpakita ng # pang app.}}"
"{count,plural, =1{Ipakita ang # desktop app.}one{Ipakita ang # desktop app.}other{Ipakita ang # na desktop app.}}"
"%1$s at %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 5eb84d65f3..dc5fa6bca7 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{# uygulama daha göster.}other{# uygulama daha göster}}"
"{count,plural, =1{# masaüstü uygulamasını göster.}other{# masaüstü uygulamasını göster.}}"
"%1$s ve %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 3be16279ed..5119e565de 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Показати ще # додаток.}one{Показати ще # додаток.}few{Показати ще # додатки.}many{Показати ще # додатків.}other{Показати ще # додатка.}}"
"{count,plural, =1{Показати # комп’ютерну програму.}one{Показати # комп’ютерну програму.}few{Показати # комп’ютерні програми.}many{Показати # комп’ютерних програм.}other{Показати # комп’ютерної програми.}}"
"%1$s та %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml
index 0e951f074b..c42a601758 100644
--- a/quickstep/res/values-ur/strings.xml
+++ b/quickstep/res/values-ur/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{# مزید ایپ دکھائیں۔}other{# مزید ایپس دکھائیں۔}}"
"{count,plural, =1{# ڈیسک ٹاپ ایپ دکھائیں۔}other{# ڈیسک ٹاپ ایپس دکھائیں۔}}"
"%1$s اور %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml
index 4d57b2248d..810c8f04b3 100644
--- a/quickstep/res/values-uz/strings.xml
+++ b/quickstep/res/values-uz/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Yana # ta ilovani chiqarish}other{Yana # ta ilovani chiqarish}}"
"{count,plural, =1{# ta desktop ilovani chiqarish.}other{# ta desktop ilovani chiqarish.}}"
"%1$s va %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index df8ccdca0c..8291ac7552 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Hiện thêm # ứng dụng.}other{Hiện thêm # ứng dụng.}}"
"{count,plural, =1{Hiện # ứng dụng dành cho máy tính.}other{Hiện # ứng dụng dành cho máy tính.}}"
"%1$s và %2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index e7507308c3..e00e932f2b 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{显示另外 # 个应用。}other{显示另外 # 个应用。}}"
"{count,plural, =1{显示 # 款桌面应用。}other{显示 # 款桌面应用。}}"
"%1$s和%2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 9427b07e9a..3a7736979c 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{顯示另外 # 個應用程式。}other{顯示另外 # 個應用程式。}}"
"{count,plural, =1{顯示 # 個桌面應用程式。}other{顯示 # 個桌面應用程式。}}"
"「%1$s」和「%2$s」"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 3b06edad15..3b5996698f 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{再多顯示 # 個應用程式。}other{再多顯示 # 個應用程式。}}"
"{count,plural, =1{顯示 # 個電腦版應用程式。}other{顯示 # 個電腦版應用程式。}}"
"「%1$s」和「%2$s」"
+
+
+
+
+
+
+
+
diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml
index cb216fc6a6..b3ef1e7199 100644
--- a/quickstep/res/values-zu/strings.xml
+++ b/quickstep/res/values-zu/strings.xml
@@ -140,4 +140,12 @@
"{count,plural, =1{Bonisa i-app e-# ngaphezulu.}one{Bonisa ama-app angu-# ngaphezulu.}other{Bonisa ama-app angu-# ngaphezulu.}}"
"{count,plural, =1{Bonisa i-app engu-# yedeskithophu.}one{Bonisa ama-app angu-# wedeskithophu.}other{Bonisa ama-app angu-# wedeskithophu.}}"
"I-%1$s ne-%2$s"
+
+
+
+
+
+
+
+
diff --git a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java
index 23cb8e9baa..943c08c786 100644
--- a/quickstep/src/com/android/launcher3/WidgetPickerActivity.java
+++ b/quickstep/src/com/android/launcher3/WidgetPickerActivity.java
@@ -194,6 +194,11 @@ public class WidgetPickerActivity extends BaseActivity {
return false;
}
+ View dragView = widgetCell.getDragAndDropView();
+ if (dragView == null) {
+ return false;
+ }
+
ClipData clipData = new ClipData(
new ClipDescription(
/* label= */ "", // not displayed anywhere; so, set to empty.
@@ -209,9 +214,9 @@ public class WidgetPickerActivity extends BaseActivity {
.putExtra(EXTRA_IS_PENDING_WIDGET_DRAG, true));
// DRAG_FLAG_GLOBAL permits dragging data beyond app window.
- return view.startDragAndDrop(
+ return dragView.startDragAndDrop(
clipData,
- new View.DragShadowBuilder(view),
+ new View.DragShadowBuilder(dragView),
/* myLocalState= */ null,
View.DRAG_FLAG_GLOBAL
);
diff --git a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
index 39f2c00c99..64bb05e1ab 100644
--- a/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
+++ b/quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java
@@ -19,6 +19,7 @@ import static com.android.launcher3.Flags.enableCategorizedWidgetSuggestions;
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_WIDGETS_PREDICTION;
import android.app.prediction.AppTarget;
+import android.content.ComponentName;
import android.content.Context;
import android.text.TextUtils;
@@ -29,7 +30,6 @@ import com.android.launcher3.model.BgDataModel.FixedContainerItems;
import com.android.launcher3.model.QuickstepModelDelegate.PredictorState;
import com.android.launcher3.model.data.ItemInfo;
import com.android.launcher3.util.ComponentKey;
-import com.android.launcher3.util.PackageUserKey;
import com.android.launcher3.widget.PendingAddWidgetInfo;
import com.android.launcher3.widget.picker.WidgetRecommendationCategoryProvider;
@@ -64,36 +64,24 @@ public final class WidgetsPredictionUpdateTask implements ModelUpdateTask {
widget -> new ComponentKey(widget.providerName, widget.user)).collect(
Collectors.toSet());
Predicate notOnWorkspace = w -> !widgetsInWorkspace.contains(w);
- Map> allWidgets =
- dataModel.widgetsModel.getAllWidgetsWithoutShortcuts();
+ Map allWidgets =
+ dataModel.widgetsModel.getAllWidgetComponentsWithoutShortcuts();
List servicePredictedItems = new ArrayList<>();
- List localFilteredWidgets = new ArrayList<>();
for (AppTarget app : mTargets) {
- PackageUserKey packageUserKey = new PackageUserKey(app.getPackageName(), app.getUser());
- List widgets = allWidgets.get(packageUserKey);
- if (widgets == null || widgets.isEmpty()) {
+ ComponentKey componentKey = new ComponentKey(
+ new ComponentName(app.getPackageName(), app.getClassName()), app.getUser());
+ WidgetItem widget = allWidgets.get(componentKey);
+ if (widget == null) {
continue;
}
String className = app.getClassName();
if (!TextUtils.isEmpty(className)) {
- WidgetItem item = widgets.stream()
- .filter(w -> className.equals(w.componentName.getClassName()))
- .filter(notOnWorkspace)
- .findFirst()
- .orElse(null);
- if (item != null) {
- servicePredictedItems.add(item);
- continue;
+ if (notOnWorkspace.test(widget)) {
+ servicePredictedItems.add(widget);
}
}
- // No widget was added by the service, try local filtering
- widgets.stream().filter(notOnWorkspace).findFirst()
- .ifPresent(localFilteredWidgets::add);
- }
- if (servicePredictedItems.isEmpty()) {
- servicePredictedItems.addAll(localFilteredWidgets);
}
List items;
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java
index 92d9b23cb6..48d2bc2ff7 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarScrimViewController.java
@@ -103,14 +103,20 @@ public class TaskbarScrimViewController implements TaskbarControllers.LoggableTa
}
private float getScrimAlpha() {
+ final boolean isPersistentTaskBarVisible =
+ mTaskbarVisible && !DisplayController.isTransientTaskbar(mScrimView.getContext());
final boolean manageMenuExpanded =
(mSysUiStateFlags & SYSUI_STATE_BUBBLES_MANAGE_MENU_EXPANDED) != 0;
- return manageMenuExpanded
- // When manage menu shows there's the first scrim and second scrim so figure out
- // what the total transparency would be.
- ? (BUBBLE_EXPANDED_SCRIM_ALPHA + (BUBBLE_EXPANDED_SCRIM_ALPHA
- * (1 - BUBBLE_EXPANDED_SCRIM_ALPHA)))
- : shouldShowScrim() ? BUBBLE_EXPANDED_SCRIM_ALPHA : 0;
+ if (isPersistentTaskBarVisible && manageMenuExpanded) {
+ // When manage menu shows for persistent task bar there's the first scrim and second
+ // scrim so figure out what the total transparency would be.
+ return BUBBLE_EXPANDED_SCRIM_ALPHA
+ + (BUBBLE_EXPANDED_SCRIM_ALPHA * (1 - BUBBLE_EXPANDED_SCRIM_ALPHA));
+ } else if (shouldShowScrim()) {
+ return BUBBLE_EXPANDED_SCRIM_ALPHA;
+ } else {
+ return 0;
+ }
}
private void showScrim(boolean showScrim, float alpha, boolean skipAnim) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java
index 7eeea8431d..85ea5fde8b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java
@@ -719,6 +719,8 @@ public class BubbleBarView extends FrameLayout {
} else if (i == MAX_VISIBLE_BUBBLES_COLLAPSED - 1
&& bubbleCount == MAX_VISIBLE_BUBBLES_COLLAPSED) {
bv.setAlpha(0);
+ } else {
+ bv.setAlpha(1);
}
}
}
diff --git a/quickstep/src/com/android/quickstep/BaseContainerInterface.java b/quickstep/src/com/android/quickstep/BaseContainerInterface.java
index 99551834f1..b1d511cfcd 100644
--- a/quickstep/src/com/android/quickstep/BaseContainerInterface.java
+++ b/quickstep/src/com/android/quickstep/BaseContainerInterface.java
@@ -41,7 +41,6 @@ import com.android.launcher3.R;
import com.android.launcher3.statehandlers.DesktopVisibilityController;
import com.android.launcher3.statemanager.BaseState;
import com.android.launcher3.taskbar.TaskbarUIController;
-import com.android.launcher3.touch.PagedOrientationHandler;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.views.ScrimView;
import com.android.quickstep.orientation.RecentsPagedOrientationHandler;
@@ -207,10 +206,10 @@ public abstract class BaseContainerInterface {
// Not installed widget
@@ -204,19 +204,12 @@ public final class WidgetsPredicationUpdateTaskTest {
newWidgetsPredicationTask(List.of(widget5, widget3, widget4, widget1)));
runOnExecutorSync(MAIN_EXECUTOR, () -> { });
- // THEN only 2 widgets are returned because the launcher only filters out
- // non-exist widgets.
+ // Only widgets suggested by prediction system are returned.
List recommendedWidgets = mCallback.mRecommendedWidgets.items
.stream()
.map(itemInfo -> (PendingAddWidgetInfo) itemInfo)
.collect(Collectors.toList());
- assertThat(recommendedWidgets).hasSize(2);
- recommendedWidgets.forEach(pendingAddWidgetInfo ->
- assertThat(pendingAddWidgetInfo.recommendationCategory).isNotNull()
- );
- // Another widget from the same package
- assertWidgetInfo(recommendedWidgets.get(0).info, mApp4Provider2);
- assertWidgetInfo(recommendedWidgets.get(1).info, mApp1Provider1);
+ assertThat(recommendedWidgets).hasSize(0);
});
}
diff --git a/quickstep/tests/src/com/android/quickstep/TaplViewInflationDuringSwipeUp.java b/quickstep/tests/src/com/android/quickstep/TaplViewInflationDuringSwipeUp.java
deleted file mode 100644
index 208920ae24..0000000000
--- a/quickstep/tests/src/com/android/quickstep/TaplViewInflationDuringSwipeUp.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.quickstep;
-
-import static androidx.test.InstrumentationRegistry.getContext;
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-
-import static com.android.launcher3.WorkspaceLayoutManager.FIRST_SCREEN_ID;
-import static com.android.launcher3.testcomponent.TestCommandReceiver.EXTRA_VALUE;
-import static com.android.launcher3.testcomponent.TestCommandReceiver.SET_LIST_VIEW_SERVICE_BINDER;
-import static com.android.launcher3.util.WidgetUtils.createWidgetInfo;
-import static com.android.quickstep.NavigationModeSwitchRule.Mode.ZERO_BUTTON;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.spy;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.util.SparseArray;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.widget.RemoteViews;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import androidx.test.filters.Suppress;
-import androidx.test.uiautomator.By;
-import androidx.test.uiautomator.UiDevice;
-import androidx.test.uiautomator.Until;
-
-import com.android.launcher3.LauncherAppState;
-import com.android.launcher3.LauncherModel;
-import com.android.launcher3.celllayout.FavoriteItemsTransaction;
-import com.android.launcher3.model.data.LauncherAppWidgetInfo;
-import com.android.launcher3.tapl.LaunchedAppState;
-import com.android.launcher3.testcomponent.ListViewService;
-import com.android.launcher3.testcomponent.ListViewService.SimpleViewsFactory;
-import com.android.launcher3.testcomponent.TestCommandReceiver;
-import com.android.launcher3.ui.TestViewHelpers;
-import com.android.launcher3.util.Executors;
-import com.android.launcher3.widget.LauncherAppWidgetProviderInfo;
-import com.android.quickstep.NavigationModeSwitchRule.NavigationModeSwitch;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import java.lang.reflect.Field;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.IntConsumer;
-
-/**
- * Test to verify view inflation does not happen during swipe up.
- * To verify view inflation, we setup a stub ViewConfiguration and check if any call to that class
- * does from a View.init method or not.
- *
- * Alternative approaches considered:
- * Overriding LayoutInflater: This does not cover views initialized
- * directly (ex: new LinearLayout)
- * Using ExtendedMockito: Mocking static methods from platform classes (loaded in zygote) makes
- * the main thread extremely slow and untestable
- */
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class TaplViewInflationDuringSwipeUp extends AbstractQuickStepTest {
-
- private SparseArray mConfigMap;
- private InitTracker mInitTracker;
- private LauncherModel mModel;
-
- @Before
- public void setUp() throws Exception {
- // Workaround for b/142351228, when there are no activities, the system may not destroy the
- // activity correctly for activities under instrumentation, which can leave two concurrent
- // activities, which changes the order in which the activities are cleaned up (overlapping
- // stop and start) leading to all sort of issues. To workaround this, ensure that the test
- // is started only after starting another app.
- startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
-
- super.setUp();
-
- mModel = LauncherAppState.getInstance(mTargetContext).getModel();
- Executors.MODEL_EXECUTOR.submit(mModel.getModelDbController()::createEmptyDB).get();
-
- // Get static configuration map
- Field field = ViewConfiguration.class.getDeclaredField("sConfigurations");
- field.setAccessible(true);
- mConfigMap = (SparseArray) field.get(null);
-
- mInitTracker = new InitTracker();
- }
-
- @Test
- @NavigationModeSwitch(mode = ZERO_BUTTON)
- @Suppress // until b/190618549 is fixed
- public void testSwipeUpFromApp() throws Exception {
- try {
- // Go to overview once so that all views are initialized and cached
- startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
- mLauncher.getLaunchedAppState().switchToOverview().dismissAllTasks();
-
- // Track view creations
- mInitTracker.startTracking();
-
- startTestActivity(2);
- mLauncher.getLaunchedAppState().switchToOverview();
-
- assertEquals("Views inflated during swipe up", 0, mInitTracker.viewInitCount);
- } finally {
- mConfigMap.clear();
- }
- }
-
- @Test
- @NavigationModeSwitch(mode = ZERO_BUTTON)
- @Suppress // until b/190729479 is fixed
- public void testSwipeUpFromApp_widget_update() {
- String stubText = "Some random stub text";
-
- executeSwipeUpTestWithWidget(
- widgetId -> { },
- widgetId -> AppWidgetManager.getInstance(getContext())
- .updateAppWidget(widgetId, createMainWidgetViews(stubText)),
- stubText);
- }
-
- @Test
- @NavigationModeSwitch(mode = ZERO_BUTTON)
- @Suppress // until b/190729479 is fixed
- public void testSwipeUp_with_list_widgets() {
- SimpleViewsFactory viewFactory = new SimpleViewsFactory();
- viewFactory.viewCount = 1;
- Bundle args = new Bundle();
- args.putBinder(EXTRA_VALUE, viewFactory.toBinder());
- TestCommandReceiver.callCommand(SET_LIST_VIEW_SERVICE_BINDER, null, args);
-
- try {
- executeSwipeUpTestWithWidget(
- widgetId -> {
- // Initialize widget
- RemoteViews views = createMainWidgetViews("List widget title");
- views.setRemoteAdapter(android.R.id.list,
- new Intent(getContext(), ListViewService.class));
- AppWidgetManager.getInstance(getContext()).updateAppWidget(widgetId, views);
- verifyWidget(viewFactory.getLabel(0));
- },
- widgetId -> {
- // Update widget
- viewFactory.viewCount = 2;
- AppWidgetManager.getInstance(getContext())
- .notifyAppWidgetViewDataChanged(widgetId, android.R.id.list);
- },
- viewFactory.getLabel(1)
- );
- } finally {
- TestCommandReceiver.callCommand(SET_LIST_VIEW_SERVICE_BINDER, null, new Bundle());
- }
- }
-
- private void executeSwipeUpTestWithWidget(IntConsumer widgetIdCreationCallback,
- IntConsumer updateBeforeSwipeUp, String finalWidgetText) {
- try {
- LauncherAppWidgetProviderInfo info = TestViewHelpers.findWidgetProvider(false);
-
- // Make sure the widget is big enough to show a list of items
- info.minSpanX = 2;
- info.minSpanY = 2;
- info.spanX = 2;
- info.spanY = 2;
- AtomicInteger widgetId = new AtomicInteger();
-
- commitTransactionAndLoadHome(new FavoriteItemsTransaction(mTargetContext)
- .addItem(() -> {
- LauncherAppWidgetInfo item = createWidgetInfo(info, mTargetContext, true);
- item.screenId = FIRST_SCREEN_ID;
- widgetId.set(item.appWidgetId);
- return item;
- }));
-
- assertTrue("Widget is not present",
- mLauncher.goHome().tryGetWidget(info.label, DEFAULT_UI_TIMEOUT) != null);
-
- // Verify widget id
- widgetIdCreationCallback.accept(widgetId.get());
-
- // Go to overview once so that all views are initialized and cached
- startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));
- mLauncher.getLaunchedAppState().switchToOverview().dismissAllTasks();
-
- // Track view creations
- mInitTracker.startTracking();
-
- startTestActivity(2);
- LaunchedAppState launchedAppState = mLauncher.getLaunchedAppState();
-
- // Update widget
- updateBeforeSwipeUp.accept(widgetId.get());
-
- launchedAppState.switchToOverview();
- assertEquals("Views inflated during swipe up", 0, mInitTracker.viewInitCount);
-
- // Widget is updated when going home
- mInitTracker.disableLog();
- mLauncher.goHome();
- verifyWidget(finalWidgetText);
- assertNotEquals(1, mInitTracker.viewInitCount);
- } finally {
- mConfigMap.clear();
- }
- }
-
- private void verifyWidget(String text) {
- assertNotNull("Widget not updated",
- UiDevice.getInstance(getInstrumentation())
- .wait(Until.findObject(By.text(text)), DEFAULT_UI_TIMEOUT));
- }
-
- private RemoteViews createMainWidgetViews(String title) {
- Context c = getContext();
- int layoutId = c.getResources().getIdentifier(
- "test_layout_widget_list", "layout", c.getPackageName());
- RemoteViews views = new RemoteViews(c.getPackageName(), layoutId);
- views.setTextViewText(android.R.id.text1, title);
- return views;
- }
-
- private class InitTracker implements Answer {
-
- public int viewInitCount = 0;
-
- public boolean log = true;
-
- @Override
- public Object answer(InvocationOnMock invocation) throws Throwable {
- Exception ex = new Exception();
-
- boolean found = false;
- for (StackTraceElement ste : ex.getStackTrace()) {
- if ("".equals(ste.getMethodName())
- && View.class.getName().equals(ste.getClassName())) {
- found = true;
- break;
- }
- }
- if (found) {
- viewInitCount++;
- if (log) {
- Log.d("InitTracker", "New view inflated", ex);
- }
-
- }
- return invocation.callRealMethod();
- }
-
- public void disableLog() {
- log = false;
- }
-
- public void startTracking() {
- ViewConfiguration vc = ViewConfiguration.get(mTargetContext);
- ViewConfiguration spyVC = spy(vc);
- mConfigMap.put(mConfigMap.keyAt(mConfigMap.indexOfValue(vc)), spyVC);
- doAnswer(this).when(spyVC).getScaledTouchSlop();
- }
- }
-}
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index e18d9cd18f..ba507212a4 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -29,8 +29,7 @@
"Tuis"
"Verdeelde skerm"
"Programinligting vir %1$s"
-
-
+ "Gebruikinstellings vir %1$s"
"Stoor apppaar"
"%1$s | %2$s"
"Hierdie apppaar word nie op hierdie toestel gesteun nie"
@@ -195,5 +194,4 @@
"Privaat Ruimte-oorgang"
"Installeer"
"Installeer apps in privaat ruimte"
- "Oorvloei"
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 39dbfef8dc..10d68aa0f1 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -29,8 +29,7 @@
"መነሻ"
"የተከፈለ ማያ ገፅ"
"የመተግበሪያ መረጃ ለ%1$s"
-
-
+ "የ%1$s የአጠቃቀም ቅንብሮች"
"የመተግበሪያ ጥምረትን ያስቀምጡ"
"%1$s | %2$s"
"ይህ የመተግበሪያ ጥምረት በዚህ መሣሪያ ላይ አይደገፍም"
@@ -195,5 +194,4 @@
"የግል ቦታ ሽግግር"
"ይጫኑ"
"መተግበሪያዎችን ወደ የግል ቦታ ይጫኑ"
- "ትርፍ ፍሰት"
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1143042949..6ba2ce6085 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -29,8 +29,7 @@
"الشاشة الرئيسية"
"تقسيم الشاشة"
"معلومات تطبيق %1$s"
-
-
+ "إعدادات استخدام \"%1$s\""
"حفظ استخدام التطبيقين معًا"
"%1$s | %2$s"
"لا يمكن استخدام هذين التطبيقَين في الوقت نفسه على هذا الجهاز"
@@ -195,5 +194,4 @@
"النقل إلى المساحة الخاصة"
"تثبيت"
"تثبيت التطبيقات في المساحة الخاصّة"
- "القائمة الكاملة"
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index ed4bb975ae..ce86039da1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -29,8 +29,7 @@
"গৃহ স্ক্ৰীন"
"বিভাজিত স্ক্ৰীন"
"%1$sৰ বাবে এপৰ তথ্য"
-
-
+ "%1$sৰ বাবে ব্যৱহাৰৰ ছেটিং"
"এপৰ পেয়াৰ ছেভ কৰক"
"%1$s | %2$s"
"এই ডিভাইচটোত এই এপ্ পেয়াৰ কৰাৰ সুবিধাটো সমৰ্থিত নহয়"
@@ -195,5 +194,4 @@
"ব্যক্তিগত স্পে’চৰ স্থানান্তৰণ"
"ইনষ্টল কৰক"
"এপ্সমূহ প্ৰাইভেট স্পেচত ইনষ্টল কৰক"
- "অ’ভাৰফ্ল’"
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index e8273423af..9ad053a2f7 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -29,8 +29,7 @@
"Əsas səhifə"
"Ekran bölünməsi"
"%1$s ilə bağlı tətbiq məlumatı"
-
-
+ "%1$s üzrə istifadə ayarları"
"Tətbiq cütünü saxlayın"
"%1$s | %2$s"
"Bu tətbiq cütü bu cihazda dəstəklənmir"
@@ -195,5 +194,4 @@
"Şəxsi məkana keçid"
"Quraşdırın"
"Tətbiqləri şəxsi sahədə quraşdırın"
- "Kənara çıxma"
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 30ba09ce2b..408a4258b8 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -194,5 +194,4 @@
"Prenos privatnog prostora"
"Instalirajte"
"Instaliraj aplikacije u privatan prostor"
- "Preklopno"
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3ece170259..c7ed9d926d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -29,8 +29,7 @@
"Галоўны экран"
"Падзелены экран"
"Інфармацыя пра праграму для: %1$s"
-
-
+ "%1$s: налады выкарыстання"
"Захаваць спалучэнне праграм"
"%1$s | %2$s"
"Дадзенае спалучэнне праграм не падтрымліваецца на гэтай прыладзе"
@@ -195,5 +194,4 @@
"Пераход у прыватную вобласць"
"Усталяваць"
"Усталяваць праграмы ў прыватнай прасторы"
- "Дадатковае меню"
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4d23773c3c..ce62054c02 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -29,8 +29,7 @@
"Начален екран"
"Разделен екран"
"Информация за приложението за %1$s"
-
-
+ "Настройки за използването на %1$s"
"Запазване на двойката приложения"
"%1$s | %2$s"
"Тази двойка приложения не се поддържа на устройството"
@@ -195,5 +194,4 @@
"Преминаване към частното пространство"
"Инсталиране"
"Инсталиране на приложения в частно пространство"
- "Препълване"
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 83f4ba1ac8..a9f4585215 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -29,8 +29,7 @@
"হোম"
"স্প্লিট স্ক্রিন"
"%1$s-এর জন্য অ্যাপ সম্পর্কিত তথ্য"
-
-
+ "%1$s-এর জন্য ব্যবহারের সেটিংস"
"অ্যাপ পেয়ার সেভ করুন"
"%1$s | %2$s"
"এই ডিভাইসে এই অ্যাপ পেয়ারটি কাজ করে না"
@@ -195,5 +194,4 @@
"ব্যক্তিগত স্পেস ট্রানজিট করা"
"ইনস্টল করুন"
"প্রাইভেট স্পেসে অ্যাপ ইনস্টল করুন"
- "ওভারফ্লো"
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 2c5e22a601..e838b29b75 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -29,8 +29,7 @@
"Početni ekran"
"Podijeljeni ekran"
"Informacije o aplikaciji %1$s"
-
-
+ "Postavke korištenja za: %1$s"
"Sačuvaj par aplikacija"
"%1$s | %2$s"
"Par aplikacija nije podržan na uređaju"
@@ -195,5 +194,4 @@
"Prelazak u privatan prostor"
"Instaliraj"
"Instaliranje aplikacija u privatni prostor"
- "Preklopni meni"
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f275e49ee9..50ded7ba8b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -29,8 +29,7 @@
"Inici"
"Pantalla dividida"
"Informació de l\'aplicació %1$s"
-
-
+ "Configuració d\'ús de %1$s"
"Desa la parella d\'aplicacions"
"%1$s | %2$s"
"Aquesta parella d\'aplicacions no s\'admet en aquest dispositiu"
@@ -195,5 +194,4 @@
"Canvia a Espai privat"
"Instal·la"
"Instal·la les aplicacions a Espai privat"
- "Menú addicional"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c499a9a00a..c570ef13fa 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -29,8 +29,7 @@
"Domů"
"Rozdělit obrazovku"
"Informace o aplikaci %1$s"
-
-
+ "Nastavení využití pro aplikaci %1$s"
"Uložit dvojici aplikací"
"%1$s | %2$s"
"Tento pár aplikací není na tomto zařízení podporován"
@@ -195,5 +194,4 @@
"Převádění soukromého prostoru"
"Instalovat"
"Instalovat aplikace do soukromého prostoru"
- "Rozbalovací nabídka"
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f2c08fafbd..e6f741f6e9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -29,8 +29,7 @@
"Startskærm"
"Opdel skærm"
"Appinfo for %1$s"
-
-
+ "Indstillinger for brug af %1$s"
"Gem appsammenknytning"
"%1$s | %2$s"
"Denne appsammenknytning understøttes ikke på enheden"
@@ -195,5 +194,4 @@
"Ændringer af tilstanden for det private område"
"Installer"
"Installer apps i privat område"
- "Overløb"
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f5ecf59e19..ec2285d8be 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -29,8 +29,7 @@
"Startbildschirm"
"Splitscreen"
"App-Info für %1$s"
-
-
+ "Nutzungseinstellungen für %1$s"
"App-Paar speichern"
"%1$s | %2$s"
"Dieses App-Paar wird auf diesem Gerät nicht unterstützt"
@@ -195,5 +194,4 @@
"Sperrzustand des vertraulichen Profils wird gerade geändert"
"Installieren"
"Apps im vertraulichen Profil installieren"
- "Weitere Optionen"
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 1c4700a86e..8ace970859 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -29,8 +29,7 @@
"Αρχική οθόνη"
"Διαχωρισμός οθόνης"
"Πληροφορίες εφαρμογής για %1$s"
-
-
+ "Ρυθμίσεις χρήσης για %1$s"
"Αποθήκευση ζεύγους εφαρμογών"
"%1$s | %2$s"
"Αυτό το ζεύγος εφαρμογών δεν υποστηρίζεται σε αυτή τη συσκευή"
@@ -195,5 +194,4 @@
"Μετάβαση στον Ιδιωτικό χώρο"
"Εγκατάσταση"
"Εγκατάσταση εφαρμογών στον ιδιωτικό χώρο"
- "Υπερχείλιση"
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 27bcb658ae..3fe69cd5b7 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -29,8 +29,7 @@
"Home"
"Split screen"
"App info for %1$s"
-
-
+ "Usage settings for %1$s"
"Save app pair"
"%1$s | %2$s"
"This app pair isn\'t supported on this device"
@@ -195,5 +194,4 @@
"Private Space transitioning"
"Install"
"Install apps to private space"
- "Overflow"
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index f672a827d5..dee4a30029 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -194,5 +194,4 @@
"Private Space Transitioning"
"Install"
"Install apps to Private Space"
- "Overflow"
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 27bcb658ae..3fe69cd5b7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -29,8 +29,7 @@
"Home"
"Split screen"
"App info for %1$s"
-
-
+ "Usage settings for %1$s"
"Save app pair"
"%1$s | %2$s"
"This app pair isn\'t supported on this device"
@@ -195,5 +194,4 @@
"Private Space transitioning"
"Install"
"Install apps to private space"
- "Overflow"
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 27bcb658ae..3fe69cd5b7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -29,8 +29,7 @@
"Home"
"Split screen"
"App info for %1$s"
-
-
+ "Usage settings for %1$s"
"Save app pair"
"%1$s | %2$s"
"This app pair isn\'t supported on this device"
@@ -195,5 +194,4 @@
"Private Space transitioning"
"Install"
"Install apps to private space"
- "Overflow"
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 706c65c525..69added946 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -194,5 +194,4 @@
"Private Space Transitioning"
"Install"
"Install apps to Private Space"
- "Overflow"
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3ba7ece050..75b697930f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -29,8 +29,7 @@
"Pantalla principal"
"Pantalla dividida"
"Información de la app de %1$s"
-
-
+ "Configuración del uso de %1$s"
"Guardar vinculación"
"%1$s | %2$s"
"No se admite esta vinculación de apps en este dispositivo"
@@ -195,5 +194,4 @@
"Pasar a Espacio privado"
"Instalar"
"Instala las apps en el espacio privado"
- "Ampliada"
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 7309e58e6f..91e05a76b4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -29,8 +29,7 @@
"Inicio"
"Pantalla dividida"
"Información de la aplicación %1$s"
-
-
+ "Ajustes de uso para %1$s"
"Guardar apps emparejadas"
"%1$s | %2$s"
"El dispositivo no admite esta aplicación emparejada"
@@ -195,5 +194,4 @@
"Cambiar a espacio privado"
"Instalar"
"Descargar aplicaciones en el espacio privado"
- "Desplegable"
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 13500b593b..4ad9c9e13e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -194,5 +194,4 @@
"Privaatse ruumi üleviimine"
"Installi"
"Rakenduste installimine privaatses ruumis"
- "Ületäide"
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d1ff4347aa..8e68ebdc5a 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -29,8 +29,7 @@
"Orri nagusia"
"Pantaila zatitzea"
"%1$s aplikazioari buruzko informazioa"
-
-
+ "%1$s aplikazioaren erabilera-ezarpenak"
"Gorde aplikazio parea"
"%1$s | %2$s"
"Aplikazio pare hori ez da onartzen gailu honetan"
@@ -195,5 +194,4 @@
"Eremu pribaturako trantsizioa"
"Instalatu"
"Instalatu aplikazioak eremu pribatuan"
- "Luzapena"
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 367945b13c..a19134090a 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -29,8 +29,7 @@
"صفحه اصلی"
"صفحهٔ دونیمه"
"اطلاعات برنامه %1$s"
-
-
+ "تنظیمات مصرف برای %1$s"
"ذخیره جفت برنامه"
"%1$s | %2$s"
"از این جفت برنامه در این دستگاه پشتیبانی نمیشود"
@@ -195,5 +194,4 @@
"انتقال «فضای خصوصی»"
"نصب"
"نصب برنامهها در «فضای خصوصی»"
- "سرریز"
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5f7df00ceb..5ff367e70c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -29,8 +29,7 @@
"Etusivu"
"Jaettu näyttö"
"Sovellustiedot: %1$s"
-
-
+ "Käyttöasetus tälle: %1$s"
"Tallenna sovelluspari"
"%1$s | %2$s"
"Sovellusparia ei tueta tällä laitteella"
@@ -195,5 +194,4 @@
"Yksityisen tilan siirtäminen"
"Asenna"
"Asenna sovelluksia yksityiseen tilaan"
- "Ylivuoto"
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 9775dbcc5a..daa4b5fb94 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -29,8 +29,7 @@
"Accueil"
"Écran divisé"
"Renseignements sur l\'appli pour %1$s"
-
-
+ "Paramètres d\'utilisation pour %1$s"
"Enr. paire d\'applis"
"%1$s | %2$s"
"Cette paire d\'applications n\'est pas prise en charge sur cet appareil"
@@ -195,5 +194,4 @@
"Transition vers l\'Espace privé"
"Installer"
"Installer des applications dans l\'Espace privé"
- "Menu à développer"
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 53a30d317d..0ea277b1f2 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -29,8 +29,7 @@
"Accueil"
"Écran partagé"
"Infos sur l\'appli pour %1$s"
-
-
+ "Paramètres d\'utilisation pour %1$s"
"Enregistrer la paire d\'applis"
"%1$s | %2$s"
"Cette paire d\'applications n\'est pas prise en charge sur cet appareil"
@@ -195,5 +194,4 @@
"Transition vers Espace privé"
"Installer"
"Installer des applis dans l\'espace privé"
- "Dépassement"
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d651692509..fc667bc91a 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -29,8 +29,7 @@
"Inicio"
"Pantalla dividida"
"Información da aplicación para %1$s"
-
-
+ "Configuración de uso para %1$s"
"Gardar parella de apps"
"%1$s | %2$s"
"O dispositivo non admite este emparellamento de aplicacións"
@@ -195,5 +194,4 @@
"Transición ao espazo privado"
"Instalar"
"Instalar as aplicacións no espazo privado"
- "Menú adicional"
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 89291bda88..ce411e62db 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -29,8 +29,7 @@
"હોમ સ્ક્રીન"
"સ્ક્રીનને વિભાજિત કરો"
"%1$s માટે ઍપ માહિતી"
-
-
+ "%1$sના વપરાશ સંબંધિત સેટિંગ"
"ઍપની જોડી સાચવો"
"%1$s | %2$s"
"આ ડિવાઇસ પર, આ ઍપની જોડીને સપોર્ટ આપવામાં આવતો નથી"
@@ -195,5 +194,4 @@
"ખાનગી સ્પેસ પર સ્થાનાંતરણ"
"ઇન્સ્ટૉલ કરો"
"ખાનગી સ્પેસમાં ઍપ ઇન્સ્ટૉલ કરો"
- "ઓવરફ્લો"
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d70bf08edf..b5042606c5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -29,8 +29,7 @@
"होम स्क्रीन"
"स्प्लिट स्क्रीन"
"%1$s के लिए ऐप्लिकेशन की जानकारी"
-
-
+ "%1$s के लिए खर्च की सेटिंग"
"ऐप पेयर सेव करें"
"%1$s | %2$s"
"साथ में इस्तेमाल किए जा सकने वाले ये ऐप्लिकेशन, इस डिवाइस पर काम नहीं कर सकते"
@@ -195,5 +194,4 @@
"प्राइवेट स्पेस की सेटिंग में बदलाव किया जा रहा है"
"इंस्टॉल करें"
"प्राइवेट स्पेस में ऐप्लिकेशन इंस्टॉल करें"
- "ओवरफ़्लो"
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 19658f6dd1..9d6049524c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -29,8 +29,7 @@
"Početni zaslon"
"Podijeljeni zaslon"
"Informacije o aplikaciji %1$s"
-
-
+ "Postavke upotrebe za %1$s"
"Spremi par aplikacija"
"%1$s | %2$s"
"Taj par aplikacija nije podržan na ovom uređaju"
@@ -195,5 +194,4 @@
"Prelazak na privatni prostor"
"Instaliraj"
"Instaliranje aplikacija u privatni prostor"
- "Dodatni izbornik"
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 96e4981246..bb39c3374c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -29,8 +29,7 @@
"Kezdőképernyő"
"Osztott képernyő"
"Alkalmazásinformáció a következőhöz: %1$s"
-
-
+ "A(z) %1$s használati beállításai"
"Alkalmazáspár mentése"
"%1$s | %2$s"
"Ezt az alkalmazáspárt nem támogatja az eszköz"
@@ -195,5 +194,4 @@
"Átállás privát területre…"
"Telepítés"
"Alkalmazások telepítése privát területre"
- "Túlcsordulás"
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index e2b6d34235..63b935d80a 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -29,8 +29,7 @@
"Հիմնական էկրան"
"Տրոհել էկրանը"
"Տեղեկություններ %1$s հավելվածի մասին"
-
-
+ "Օգտագործման կարգավորումներ (%1$s)"
"Պահել հավելվ. զույգը"
"%1$s | %2$s"
"Հավելվածների զույգը չի աջակցվում այս սարքում"
@@ -195,5 +194,4 @@
"Անցում մասնավոր տարածք"
"Տեղադրել"
"Հավելվածների տեղադրում անձնական տարածքում"
- "Լրացուցիչ ընտրացանկ"
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index a86380e5da..ca30b42e94 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -29,8 +29,7 @@
"Layar utama"
"Layar terpisah"
"Info aplikasi untuk %1$s"
-
-
+ "Setelan penggunaan untuk %1$s"
"Simpan pasangan aplikasi"
"%1$s | %2$s"
"Pasangan aplikasi ini tidak didukung di perangkat ini"
@@ -195,5 +194,4 @@
"Ruang Pribadi Bertransisi"
"Instal"
"Instal aplikasi ke Ruang Pribadi"
- "Menu tambahan"
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d903d1ae20..aadb75ed93 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -29,8 +29,7 @@
"Heim"
"Skipta skjá"
"Upplýsingar um forrit fyrir %1$s"
-
-
+ "Notkunarstillingar fyrir %1$s"
"Vista forritapar"
"%1$s | %2$s"
"Þetta forritapar er ekki stutt í þessu tæki"
@@ -195,5 +194,4 @@
"Leynirými að breytast"
"Setja upp"
"Setja upp forrit í leynirými"
- "Yfirflæði"
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3895409034..36950b84f3 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -29,8 +29,7 @@
"Home"
"Schermo diviso"
"Informazioni sull\'app %1$s"
-
-
+ "Impostazioni di utilizzo per %1$s"
"Salva coppia di app"
"%1$s | %2$s"
"Questa coppia di app non è supportata su questo dispositivo"
@@ -195,5 +194,4 @@
"Transizione dello Spazio privato in corso…"
"Installa"
"Installa le app su spazi privati"
- "Extra"
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index aea1fa65b1..21581c37e6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -29,8 +29,7 @@
"בית"
"מסך מפוצל"
"פרטים על האפליקציה %1$s"
-
-
+ "הגדרות שימוש ב-%1$s"
"שמירת צמד אפליקציות"
"%1$s | %2$s"
"צמד האפליקציות הזה לא נתמך במכשיר הזה"
@@ -195,5 +194,4 @@
"מעבר למרחב הפרטי"
"התקנה"
"התקנת אפליקציות במרחב הפרטי"
- "אפשרויות נוספות"
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c349e546b3..1f8a93fc1c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -194,5 +194,4 @@
"プライベート スペース移行中"
"インストール"
"プライベート スペースにアプリをインストールします"
- "オーバーフロー"
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index fecd50e19b..eac12be501 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -194,5 +194,4 @@
"პირად სივრცეზე გადასვლა"
"ინსტალაცია"
"კერძო სივრცეში აპების ინსტალაცია"
- "გადავსება"
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index f3aa5f67e7..383a50785b 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -29,8 +29,7 @@
"Негізгі экран"
"Экранды бөлу"
"%1$s қолданбасы туралы ақпарат"
-
-
+ "%1$s пайдалану параметрлері"
"Қолданбаларды жұптау әрекетін сақтау"
"%1$s | %2$s"
"Бұл құрылғы қолданбаларды жұптау функциясын қолдамайды."
@@ -195,5 +194,4 @@
"Жеке бөлмеге өту"
"Орнату"
"Қолданбаларды \"Құпия кеңістікке\" орнатыңыз."
- "Қосымша мәзір"
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 1f73d4c25d..e31985256d 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -29,8 +29,7 @@
"អេក្រង់ដើម"
"មុខងារបំបែកអេក្រង់"
"ព័ត៌មានកម្មវិធីសម្រាប់ %1$s"
-
-
+ "ការកំណត់ការប្រើប្រាស់សម្រាប់ %1$s"
"រក្សាទុកគូកម្មវិធី"
"%1$s | %2$s"
"មិនអាចប្រើគូកម្មវិធីនេះនៅលើឧបករណ៍នេះបានទេ"
@@ -195,5 +194,4 @@
"ការផ្លាស់ប្ដូរ Private Space"
"ដំឡើង"
"ដំឡើងកម្មវិធីទៅលំហឯកជន"
- "ម៉ឺនុយបន្ថែម"
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 309a1fb431..758d47c518 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -29,8 +29,7 @@
"ಹೋಮ್"
"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್"
"%1$s ಗಾಗಿ ಆ್ಯಪ್ ಮಾಹಿತಿ"
-
-
+ "%1$s ಗೆ ಸಂಬಂಧಿಸಿದ ಬಳಕೆಯ ಸೆಟ್ಟಿಂಗ್ಗಳು"
"ಆ್ಯಪ್ ಪೇರ್ ಸೇವ್ ಮಾಡಿ"
"%1$s | %2$s"
"ಈ ಆ್ಯಪ್ ಜೋಡಿಯು ಈ ಸಾಧನದಲ್ಲಿ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ"
@@ -195,5 +194,4 @@
"ಖಾಸಗಿ ಸ್ಪೇಸ್ ಪರಿವರ್ತನೆಯಾಗುತ್ತಿದೆ"
"ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"
"ಆ್ಯಪ್ಗಳನ್ನು ಪ್ರೈವೇಟ್ ಸ್ಪೇಸ್ನಲ್ಲಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"
- "ಓವರ್ಫ್ಲೋ"
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index cfc04ef4a7..4d623fa30b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -29,8 +29,7 @@
"홈"
"화면 분할"
"%1$s 앱 정보"
-
-
+ "%1$s의 사용량 설정"
"앱 페어링 저장"
"%1$s | %2$s"
"이 앱 페어링은 이 기기에서 지원되지 않습니다"
@@ -195,5 +194,4 @@
"비공개 스페이스 전환"
"설치"
"비공개 스페이스에 앱 설치"
- "오버플로"
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 96446e88a1..98d1e73439 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -29,8 +29,7 @@
"Башкы экран"
"Экранды бөлүү"
"%1$s колдонмосу жөнүндө маалымат"
-
-
+ "%1$s колдонмосун пайдалануу параметрлери"
"Колдонмолорду сактап коюу"
"%1$s | %2$s"
"Бул эки колдонмону бул түзмөктө бир маалда пайдаланууга болбойт"
@@ -195,5 +194,4 @@
"Жеке чөйрөгө өтүү"
"Орнотуу"
"Колдонмолорду Жеке мейкиндикке орнотуe"
- "Кошумча меню"
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 708a2f3562..e0bcfe0185 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -29,8 +29,7 @@
"ໂຮມສະກຣີນ"
"ແບ່ງໜ້າຈໍ"
"ຂໍ້ມູນແອັບສຳລັບ %1$s"
-
-
+ "ການຕັ້ງຄ່າການນຳໃຊ້ສຳລັບ %1$s"
"ບັນທຶກຈັບຄູ່ແອັບ"
"%1$s | %2$s"
"ການຈັບຄູ່ແອັບນີ້ບໍ່ຮອງຮັບຢູ່ອຸປະກອນນີ້"
@@ -195,5 +194,4 @@
"ການປ່ຽນແປງພື້ນທີ່ສ່ວນຕົວ"
"ຕິດຕັ້ງ"
"ຕິດຕັ້ງແອັບໄປໃສ່ພື້ນທີ່ສ່ວນບຸກຄົນ"
- "ການດຳເນີນການເພີ່ມເຕີມ"
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index bc33bd8efd..6a2b8d7f0f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -194,5 +194,4 @@
"Privačios erdvės perkėlimas"
"Įdiegti"
"Įdiegti programas privačioje erdvėje"
- "Perpildymas"
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7dbe5facaa..cae6b6e211 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -29,8 +29,7 @@
"Sākums"
"Sadalīt ekrānu"
"%1$s: informācija par lietotni"
-
-
+ "Lietojuma iestatījumi: %1$s"
"Saglabāt lietotņu pāri"
"%1$s | %2$s"
"Šis lietotņu pāris netiek atbalstīts šajā ierīcē"
@@ -195,5 +194,4 @@
"Pāriet uz privāto mapi"
"Instalēt"
"Instalējiet lietotnes privātajā telpā."
- "Pārpilde"
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 18849e9ce1..46d8600c3d 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -29,8 +29,7 @@
"Почетен екран"
"Поделен екран"
"Податоци за апликација за %1$s"
-
-
+ "Поставки за користење за %1$s"
"Зачувај го парот апликации"
"%1$s | %2$s"
"Паров апликации не е поддржан на уредов"
@@ -195,5 +194,4 @@
"Префрлање на „Приватен простор“"
"Инсталирајте"
"Инсталирање апликации во „Приватен простор“"
- "Проширено балонче"
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 529cc8d53e..eec5f74a54 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -29,8 +29,7 @@
"ഹോം"
"സ്ക്രീൻ വിഭജന മോഡ്"
"%1$s എന്നതിന്റെ ആപ്പ് വിവരങ്ങൾ"
-
-
+ "%1$s എന്നതിനുള്ള ഉപയോഗ ക്രമീകരണം"
"ആപ്പ് ജോടി സംരക്ഷിക്കുക"
"%1$s | %2$s"
"ഈ ഉപകരണത്തിൽ ഈ ആപ്പ് ജോടിക്ക് പിന്തുണയില്ല"
@@ -195,5 +194,4 @@
"പ്രൈവറ്റ് സ്പേസ് ട്രാൻസിഷനിംഗ്"
"ഇൻസ്റ്റാൾ ചെയ്യുക"
"സ്വകാര്യ സ്പേസിലേക്ക് ആപ്പുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"
- "ഓവർഫ്ലോ"
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 21c8ad15b2..396589c796 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -29,8 +29,7 @@
"Нүүр"
"Дэлгэцийг хуваах"
"%1$s-н аппын мэдээлэл"
-
-
+ "%1$s-н ашиглалтын тохиргоо"
"Апп хослуулалтыг хадгалах"
"%1$s | %2$s"
"Энэ апп хослуулалтыг уг төхөөрөмж дээр дэмждэггүй"
@@ -195,5 +194,4 @@
"Private Space-н шилжилт"
"Суулгах"
"Хувийн орон зайд аппууд суулгана уу"
- "Урт цэс"
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1badd2124f..972c9f2342 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -194,5 +194,4 @@
"खाजगी स्पेस वर स्विच करणे"
"इंस्टॉल करा"
"अॅप्स खाजगी स्पेस मध्ये इंस्टॉल करा"
- "ओव्हरफ्लो"
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 270ebf0b68..c25e3df9d6 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -29,8 +29,7 @@
"Rumah"
"Skrin pisah"
"Maklumat apl untuk %1$s"
-
-
+ "Tetapan penggunaan sebanyak %1$s"
"Simpan gandingan apl"
"%1$s | %2$s"
"Gandingan apl ini tidak disokong pada peranti ini"
@@ -195,5 +194,4 @@
"Peralihan Ruang Peribadi"
"Pasang"
"Pasang apl pada Ruang Peribadi"
- "Limpahan"
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index cec9b1b76c..700278a454 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -194,5 +194,4 @@
"သီးသန့်ချတ်ခန်း အပြောင်းအလဲ"
"ထည့်သွင်းရန်"
"‘သီးသန့်နေရာ’ တွင် အက်ပ်များ ထည့်သွင်းနိုင်သည်"
- "မီနူးအပို"
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 392cf45721..c2f99aa052 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -29,8 +29,7 @@
"Startskjerm"
"Delt skjerm"
"Appinformasjon for %1$s"
-
-
+ "Bruksinnstillinger for %1$s"
"Lagre apptilkoblingen"
"%1$s | %2$s"
"Denne apptilkoblingen støttes ikke på denne enheten"
@@ -195,5 +194,4 @@
"Private Space-overgang"
"Installer"
"Installer apper i privat område"
- "Overflyt"
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index f5a16ee257..5e93f89654 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -29,8 +29,7 @@
"होम"
"स्प्लिट स्क्रिन"
"%1$s का हकमा एपसम्बन्धी जानकारी"
-
-
+ "%1$s को प्रयोगसम्बन्धी सेटिङ"
"एपको पेयर सेभ गर्नुहोस्"
"%1$s | %2$s"
"यस डिभाइसमा यो एप पेयर प्रयोग गर्न मिल्दैन"
@@ -195,5 +194,4 @@
"निजी स्पेस ट्रान्जिसन गरिँदै छ"
"इन्स्टल गर्नुहोस्"
"निजी स्पेसमा एपहरू इन्स्टल गर्नुहोस्"
- "ओभरफ्लो"
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 176fbc9bc9..d7d4e7de23 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -29,8 +29,7 @@
"Startscherm"
"Gesplitst scherm"
"App-info voor %1$s"
-
-
+ "Gebruiksinstellingen voor %1$s"
"App-paar opslaan"
"%1$s | %2$s"
"Dit app-paar wordt niet ondersteund op dit apparaat"
@@ -195,5 +194,4 @@
"Overschakelen naar privéruimte"
"Installeren"
"Apps installeren in privégedeelte"
- "Overloop"
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index db656a6a0f..3c240ae129 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -29,8 +29,7 @@
"ହୋମ"
"ସ୍କ୍ରିନକୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ"
"%1$s ପାଇଁ ଆପ ସୂଚନା"
-
-
+ "%1$s ପାଇଁ ବ୍ୟବହାର ସେଟିଂସ"
"ଆପ ପେୟାର ସେଭ କରନ୍ତୁ"
"%1$s | %2$s"
"ଏହି ଆପ ପେୟାର ଏ ଡିଭାଇସରେ ସମର୍ଥିତ ନୁହେଁ"
@@ -195,5 +194,4 @@
"ପ୍ରାଇଭେଟ ସ୍ପେସ ଟ୍ରାଞ୍ଜିସନିଂ"
"ଇନଷ୍ଟଲ କରନ୍ତୁ"
"ଆପ୍ସକୁ ପ୍ରାଇଭେଟ ସ୍ପେସରେ ଇନଷ୍ଟଲ କରନ୍ତୁ"
- "ଓଭରଫ୍ଲୋ"
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index a496865c3c..0df0c3f274 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -29,8 +29,7 @@
"ਮੁੱਖ ਪੰਨਾ"
"ਸਪਲਿਟ ਸਕ੍ਰੀਨ"
"%1$s ਲਈ ਐਪ ਜਾਣਕਾਰੀ"
-
-
+ "%1$s ਲਈ ਵਰਤੋਂ ਸੈਟਿੰਗਾਂ"
"ਐਪ ਜੋੜਾਬੱਧ ਰੱਖਿਅਤ ਕਰੋ"
"%1$s | %2$s"
"ਇਸ ਐਪ ਜੋੜਾਬੱਧ ਦਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਮਰਥਨ ਨਹੀਂ ਕੀਤਾ ਜਾਂਦਾ"
@@ -195,5 +194,4 @@
"ਨਿੱਜੀ ਸਪੇਸ ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ"
"ਸਥਾਪਤ ਕਰੋ"
"ਪ੍ਰਾਈਵੇਟ ਸਪੇਸ ਵਿੱਚ ਐਪਾਂ ਸਥਾਪਤ ਕਰੋ"
- "ਓਵਰਫ਼ਲੋ"
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 86a43ab666..a8e79e3a50 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -29,8 +29,7 @@
"Ekran główny"
"Podziel ekran"
"Informacje o aplikacji: %1$s"
-
-
+ "%1$s – ustawienia użycia"
"Zapisz parę aplikacji"
"%1$s | %2$s"
"Ta para aplikacji nie jest obsługiwana na tym urządzeniu"
@@ -195,5 +194,4 @@
"Przenoszenie obszaru prywatnego"
"Zainstaluj"
"Zainstaluj aplikacje w przestrzeni prywatnej"
- "Rozwiń menu"
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a8eadfe354..6e4a8e89cb 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -194,5 +194,4 @@
"Transição do espaço privado"
"Instalar"
"Instale apps no espaço privado"
- "Menu adicional"
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2833a3fdb4..a049a80c09 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -29,8 +29,7 @@
"Início"
"Tela dividida"
"Informações do app %1$s"
-
-
+ "Configurações de uso de %1$s"
"Salvar par de apps"
"%1$s | %2$s"
"Este Par de apps não está disponível no dispositivo"
@@ -195,5 +194,4 @@
"Espaço particular em transição"
"Instalar"
"Instalar apps no espaço privado"
- "Balão flutuante"
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a3ee56ee3f..bbade3c666 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -29,8 +29,7 @@
"Pagina de pornire"
"Ecran împărțit"
"Informații despre aplicație pentru %1$s"
-
-
+ "Setări de utilizare pentru %1$s"
"Salvează perechea de aplicații"
"%1$s | %2$s"
"Perechea de aplicații nu este acceptată pe acest dispozitiv"
@@ -195,5 +194,4 @@
"Tranziție pentru spațiul privat"
"Instalează"
"Instalează aplicații în Spațiul privat"
- "Suplimentar"
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7b99297f4a..995052e8f7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -29,8 +29,7 @@
"Главный экран"
"Разделить экран"
"Сведения о приложении \"%1$s\""
-
-
+ "Настройки использования приложения \"%1$s\""
"Сохранить приложения"
"%1$s | %2$s"
"Одновременно использовать эти два приложения на устройстве нельзя."
@@ -195,5 +194,4 @@
"Переход к личному пространству"
"Установить"
"Установить приложения в личном пространстве"
- "Дополнительное меню"
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 511d59348c..914085416c 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -29,8 +29,7 @@
"මුල් පිටුව"
"බෙදුම් තිරය"
"%1$s සඳහා යෙදුම් තතු"
-
-
+ "%1$s සඳහා භාවිත සැකසීම්"
"යෙදුම් යුගල සුරකින්න"
"%1$s | %2$s"
"මෙම යෙදුම් යුගලය මෙම උපාංගයෙහි සහාය නොදක්වයි"
@@ -195,5 +194,4 @@
"පෞද්ගලික අවකාශ සංක්රමණය"
"ස්ථාපන කරන්න"
"පෞද්ගලික අවකාශයට යෙදුම් ස්ථාපනය කරන්න"
- "පිටාර යාම"
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 960259425e..1ba5771180 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -29,8 +29,7 @@
"Domov"
"Rozdeliť obrazovku"
"Informácie o aplikácii pre %1$s"
-
-
+ "Nastavenia používania pre %1$s"
"Uložiť pár aplikácií"
"%1$s | %2$s"
"Tento pár aplikácií nie je v tomto zariadení podporovaný"
@@ -195,5 +194,4 @@
"Prechod súkromného priestoru"
"Inštalovať"
"Inštalácia aplikácií v súkromnom priestore"
- "Rozšírená ponuka"
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2b334aa2eb..cea6e1832c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -194,5 +194,4 @@
"Preklapljanje zasebnega prostora"
"Namestitev"
"Nameščanje aplikacij v zasebni prostor"
- "Oblaček z dodatnimi elementi"
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index fbeb20537d..f328557dc9 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -29,8 +29,7 @@
"Ekrani bazë"
"Ekrani i ndarë"
"Informacioni i aplikacionit për %1$s"
-
-
+ "Cilësimet e përdorimit për \"%1$s\""
"Ruaj çiftin e aplikacioneve"
"%1$s | %2$s"
"Ky çift aplikacionesh nuk mbështetet në këtë pajisje"
@@ -195,5 +194,4 @@
"Kalimi te \"Hapësira private\""
"Instalo"
"Instalo aplikacionet në hapësirën private"
- "Tejkalimi"
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8ae58ebb29..6fdeb418c6 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -194,5 +194,4 @@
"Пренос приватног простора"
"Инсталирајте"
"Инсталирај апликације у приватан простор"
- "Преклопно"
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d99fd86bbb..1866f95b02 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -29,8 +29,7 @@
"Startskärm"
"Delad skärm"
"Appinformation för %1$s"
-
-
+ "Användningsinställningar för %1$s"
"Spara app-par"
"%1$s | %2$s"
"De här apparna som ska användas tillsammans stöds inte på den här enheten"
@@ -195,5 +194,4 @@
"Överföring av privat rum"
"Installera"
"Installera appar i privat rum"
- "Fler alternativ"
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8893a907cb..5c02beb2f5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -29,8 +29,7 @@
"Skrini ya kwanza"
"Gawa skrini"
"Maelezo ya programu ya %1$s"
-
-
+ "Mipangilio ya matumizi ya %1$s"
"Hifadhi jozi ya programu"
"%1$s | %2$s"
"Jozi hii ya programu haitumiki kwenye kifaa hiki"
@@ -195,5 +194,4 @@
"Mabadiliko ya Nafasi ya Faragha"
"Weka"
"Sakinisha programu kwenye Sehemu ya Faragha"
- "Menyu ya vipengee vya ziada"
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index fbd788071b..ebc55caa11 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -29,8 +29,7 @@
"முகப்பு"
"திரைப் பிரிப்பு"
"%1$sக்கான ஆப்ஸ் தகவல்கள்"
-
-
+ "%1$sக்கான உபயோக அமைப்புகள்"
"ஆப்ஸ் ஜோடியைச் சேமி"
"%1$s | %2$s"
"இந்தச் சாதனத்தில் இந்த ஆப்ஸ் ஜோடி ஆதரிக்கப்படவில்லை"
@@ -195,5 +194,4 @@
"தனிப்பட்ட சேமிப்பிடத்திற்கு மாற்றுகிறது"
"நிறுவுதல்"
"தனிப்பட்ட சேமிப்பிடத்தில் ஆப்ஸை நிறுவும்"
- "கூடுதல் விருப்பங்களைக் காட்டும்"
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 11c2755cb9..e1c4668b0f 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -29,8 +29,7 @@
"మొదటి ట్యాబ్"
"స్ప్లిట్ స్క్రీన్"
"%1$s కోసం యాప్ సమాచారం"
-
-
+ "%1$sకు సంబంధించిన వినియోగ సెట్టింగ్లు"
"యాప్ పెయిర్ను సేవ్ చేయండి"
"%1$s | %2$s"
"ఈ పరికరంలో ఈ యాప్ పెయిర్ సపోర్ట్ చేయదు"
@@ -195,5 +194,4 @@
"ప్రైవేట్ స్పేస్ కేటాయించడం జరుగుతుంది"
"ఇన్స్టాల్ చేయండి"
"ప్రైవేట్ స్పేస్కు యాప్లను ఇన్స్టాల్ చేయండి"
- "ఓవర్ఫ్లో"
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d006e5e117..4288c24936 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -29,8 +29,7 @@
"หน้าแรก"
"แยกหน้าจอ"
"ข้อมูลแอปสำหรับ %1$s"
-
-
+ "การตั้งค่าการใช้งานสำหรับ %1$s"
"บันทึกคู่แอป"
"%1$s | %2$s"
"ไม่รองรับคู่แอปนี้ในอุปกรณ์เครื่องนี้"
@@ -195,5 +194,4 @@
"การเปลี่ยนไปใช้พื้นที่ส่วนตัว"
"ติดตั้ง"
"ติดตั้งแอปไปยังพื้นที่ส่วนตัว"
- "การดำเนินการเพิ่มเติม"
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index a497d4f8d9..305f5322c4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -29,8 +29,7 @@
"Home"
"Split screen"
"Impormasyon ng app para sa %1$s"
-
-
+ "Mga setting ng paggamit para sa %1$s"
"I-save ang app pair"
"%1$s | %2$s"
"Hindi sinusuportahan sa device na ito ang pares ng app na ito"
@@ -195,5 +194,4 @@
"Pag-transition ng Pribadong Space"
"I-install"
"Mag-install ng mga app sa Pribadong Space"
- "Overflow"
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 301a754379..0681e3d60a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -29,8 +29,7 @@
"Ana ekran"
"Bölünmüş ekran"
"%1$s uygulama bilgileri"
-
-
+ "%1$s ile ilgili kullanım ayarları"
"Uygulama çiftini kaydedin"
"%1$s | %2$s"
"Bu uygulama çifti bu cihazda desteklenmiyor"
@@ -195,5 +194,4 @@
"Gizli Alana Geçiş"
"Yükle"
"Uygulamaları özel alana yükleyin"
- "Taşma"
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3ff70b8b28..c1d6b2fa85 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -29,8 +29,7 @@
"Головний екран"
"Розділити екран"
"Інформація про додаток для %1$s"
-
-
+ "Параметри використання (%1$s)"
"Зберегти пару додатків"
"%1$s | %2$s"
"Ці два додатки не можна одночасно використовувати на цьому пристрої"
@@ -195,5 +194,4 @@
"Перехід у приватний простір"
"Установити"
"Установити додатки в особистому просторі"
- "Додаткове меню"
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 653959ea7a..6c1a88e95c 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -29,8 +29,7 @@
"ہوم"
"اسپلٹ اسکرین"
"%1$s کے لیے ایپ کی معلومات"
-
-
+ "%1$s کیلئے استعمال کی ترتیبات"
"ایپس کے جوڑے کو محفوظ کریں"
"%1$s | %2$s"
"ایپس کا یہ جوڑا اس آلے پر تعاون یافتہ نہیں ہے"
@@ -195,5 +194,4 @@
"نجی اسپیس کی منتقلی"
"انسٹال کریں"
"پرائیویٹ اسپیس میں ایپس انسٹال کریں"
- "اوورفلو"
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 194822e789..18431cc068 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -29,8 +29,7 @@
"Bosh ekran"
"Ekranni ikkiga ajratish"
"%1$s ilovasi axboroti"
-
-
+ "%1$s uchun sarf sozlamalari"
"Ilova juftini saqlash"
"%1$s | %2$s"
"Bu ilova jufti ushbu qurilmada ishlamaydi"
@@ -195,5 +194,4 @@
"Maxfiy joyga almashtirish"
"Oʻrnatish"
"Ilovalarni Maxfiy makonga oʻrnatish"
- "Kengaytirish"
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f50b8e8d9b..b5fb1d7463 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -29,8 +29,7 @@
"Màn hình chính"
"Chia đôi màn hình"
"Thông tin ứng dụng cho %1$s"
-
-
+ "Chế độ cài đặt mức sử dụng %1$s"
"Lưu cặp ứng dụng"
"%1$s | %2$s"
"Cặp ứng dụng này không hoạt động được trên thiết bị này"
@@ -195,5 +194,4 @@
"Chuyển đổi sang không gian riêng tư"
"Cài đặt"
"Cài đặt ứng dụng vào Không gian riêng tư"
- "Bong bóng bổ sung"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b4c432b56a..d51f8fd9c3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -29,8 +29,7 @@
"主屏幕"
"分屏"
"%1$s 的应用信息"
-
-
+ "%1$s的使用设置"
"保存应用组合"
"%1$s | %2$s"
"在该设备上无法使用此应用对"
@@ -88,7 +87,7 @@
"安装到私密个人资料中"
"卸载应用"
"安装"
- "不要提供应用建议"
+ "不要推荐此应用"
"固定预测的应用"
"安装快捷方式"
"允许应用自行添加快捷方式。"
@@ -195,5 +194,4 @@
"私密空间转换"
"安装"
"将应用安装到私密空间"
- "菜单"
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 94b3ae6eaa..90ff5151ab 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -29,8 +29,7 @@
"主畫面"
"分割螢幕"
"%1$s 的應用程式資料"
-
-
+ "「%1$s」的用量設定"
"儲存應用程式配對"
"%1$s | %2$s"
"此裝置不支援此應用程式配對"
@@ -195,5 +194,4 @@
"轉為「私人空間」"
"安裝"
"將應用程式安裝在「私人空間」中"
- "顯示更多"
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e0b7ab2ea1..023a5265c1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -29,8 +29,7 @@
"主畫面"
"分割畫面"
"「%1$s」的應用程式資訊"
-
-
+ "「%1$s」的用量設定"
"儲存應用程式配對"
"%1$s | %2$s"
"這部裝置不支援這組應用程式配對"
@@ -195,5 +194,4 @@
"轉換私人空間狀態"
"安裝"
"將應用程式安裝在私人空間中"
- "溢位"
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 16d71a6da3..a9367250c2 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -29,8 +29,7 @@
"Ikhaya"
"Hlukanisa isikrini"
"Ulwazi lwe-App ye-%1$s"
-
-
+ "Amasethingi okusetshenziswa ka-%1$s"
"Londoloza i-app ebhangqiwe"
"%1$s | %2$s"
"Lokhu kubhanqwa kwe-app akusekelwa kule divayisi"
@@ -195,5 +194,4 @@
"Ukuguqulwa Kwendawo Yangasese"
"Faka"
"Faka ama-app Endaweni Engasese"
- "Ukugcwala kakhulu"
diff --git a/src/com/android/launcher3/model/WidgetsModel.java b/src/com/android/launcher3/model/WidgetsModel.java
index 5e0edb3139..4cba0b5239 100644
--- a/src/com/android/launcher3/model/WidgetsModel.java
+++ b/src/com/android/launcher3/model/WidgetsModel.java
@@ -32,6 +32,7 @@ import com.android.launcher3.icons.ComponentWithLabelAndIcon;
import com.android.launcher3.icons.IconCache;
import com.android.launcher3.model.data.PackageItemInfo;
import com.android.launcher3.pm.ShortcutConfigActivityInfo;
+import com.android.launcher3.util.ComponentKey;
import com.android.launcher3.util.IntSet;
import com.android.launcher3.util.PackageUserKey;
import com.android.launcher3.util.Preconditions;
@@ -129,6 +130,22 @@ public class WidgetsModel {
return packagesToWidgets;
}
+ /**
+ * Returns a map of widget component keys to corresponding widget items. Excludes the
+ * shortcuts.
+ */
+ public synchronized Map getAllWidgetComponentsWithoutShortcuts() {
+ if (!WIDGETS_ENABLED) {
+ return Collections.emptyMap();
+ }
+ Map widgetsMap = new HashMap<>();
+ mWidgetsList.forEach((packageItemInfo, widgetsAndShortcuts) ->
+ widgetsAndShortcuts.stream().filter(item -> item.widgetInfo != null).forEach(
+ item -> widgetsMap.put(new ComponentKey(item.componentName, item.user),
+ item)));
+ return widgetsMap;
+ }
+
/**
* @param packageUser If null, all widgets and shortcuts are updated and returned, otherwise
* only widgets and shortcuts associated with the package/user are.
diff --git a/src/com/android/launcher3/util/DisplayController.java b/src/com/android/launcher3/util/DisplayController.java
index 21eee5546b..16fabe26d7 100644
--- a/src/com/android/launcher3/util/DisplayController.java
+++ b/src/com/android/launcher3/util/DisplayController.java
@@ -174,7 +174,9 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
}
/**
- * Returns whether taskbar is transient.
+ * Returns whether taskbar is transient or persistent.
+ *
+ * @return {@code true} if transient, {@code false} if persistent.
*/
public static boolean isTransientTaskbar(Context context) {
return INSTANCE.get(context).getInfo().isTransientTaskbar();
@@ -405,7 +407,7 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
navigationMode = wmProxy.getNavigationMode(displayInfoContext);
mPerDisplayBounds.putAll(perDisplayBoundsCache);
- List cachedValue = mPerDisplayBounds.get(normalizedDisplayInfo);
+ List cachedValue = getCurrentBounds();
realBounds = wmProxy.getRealBounds(displayInfoContext, displayInfo);
if (cachedValue == null) {
@@ -415,7 +417,7 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
FileLog.e(TAG, "(Invalid Cache) perDisplayBounds : " + mPerDisplayBounds);
mPerDisplayBounds.clear();
mPerDisplayBounds.putAll(wmProxy.estimateInternalDisplayBounds(displayInfoContext));
- cachedValue = mPerDisplayBounds.get(normalizedDisplayInfo);
+ cachedValue = getCurrentBounds();
if (cachedValue == null) {
FileLog.e(TAG, "normalizedDisplayInfo not found in estimation: "
+ normalizedDisplayInfo);
@@ -505,6 +507,13 @@ public class DisplayController implements ComponentCallbacks, SafeCloseable {
return Collections.unmodifiableSet(mPerDisplayBounds.keySet());
}
+ /**
+ * Returns all {@link WindowBounds}s for the current display.
+ */
+ public List getCurrentBounds() {
+ return mPerDisplayBounds.get(normalizedDisplayInfo);
+ }
+
public int getDensityDpi() {
return densityDpi;
}
diff --git a/src/com/android/launcher3/widget/WidgetCell.java b/src/com/android/launcher3/widget/WidgetCell.java
index 2bb485aafa..35372d3af5 100644
--- a/src/com/android/launcher3/widget/WidgetCell.java
+++ b/src/com/android/launcher3/widget/WidgetCell.java
@@ -372,6 +372,13 @@ public class WidgetCell extends LinearLayout {
}
}
+ /**
+ * Returns a view (holding the previews) that can be dragged and dropped.
+ */
+ public View getDragAndDropView() {
+ return mWidgetImageContainer;
+ }
+
public WidgetImageView getWidgetView() {
return mWidgetImage;
}
diff --git a/tests/multivalentTests/src/com/android/launcher3/icons/UserBadgeDrawableTest.kt b/tests/multivalentTests/src/com/android/launcher3/icons/UserBadgeDrawableTest.kt
new file mode 100644
index 0000000000..d611ae8dd6
--- /dev/null
+++ b/tests/multivalentTests/src/com/android/launcher3/icons/UserBadgeDrawableTest.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.launcher3.icons
+
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.launcher3.icons.UserBadgeDrawable.SHADOW_COLOR
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.any
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
+
+/** Test for [UserBadgeDrawable] */
+@RunWith(AndroidJUnit4::class)
+class UserBadgeDrawableTest {
+ private val context = InstrumentationRegistry.getInstrumentation().targetContext
+ private val canvas = mock