diff --git a/proguard.flags b/proguard.flags
index a45018346a..1f5c0655c2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -54,7 +54,7 @@
-dontwarn com.android.internal.util.**
################ Do not optimize recents lib #############
--keep class com.android.systemui.** {
+-keep class com.android.systemui.shared.** {
*;
}
diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml
index 58b26d1cd3..5deea3b6fd 100644
--- a/quickstep/res/values-ar/strings.xml
+++ b/quickstep/res/values-ar/strings.xml
@@ -102,10 +102,8 @@
"رجوع"
"مفتاح التبديل إلى IME"
"الأحدث"
-
-
-
-
+ "الإشعارات"
+ "إعدادات سريعة"
"الانتقال إلى يمين الشاشة أو أعلاها"
"الانتقال إلى يسار الشاشة أو أسفلها"
diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml
index 38a506f265..d48c2f1793 100644
--- a/quickstep/res/values-as/strings.xml
+++ b/quickstep/res/values-as/strings.xml
@@ -102,10 +102,8 @@
"উভতি যাওক"
"IME ছুইচ্চাৰ"
"শেহতীয়া"
-
-
-
-
+ "জাননী"
+ "ক্ষিপ্ৰ ছেটিং"
"ওপৰৰ বাঁওফাললৈ নিয়ক"
"তলৰ সোঁফাললৈ নিয়ক"
diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml
index 74fcb63faf..9cea3c6b7a 100644
--- a/quickstep/res/values-az/strings.xml
+++ b/quickstep/res/values-az/strings.xml
@@ -102,10 +102,8 @@
"Geriyə"
"IME keçiricisi"
"Sonuncular"
-
-
-
-
+ "Bildirişlər"
+ "Sürətli Ayarlar"
"Yuxarı/sola köçürün"
"Aşağı/sağa köçürün"
diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml
index 4872f7d61b..16aec9b6de 100644
--- a/quickstep/res/values-be/strings.xml
+++ b/quickstep/res/values-be/strings.xml
@@ -102,10 +102,8 @@
"Назад"
"Выключальнік IME"
"Нядаўнія"
-
-
-
-
+ "Апавяшчэнні"
+ "Хуткія налады"
"Перамясціць уверх/улева"
"Перамясціць уніз/управа"
diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml
index 3fea5ee55e..2d3dc60116 100644
--- a/quickstep/res/values-bg/strings.xml
+++ b/quickstep/res/values-bg/strings.xml
@@ -102,10 +102,8 @@
"Назад"
"Редактор за метода на въвежд.: Превключвател"
"Скорошни"
-
-
-
-
+ "Известия"
+ "Бързи настройки"
"Преместване горе/вляво"
"Преместване долу/вдясно"
diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml
index 0f6c4862dd..8a6d1534eb 100644
--- a/quickstep/res/values-ca/strings.xml
+++ b/quickstep/res/values-ca/strings.xml
@@ -102,10 +102,8 @@
"Enrere"
"Selector d\'IME"
"Recents"
-
-
-
-
+ "Notificacions"
+ "Config. ràpida"
"Mou a la part superior o a l\'esquerra"
"Mou a la part inferior o a la dreta"
diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml
index 6aef1a48e5..c2071033e9 100644
--- a/quickstep/res/values-cs/strings.xml
+++ b/quickstep/res/values-cs/strings.xml
@@ -102,10 +102,8 @@
"Zpět"
"Přepínač IME"
"Poslední"
-
-
-
-
+ "Oznámení"
+ "Rychlé nastavení"
"Přesunout doleva nahoru"
"Přesunout doprava dolů"
diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml
index c2e66812cb..e53dfb0e5b 100644
--- a/quickstep/res/values-da/strings.xml
+++ b/quickstep/res/values-da/strings.xml
@@ -102,10 +102,8 @@
"Tilbage"
"IME-vælger"
"Seneste"
-
-
-
-
+ "Notifikationer"
+ "Kvikmenu"
"Flyt til toppen eller venstre side"
"Flyt til bunden eller højre side"
diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml
index b5dc6e610d..0916fc23ed 100644
--- a/quickstep/res/values-es/strings.xml
+++ b/quickstep/res/values-es/strings.xml
@@ -102,10 +102,8 @@
"Atrás"
"Interruptor IME"
"Recientes"
-
-
-
-
+ "Notificaciones"
+ "Ajustes rápidos"
"Mover arriba/a la izquierda"
"Mover abajo/a la derecha"
diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml
index 950263f263..5b4b1ce6f0 100644
--- a/quickstep/res/values-et/strings.xml
+++ b/quickstep/res/values-et/strings.xml
@@ -102,10 +102,8 @@
"Tagasi"
"IME vahetaja"
"Hiljutised"
-
-
-
-
+ "Märguanded"
+ "Kiirseaded"
"Teisalda üles/vasakule"
"Teisalda alla/paremale"
diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml
index 9505039bf0..4677edab9b 100644
--- a/quickstep/res/values-fi/strings.xml
+++ b/quickstep/res/values-fi/strings.xml
@@ -102,10 +102,8 @@
"Takaisin"
"IME-vaihtopalvelu"
"Viimeaikaiset"
-
-
-
-
+ "Ilmoitukset"
+ "Pika-asetukset"
"Siirrä ylös tai vasemmalle"
"Siirrä alas tai oikealle"
diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml
index e34cb5d328..2a38ff862d 100644
--- a/quickstep/res/values-fr-rCA/strings.xml
+++ b/quickstep/res/values-fr-rCA/strings.xml
@@ -102,10 +102,8 @@
"Retour"
"Sélecteur IME"
"Récents"
-
-
-
-
+ "Notifications"
+ "Paramètres rapides"
"Déplacer vers le coin supérieur gauche de l\'écran"
"Déplacer vers le coin inférieur droit de l\'écran"
diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml
index 3c28c4649e..c1dd76e6ea 100644
--- a/quickstep/res/values-fr/strings.xml
+++ b/quickstep/res/values-fr/strings.xml
@@ -102,10 +102,8 @@
"Retour"
"Sélecteur IME"
"Récents"
-
-
-
-
+ "Notifications"
+ "Réglages rapides"
"Déplacer en haut ou à gauche"
"Déplacer en bas ou à droite"
diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml
index 4095f7d52c..8702947875 100644
--- a/quickstep/res/values-gl/strings.xml
+++ b/quickstep/res/values-gl/strings.xml
@@ -102,10 +102,8 @@
"Atrás"
"Selector do IME"
"Recentes"
-
-
-
-
+ "Notificacións"
+ "Configuración rápida"
"Mover á parte superior ou á esquerda"
"Mover á parte inferior ou á dereita"
diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml
index 5b1aff9896..a84dadd706 100644
--- a/quickstep/res/values-hu/strings.xml
+++ b/quickstep/res/values-hu/strings.xml
@@ -102,10 +102,8 @@
"Vissza"
"IME-váltó"
"Legutóbbiak"
-
-
-
-
+ "Értesítések"
+ "Gyorsbeállítások"
"Mozgatás felülre vagy a bal oldalra"
"Mozgatás alulra vagy a jobb oldalra"
diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml
index 13275522a1..f888bea9db 100644
--- a/quickstep/res/values-is/strings.xml
+++ b/quickstep/res/values-is/strings.xml
@@ -102,10 +102,8 @@
"Til baka"
"Breyta innsláttaraðferð"
"Nýlegt"
-
-
-
-
+ "Tilkynningar"
+ "Flýtistillingar"
"Færa efst/til vinstri"
"Færa neðst/til hægri"
diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml
index a555636db1..344c2a15cd 100644
--- a/quickstep/res/values-it/strings.xml
+++ b/quickstep/res/values-it/strings.xml
@@ -102,10 +102,8 @@
"Indietro"
"Selettore IME"
"Recenti"
-
-
-
-
+ "Notifiche"
+ "Impostazioni rapide"
"Sposta in alto/a sinistra"
"Sposta in basso/a destra"
diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml
index cd97903de4..25d92cb8ef 100644
--- a/quickstep/res/values-iw/strings.xml
+++ b/quickstep/res/values-iw/strings.xml
@@ -102,10 +102,8 @@
"חזרה"
"כלי להחלפת IME"
"לאחרונה"
-
-
-
-
+ "התראות"
+ "הגדרות מהירות"
"העברה לפינה השמאלית/העליונה"
"העברה לפינה הימנית/התחתונה"
diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml
index 3295a636ef..e006c6af5e 100644
--- a/quickstep/res/values-km/strings.xml
+++ b/quickstep/res/values-km/strings.xml
@@ -102,10 +102,8 @@
"ថយក្រោយ"
"ប៊ូតុងប្ដូរ IME"
"ថ្មីៗ"
-
-
-
-
+ "ការជូនដំណឹង"
+ "ការកំណត់រហ័ស"
"ផ្លាស់ទីទៅខាងលើ/ឆ្វេង"
"ផ្លាស់ទីទៅខាងក្រោម/ស្ដាំ"
diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml
index 08e5642068..d9ff591592 100644
--- a/quickstep/res/values-ko/strings.xml
+++ b/quickstep/res/values-ko/strings.xml
@@ -102,10 +102,8 @@
"뒤로"
"IME 전환기"
"최근 항목"
-
-
-
-
+ "알림"
+ "빠른 설정"
"상단/왼쪽으로 이동"
"하단/오른쪽으로 이동"
diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml
index 4c1791f112..5c95b03951 100644
--- a/quickstep/res/values-lo/strings.xml
+++ b/quickstep/res/values-lo/strings.xml
@@ -102,10 +102,8 @@
"ກັບຄືນ"
"ຕົວສະຫຼັບ IME"
"ຫຼ້າສຸດ"
-
-
-
-
+ "ການແຈ້ງເຕືອນ"
+ "ການຕັ້ງຄ່າດ່ວນ"
"ຍ້າຍໄປຊ້າຍ/ເທິງ"
"ຍ້າຍໄປຂວາ/ລຸ່ມ"
diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml
index 95a7e86a9a..8b3d2ce587 100644
--- a/quickstep/res/values-lt/strings.xml
+++ b/quickstep/res/values-lt/strings.xml
@@ -102,10 +102,8 @@
"Atgal"
"IMRP perjungiklis"
"Naujausi"
-
-
-
-
+ "Pranešimai"
+ "Spartieji nustatymai"
"Perkelti aukštyn, kairėn"
"Perkelti žemyn, dešinėn"
diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml
index f3de0b7f5c..99a71fbb4e 100644
--- a/quickstep/res/values-lv/strings.xml
+++ b/quickstep/res/values-lv/strings.xml
@@ -102,10 +102,8 @@
"Atpakaļ"
"IME pārslēdzējs"
"Nesenie"
-
-
-
-
+ "Paziņojumi"
+ "Ātrie iestatīj."
"Pārvietot uz augšējo/kreiso stūri"
"Pārvietot uz apakšējo/labo stūri"
diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml
index d09165aa02..ef6052e492 100644
--- a/quickstep/res/values-my/strings.xml
+++ b/quickstep/res/values-my/strings.xml
@@ -102,10 +102,8 @@
"နောက်သို့"
"IME ပြောင်းစနစ်"
"လတ်တလောများ"
-
-
-
-
+ "အကြောင်းကြားချက်"
+ "အမြန်ဆက်တင်များ"
"အပေါ်/ဘယ်ဘက်သို့ ရွှေ့ရန်"
"အောက်ခြေ/ညာဘက်သို့ ရွှေ့ရန်"
diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml
index 6d143bdc7f..a81c779533 100644
--- a/quickstep/res/values-nb/strings.xml
+++ b/quickstep/res/values-nb/strings.xml
@@ -102,10 +102,8 @@
"Tilbake"
"IME-veksler"
"Nylige"
-
-
-
-
+ "Varsler"
+ "Hurtiginnst."
"Flytt til øverst/venstre"
"Flytt til nederst/høyre"
diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml
index cd3383b5fe..3c5d64fa24 100644
--- a/quickstep/res/values-ne/strings.xml
+++ b/quickstep/res/values-ne/strings.xml
@@ -102,10 +102,8 @@
"पछाडि जानुहोस्"
"IME स्विचर"
"हालसालैका बटनहरू"
-
-
-
-
+ "सूचनाहरू"
+ "द्रुत सेटिङ"
"सिरान/बायाँतिर सार्नुहोस्"
"फेद/दायाँतिर सार्नुहोस्"
diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml
index 77407833f3..0d2306405c 100644
--- a/quickstep/res/values-or/strings.xml
+++ b/quickstep/res/values-or/strings.xml
@@ -102,10 +102,8 @@
"ପଛକୁ ଫେରନ୍ତୁ"
"IME ସ୍ୱିଚର"
"ବର୍ତ୍ତମାନର"
-
-
-
-
+ "ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"
+ "କ୍ୱିକ ସେଟିଂସ"
"ଶୀର୍ଷ/ବାମକୁ ମୁଭ କରନ୍ତୁ"
"ନିମ୍ନ/ଡାହାଣକୁ ମୁଭ କରନ୍ତୁ"
diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml
index 990017e0ce..3c15a851c7 100644
--- a/quickstep/res/values-si/strings.xml
+++ b/quickstep/res/values-si/strings.xml
@@ -102,10 +102,8 @@
"ආපසු"
"IME මාරුව"
"මෑත"
-
-
-
-
+ "දැනුම්දීම්"
+ "ඉක්මන් සැකසීම්"
"ඉහළ/වම වෙත ගෙන යන්න"
"පහළ/දකුණ වෙත ගෙන යන්න"
diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml
index a18f72ca6d..155da05c18 100644
--- a/quickstep/res/values-sk/strings.xml
+++ b/quickstep/res/values-sk/strings.xml
@@ -102,10 +102,8 @@
"Späť"
"Prepínač IME"
"Nedávne"
-
-
-
-
+ "Upozornenia"
+ "Rýchle nastavenia"
"Presunúť hore alebo doľava"
"Presunúť dole alebo doprava"
diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml
index f2b2fa8520..999768c230 100644
--- a/quickstep/res/values-sq/strings.xml
+++ b/quickstep/res/values-sq/strings.xml
@@ -102,10 +102,8 @@
"Pas"
"Çelësi IME"
"Të fundit"
-
-
-
-
+ "Njoftimet"
+ "Cilësimet shpejt"
"Lëviz në krye/majtas"
"Lëviz në fund/djathtas"
diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml
index 2f1b75af4e..49f20c08c9 100644
--- a/quickstep/res/values-sv/strings.xml
+++ b/quickstep/res/values-sv/strings.xml
@@ -102,10 +102,8 @@
"Tillbaka"
"IME-väljare"
"Senaste"
-
-
-
-
+ "Aviseringar"
+ "Snabbinställn."
"Flytta högst upp/till vänster"
"Flytta längst ned/till höger"
diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml
index 3ecae96b30..71b01b6cc0 100644
--- a/quickstep/res/values-tl/strings.xml
+++ b/quickstep/res/values-tl/strings.xml
@@ -102,10 +102,8 @@
"Bumalik"
"IME switcher"
"Mga Kamakailan"
-
-
-
-
+ "Mga Notification"
+ "Quick Settings"
"Ilipat sa itaas/kaliwa"
"Ilipat sa ibaba/kanan"
diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml
index 19ced47d01..5e9a84b39b 100644
--- a/quickstep/res/values-tr/strings.xml
+++ b/quickstep/res/values-tr/strings.xml
@@ -102,10 +102,8 @@
"Geri"
"IME değiştirici"
"Son Kullanılanlar"
-
-
-
-
+ "Bildirimler"
+ "Hızlı Ayarlar"
"Sol üste taşı"
"Sağ alta taşı"
diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml
index 231d128aca..2e0d3f7dd2 100644
--- a/quickstep/res/values-uk/strings.xml
+++ b/quickstep/res/values-uk/strings.xml
@@ -102,10 +102,8 @@
"Назад"
"Перемикач IME"
"Нещодавні"
-
-
-
-
+ "Сповіщення"
+ "Швидкі налаштув."
"Перемістити вгору або вліво"
"Перемістити вниз або вправо"
diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml
index 1072c3a17a..e3c66988a6 100644
--- a/quickstep/res/values-vi/strings.xml
+++ b/quickstep/res/values-vi/strings.xml
@@ -102,10 +102,8 @@
"Quay lại"
"Trình chuyển đổi IME"
"Gần đây"
-
-
-
-
+ "Thông báo"
+ "Cài đặt nhanh"
"Chuyển lên trên cùng/sang bên trái"
"Chuyển xuống dưới cùng/sang bên phải"
diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml
index 4587d58778..a42476c836 100644
--- a/quickstep/res/values-zh-rCN/strings.xml
+++ b/quickstep/res/values-zh-rCN/strings.xml
@@ -102,10 +102,8 @@
"返回"
"IME 切换器"
"最近用过"
-
-
-
-
+ "通知"
+ "快捷设置"
"移到顶部/左侧"
"移到底部/右侧"
diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml
index 2810771d2f..f2fd5446cd 100644
--- a/quickstep/res/values-zh-rHK/strings.xml
+++ b/quickstep/res/values-zh-rHK/strings.xml
@@ -102,10 +102,8 @@
"返回"
"輸入法編輯器切換工具"
"最近"
-
-
-
-
+ "通知"
+ "快速設定"
"移至上方/左側"
"移至底部/右側"
diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml
index 847cb91507..f1fe624cee 100644
--- a/quickstep/res/values-zh-rTW/strings.xml
+++ b/quickstep/res/values-zh-rTW/strings.xml
@@ -102,10 +102,8 @@
"返回"
"輸入法編輯器切換器"
"最近使用"
-
-
-
-
+ "通知"
+ "快速設定"
"移到上方/左側"
"移到底部/右側"
diff --git a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
index d54b9e774b..3b02599ada 100644
--- a/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
+++ b/quickstep/src/com/android/launcher3/statehandlers/DepthController.java
@@ -23,6 +23,7 @@ import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTR
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ObjectAnimator;
+import android.app.WallpaperManager;
import android.os.IBinder;
import android.os.SystemProperties;
import android.util.FloatProperty;
@@ -42,7 +43,6 @@ import com.android.launcher3.anim.PendingAnimation;
import com.android.launcher3.statemanager.StateManager.StateHandler;
import com.android.launcher3.states.StateAnimationConfig;
import com.android.systemui.shared.system.BlurUtils;
-import com.android.systemui.shared.system.WallpaperManagerCompat;
import java.io.PrintWriter;
import java.util.function.Consumer;
@@ -127,7 +127,7 @@ public class DepthController implements StateHandler,
*/
private int mMaxBlurRadius;
private boolean mCrossWindowBlursEnabled;
- private WallpaperManagerCompat mWallpaperManager;
+ private WallpaperManager mWallpaperManager;
private SurfaceControl mSurface;
/**
* How visible the -1 overlay is, from 0 to 1.
@@ -168,7 +168,7 @@ public class DepthController implements StateHandler,
private void ensureDependencies() {
if (mWallpaperManager == null) {
mMaxBlurRadius = mLauncher.getResources().getInteger(R.integer.max_depth_blur_radius);
- mWallpaperManager = new WallpaperManagerCompat(mLauncher);
+ mWallpaperManager = mLauncher.getSystemService(WallpaperManager.class);
}
if (mLauncher.getRootView() != null && mOnAttachListener == null) {
diff --git a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
index 0f91aa2822..af53ae22d2 100644
--- a/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java
@@ -228,8 +228,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
* Whether the taskbar education should be shown.
*/
public boolean shouldShowEdu() {
- return FeatureFlags.ENABLE_TASKBAR_EDU.get()
- && !Utilities.IS_RUNNING_IN_TEST_HARNESS
+ return !Utilities.IS_RUNNING_IN_TEST_HARNESS
&& !mLauncher.getOnboardingPrefs().getBoolean(OnboardingPrefs.TASKBAR_EDU_SEEN);
}
@@ -237,10 +236,6 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
* Manually ends the taskbar education flow.
*/
public void hideEdu() {
- if (!FeatureFlags.ENABLE_TASKBAR_EDU.get()) {
- return;
- }
-
mControllers.taskbarEduController.hideEdu();
}
diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
index 7ab59b8d9b..e13fcf27f9 100644
--- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
@@ -237,6 +237,12 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
& Configuration.UI_MODE_NIGHT_MASK;
boolean isDarkTheme = mode == Configuration.UI_MODE_NIGHT_YES;
mTaskbarNavButtonDarkIntensity.updateValue(isDarkTheme ? 0 : 1);
+
+ if (mIsImeRenderingNavButtons) {
+ // Hide the back button while the IME is visible during SUW
+ mPropertyHolders.add(new StatePropertyHolder(mBackButton,
+ flags -> (flags & FLAG_IME_VISIBLE) == 0));
+ }
} else if (isInKidsMode) {
int iconSize = mContext.getResources().getDimensionPixelSize(
R.dimen.taskbar_icon_size_kids);
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index 435eae47ee..bffdf89d45 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -66,8 +66,6 @@ import com.android.launcher3.shortcuts.DeepShortcutView;
import com.android.launcher3.shortcuts.ShortcutDragPreviewProvider;
import com.android.launcher3.util.LauncherBindableItemsContainer;
import com.android.systemui.shared.recents.model.Task;
-import com.android.systemui.shared.system.ClipDescriptionCompat;
-import com.android.systemui.shared.system.LauncherAppsCompat;
import java.io.PrintWriter;
import java.util.Arrays;
@@ -315,13 +313,13 @@ public class TaskbarDragController extends DragController mAdditionalOffsetter;
private final StatefulActivity mActivity;
private final boolean mIsRtl;
private final Rect mOutline = new Rect();
@@ -81,9 +79,8 @@ public class FloatingTaskView extends FrameLayout {
}
private void init(StatefulActivity launcher, View originalView, @Nullable Bitmap thumbnail,
- Drawable icon, RectF positionOut, Consumer additionalOffsetter) {
+ Drawable icon, RectF positionOut) {
mStartingPosition = positionOut;
- mAdditionalOffsetter = additionalOffsetter;
updateInitialPositionForView(originalView);
final InsettableFrameLayout.LayoutParams lp =
(InsettableFrameLayout.LayoutParams) getLayoutParams();
@@ -113,15 +110,13 @@ public class FloatingTaskView extends FrameLayout {
* translation values from originalView will be used
*/
public static FloatingTaskView getFloatingTaskView(StatefulActivity launcher,
- View originalView, @Nullable Bitmap thumbnail, Drawable icon, RectF positionOut,
- @Nullable Consumer additionalOffsetter) {
+ View originalView, @Nullable Bitmap thumbnail, Drawable icon, RectF positionOut) {
final BaseDragLayer dragLayer = launcher.getDragLayer();
ViewGroup parent = (ViewGroup) dragLayer.getParent();
final FloatingTaskView floatingView = (FloatingTaskView) launcher.getLayoutInflater()
.inflate(R.layout.floating_split_select_view, parent, false);
- floatingView.init(launcher, originalView, thumbnail, icon, positionOut,
- additionalOffsetter);
+ floatingView.init(launcher, originalView, thumbnail, icon, positionOut);
parent.addView(floatingView);
return floatingView;
}
@@ -129,14 +124,8 @@ public class FloatingTaskView extends FrameLayout {
public void updateInitialPositionForView(View originalView) {
Rect viewBounds = new Rect(0, 0, originalView.getWidth(), originalView.getHeight());
Utilities.getBoundsForViewInDragLayer(mActivity.getDragLayer(), originalView, viewBounds,
- true /* ignoreTransform */, null /* recycle */,
+ false /* ignoreTransform */, null /* recycle */,
mStartingPosition);
- if (mAdditionalOffsetter != null) {
- mAdditionalOffsetter.accept(mStartingPosition);
- } else {
- mStartingPosition.offset(originalView.getTranslationX(),
- originalView.getTranslationY());
- }
final InsettableFrameLayout.LayoutParams lp = new InsettableFrameLayout.LayoutParams(
Math.round(mStartingPosition.width()),
Math.round(mStartingPosition.height()));
diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
index af9f818e4e..04af3c11ab 100644
--- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
+++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java
@@ -5,14 +5,17 @@ import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITIO
import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT;
import android.content.Context;
+import android.graphics.PointF;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.R;
+import com.android.launcher3.Utilities;
import com.android.launcher3.util.RunnableList;
import com.android.launcher3.util.SplitConfigurationOptions.StagedSplitBounds;
import com.android.launcher3.util.TransformingTouchDelegate;
@@ -52,7 +55,6 @@ public class GroupedTaskView extends TaskView {
@Nullable private StagedSplitBounds mSplitBoundsConfig;
private final DigitalWellBeingToast mDigitalWellBeingToast2;
-
public GroupedTaskView(Context context) {
this(context, null);
}
@@ -204,6 +206,20 @@ public class GroupedTaskView extends TaskView {
return new TaskThumbnailView[]{mSnapshotView, mSnapshotView2};
}
+ @Override
+ protected int getChildTaskIndexAtPosition(PointF position) {
+ if (isCoordInView(mIconView2, position) || isCoordInView(mSnapshotView2, position)) {
+ return 1;
+ }
+ return super.getChildTaskIndexAtPosition(position);
+ }
+
+ private boolean isCoordInView(View v, PointF position) {
+ float[] localPos = new float[]{position.x, position.y};
+ Utilities.mapCoordInSelfToDescendant(v, this, localPos);
+ return Utilities.pointInView(v, localPos[0], localPos[1], 0f /* slop */);
+ }
+
@Override
public void onRecycle() {
super.onRecycle();
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index a042bff67f..cb7e08a255 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -619,7 +619,7 @@ public abstract class RecentsView floatingTaskViewStartingPosition.offset(
- mSplitHiddenTaskView.getTranslationX(),
- mSplitHiddenTaskView.getTranslationY()
- ));
+ mSplitHiddenTaskView.getIconView().getDrawable(), startingTaskRect);
mFirstFloatingTaskView.setAlpha(1);
mFirstFloatingTaskView.addAnimation(anim, startingTaskRect,
mTempRect, true /*fadeWithThumbnail*/);
@@ -2741,7 +2737,7 @@ public abstract class RecentsView floatingTaskViewStartingPosition.offset(
- taskView.getTranslationX(),
- taskView.getTranslationY()
- ));
+ thumbnailView, thumbnailView.getThumbnail(),
+ iconView.getDrawable(), secondTaskStartingBounds);
mSecondFloatingTaskView.setAlpha(1);
mSecondFloatingTaskView.addAnimation(pendingAnimation, secondTaskStartingBounds,
- secondTaskEndingBounds, true /*fadeWithThumbnail*/);
+ secondTaskEndingBounds, true /* fadeWithThumbnail */);
pendingAnimation.addEndListener(aBoolean ->
- mSplitSelectStateController.setSecondTaskId(taskView.getTask().key.id,
+ mSplitSelectStateController.setSecondTaskId(task.key.id,
aBoolean1 -> RecentsView.this.resetFromSplitSelectionState()));
- mSecondSplitHiddenTaskView = taskView;
- taskView.setVisibility(INVISIBLE);
+ if (containerTaskView.containsMultipleTasks()) {
+ // If we are launching from a child task, then only hide the thumbnail itself
+ mSecondSplitHiddenView = thumbnailView;
+ } else {
+ mSecondSplitHiddenView = containerTaskView;
+ }
+ mSecondSplitHiddenView.setVisibility(INVISIBLE);
pendingAnimation.buildAnim().start();
}
@@ -4059,8 +4061,8 @@ public abstract class RecentsView callback.accept(true), MAIN_EXECUTOR.getHandler());
- opts.setLaunchDisplayId(getRootViewDisplayId());
+ opts.setLaunchDisplayId(
+ getDisplay() == null ? DEFAULT_DISPLAY : getDisplay().getDisplayId());
if (freezeTaskList) {
ActivityOptionsCompat.setFreezeRecentTasksList(opts);
}
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a0c784f1fb..1ddd6528f5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -103,7 +103,7 @@
"Ordner: %1$s, %2$d oder mehr Elemente"
"Hintergründe"
"Hintergrund & Stil"
- "Startbildschirm-Einstellungen"
+ "Einstellungen"
"Von deinem Administrator deaktiviert"
"Drehen des Startbildschirms zulassen"
"Beim Drehen des Smartphones"
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 62703ad2e0..caa9da7732 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -244,8 +244,7 @@ public class DeviceProfile {
isTablet = info.isTablet(windowBounds);
isPhone = !isTablet;
isTwoPanels = isTablet && useTwoPanels;
- isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS
- && FeatureFlags.ENABLE_TASKBAR.get();
+ isTaskbarPresent = isTablet && ApiWrapper.TASKBAR_DRAWN_IN_PROCESS;
// Some more constants.
context = getContext(context, info, isVerticalBarLayout() || (isTablet && isLandscape)
diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
index a949e11155..02c3fb5eb8 100644
--- a/src/com/android/launcher3/config/FeatureFlags.java
+++ b/src/com/android/launcher3/config/FeatureFlags.java
@@ -197,12 +197,6 @@ public final class FeatureFlags {
"ENABLE_APP_PREDICTIONS_WHILE_VISIBLE", true, "Allows app "
+ "predictions to be updated while they are visible to the user.");
- public static final BooleanFlag ENABLE_TASKBAR = getDebugFlag(
- "ENABLE_TASKBAR", true, "Allows a system Taskbar to be shown on larger devices.");
-
- public static final BooleanFlag ENABLE_TASKBAR_EDU = getDebugFlag("ENABLE_TASKBAR_EDU", true,
- "Enables showing taskbar education the first time an app is opened.");
-
public static final BooleanFlag ENABLE_TASKBAR_POPUP_MENU = getDebugFlag(
"ENABLE_TASKBAR_POPUP_MENU", true, "Enables long pressing taskbar icons to show the"
+ " popup menu.");
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
index 05d6fc6c15..2fa7945a20 100644
--- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java
+++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java
@@ -508,7 +508,9 @@ public class PopupContainerWithArrow
@Override
protected void closeComplete() {
super.closeComplete();
- mActivityContext.getDragController().removeDragListener(this);
+ if (mActivityContext.getDragController() != null) {
+ mActivityContext.getDragController().removeDragListener(this);
+ }
PopupContainerWithArrow openPopup = getOpen(mActivityContext);
if (openPopup == null || openPopup.mOriginalIcon != mOriginalIcon) {
mOriginalIcon.setTextVisibility(mOriginalIcon.shouldTextBeVisible());
diff --git a/tests/Android.bp b/tests/Android.bp
index c2c545bcb4..7542d04f7b 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -67,7 +67,8 @@ android_library {
"androidx.test.uiautomator_uiautomator",
"mockito-target-inline-minus-junit4",
"launcher_log_protos_lite",
- "truth-prebuilt"
+ "truth-prebuilt",
+ "platform-test-rules",
],
manifest: "AndroidManifest-common.xml",
platform_apis: true,