From 38478e74f91bae2e3cb519eef98a651ad02fd7c0 Mon Sep 17 00:00:00 2001 From: Jagrut Desai Date: Fri, 31 May 2024 11:43:55 -0700 Subject: [PATCH 1/9] Make Taskbar Divider PopUp Menu Width Dynamic Test: Manual Bug: 327647761 Flag: com.android.launcher3.enable_taskbar_pinning Change-Id: Ib5c13324afee46b45b2c71e3af86c15a6384a278 --- quickstep/res/layout/taskbar_divider_popup_menu.xml | 5 +++-- .../com/android/launcher3/taskbar/TaskbarDividerPopupView.kt | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/quickstep/res/layout/taskbar_divider_popup_menu.xml b/quickstep/res/layout/taskbar_divider_popup_menu.xml index 7f4f76c1e9..676da15828 100644 --- a/quickstep/res/layout/taskbar_divider_popup_menu.xml +++ b/quickstep/res/layout/taskbar_divider_popup_menu.xml @@ -16,8 +16,9 @@ --> @@ -55,10 +56,10 @@ android:gravity="start|center_vertical" android:textAlignment="viewStart" android:paddingStart="12dp" + android:switchPadding="12dp" android:layout_weight="1" android:fontFamily="@*android:string/config_bodyFontFamilyMedium" android:lines="1" - android:ellipsize="end" android:textSize="14sp" android:textColor="?android:attr/textColorPrimary" android:text="@string/always_show_taskbar" /> diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt b/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt index 12f1e638c2..10103d8f9d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDividerPopupView.kt @@ -69,8 +69,6 @@ constructor( private lateinit var dividerView: View - private val menuWidth = - resources.getDimensionPixelSize(R.dimen.taskbar_pinning_popup_menu_width) private val popupCornerRadius = Themes.getDialogCornerRadius(context) private val arrowWidth = resources.getDimension(R.dimen.popup_arrow_width) private val arrowHeight = resources.getDimension(R.dimen.popup_arrow_height) @@ -125,7 +123,7 @@ constructor( /** Orient object as usual and then center object horizontally. */ override fun orientAboutObject() { super.orientAboutObject() - x = mTempRect.centerX() - menuWidth / 2f + x = mTempRect.centerX() - measuredWidth / 2f } override fun onControllerInterceptTouchEvent(ev: MotionEvent?): Boolean { From ee5867e98054b9564b8a8a19981b38bd9074b998 Mon Sep 17 00:00:00 2001 From: Liam Lee Pong Lam Date: Mon, 3 Jun 2024 19:00:14 +0000 Subject: [PATCH 2/9] Revert "[Launcher3] Hide keyboard when fastscroller scrolling down and keyboard" This reverts commit 883a79db715258e92b738357771078548920df65. Reason for revert: Revert this change because it caused other bug b/343285163 Change-Id: I1fdb21cc4a5cdcf2c22e9b1927753b290626289c --- .../views/RecyclerViewFastScroller.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/com/android/launcher3/views/RecyclerViewFastScroller.java b/src/com/android/launcher3/views/RecyclerViewFastScroller.java index cdbd0c0be7..df8f635525 100644 --- a/src/com/android/launcher3/views/RecyclerViewFastScroller.java +++ b/src/com/android/launcher3/views/RecyclerViewFastScroller.java @@ -109,13 +109,6 @@ public class RecyclerViewFastScroller extends View { private float mLastTouchY; private boolean mIsDragging; - /** - * Tracks whether a keyboard hide request has been sent due to downward scrolling. - *

- * Set to true when scrolling down and reset when scrolling up to prevents redundant hide - * requests during continuous downward scrolls. - */ - private boolean mRequestedHideKeyboard; private boolean mIsThumbDetached; private final boolean mCanThumbDetach; private boolean mIgnoreDragGesture; @@ -248,7 +241,6 @@ public class RecyclerViewFastScroller extends View { public boolean handleTouchEvent(MotionEvent ev, Point offset) { int x = (int) ev.getX() - offset.x; int y = (int) ev.getY() - offset.y; - ActivityContext activityContext = ActivityContext.lookupContext(getContext()); switch (ev.getAction()) { case MotionEvent.ACTION_DOWN: @@ -256,7 +248,6 @@ public class RecyclerViewFastScroller extends View { mDownX = x; mDownY = mLastY = y; mDownTimeStampMillis = ev.getDownTime(); - mRequestedHideKeyboard = false; if ((Math.abs(mDy) < mDeltaThreshold && mRv.getScrollState() != SCROLL_STATE_IDLE)) { @@ -269,15 +260,6 @@ public class RecyclerViewFastScroller extends View { } break; case MotionEvent.ACTION_MOVE: - if (y > mLastY) { - if (!mRequestedHideKeyboard) { - activityContext.hideKeyboard(); - } - mRequestedHideKeyboard = true; - } else { - mRequestedHideKeyboard = false; - } - mLastY = y; int absDeltaY = Math.abs(y - mDownY); int absDeltaX = Math.abs(x - mDownX); @@ -312,6 +294,7 @@ public class RecyclerViewFastScroller extends View { } private void calcTouchOffsetAndPrepToFastScroll(int downY, int lastY) { + ActivityContext.lookupContext(getContext()).hideKeyboard(); mIsDragging = true; if (mCanThumbDetach) { mIsThumbDetached = true; From 018074351c1579653b7454a4f1c332aae19cb674 Mon Sep 17 00:00:00 2001 From: Fengjiang Li Date: Mon, 3 Jun 2024 12:58:34 -0700 Subject: [PATCH 3/9] Animate -1 to recents Fix: 343770316 Test: manual - record a video Flag: com.android.launcher3.use_activity_overlay Change-Id: I74346f060ea93dbc8fc0a1c3290d4996d89ec062 --- .../src/com/android/quickstep/LauncherActivityInterface.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java index 811b9fd4cd..08c2e1ca29 100644 --- a/quickstep/src/com/android/quickstep/LauncherActivityInterface.java +++ b/quickstep/src/com/android/quickstep/LauncherActivityInterface.java @@ -308,7 +308,8 @@ public final class LauncherActivityInterface extends return; } LauncherOverlayManager om = launcher.getOverlayManager(); - if (!launcher.isStarted() || launcher.isForceInvisible()) { + if (!SystemUiProxy.INSTANCE.get(launcher).getHomeVisibilityState().isHomeVisible() + || launcher.isForceInvisible()) { om.hideOverlay(false /* animate */); } else { om.hideOverlay(150); From 4ff619a6109850c888feeb435ca837d7eba12fca Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 3 Jun 2024 18:20:15 -0700 Subject: [PATCH 4/9] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I4e0f4e61a5e6957bd6d52ede541d1dfe0523ab74 --- res/values-af/strings.xml | 2 ++ res/values-am/strings.xml | 2 ++ res/values-ar/strings.xml | 2 ++ res/values-as/strings.xml | 2 ++ res/values-az/strings.xml | 2 ++ res/values-b+sr+Latn/strings.xml | 1 + res/values-be/strings.xml | 2 ++ res/values-bg/strings.xml | 2 ++ res/values-bn/strings.xml | 2 ++ res/values-bs/strings.xml | 2 ++ res/values-ca/strings.xml | 2 ++ res/values-cs/strings.xml | 2 ++ res/values-da/strings.xml | 2 ++ res/values-de/strings.xml | 2 ++ res/values-el/strings.xml | 2 ++ res/values-en-rAU/strings.xml | 2 ++ res/values-en-rCA/strings.xml | 1 + res/values-en-rGB/strings.xml | 2 ++ res/values-en-rIN/strings.xml | 2 ++ res/values-en-rXC/strings.xml | 1 + res/values-es-rUS/strings.xml | 2 ++ res/values-es/strings.xml | 2 ++ res/values-et/strings.xml | 1 + res/values-eu/strings.xml | 2 ++ res/values-fa/strings.xml | 2 ++ res/values-fi/strings.xml | 2 ++ res/values-fr-rCA/strings.xml | 2 ++ res/values-fr/strings.xml | 2 ++ res/values-gl/strings.xml | 2 ++ res/values-gu/strings.xml | 2 ++ res/values-hi/strings.xml | 2 ++ res/values-hr/strings.xml | 2 ++ res/values-hu/strings.xml | 2 ++ res/values-hy/strings.xml | 2 ++ res/values-in/strings.xml | 2 ++ res/values-is/strings.xml | 2 ++ res/values-it/strings.xml | 2 ++ res/values-iw/strings.xml | 2 ++ res/values-ja/strings.xml | 1 + res/values-ka/strings.xml | 1 + res/values-kk/strings.xml | 2 ++ res/values-km/strings.xml | 2 ++ res/values-kn/strings.xml | 2 ++ res/values-ko/strings.xml | 2 ++ res/values-ky/strings.xml | 2 ++ res/values-lo/strings.xml | 2 ++ res/values-lt/strings.xml | 1 + res/values-lv/strings.xml | 2 ++ res/values-mk/strings.xml | 2 ++ res/values-ml/strings.xml | 2 ++ res/values-mn/strings.xml | 2 ++ res/values-mr/strings.xml | 1 + res/values-ms/strings.xml | 2 ++ res/values-my/strings.xml | 1 + res/values-nb/strings.xml | 2 ++ res/values-ne/strings.xml | 2 ++ res/values-nl/strings.xml | 2 ++ res/values-or/strings.xml | 2 ++ res/values-pa/strings.xml | 4 +++- res/values-pl/strings.xml | 2 ++ res/values-pt-rPT/strings.xml | 1 + res/values-pt/strings.xml | 2 ++ res/values-ro/strings.xml | 2 ++ res/values-ru/strings.xml | 2 ++ res/values-si/strings.xml | 2 ++ res/values-sk/strings.xml | 2 ++ res/values-sl/strings.xml | 1 + res/values-sq/strings.xml | 2 ++ res/values-sr/strings.xml | 1 + res/values-sv/strings.xml | 2 ++ res/values-sw/strings.xml | 2 ++ res/values-ta/strings.xml | 5 +++-- res/values-te/strings.xml | 4 +++- res/values-th/strings.xml | 2 ++ res/values-tl/strings.xml | 2 ++ res/values-tr/strings.xml | 2 ++ res/values-uk/strings.xml | 2 ++ res/values-ur/strings.xml | 2 ++ res/values-uz/strings.xml | 2 ++ res/values-vi/strings.xml | 2 ++ res/values-zh-rCN/strings.xml | 2 ++ res/values-zh-rHK/strings.xml | 2 ++ res/values-zh-rTW/strings.xml | 2 ++ res/values-zu/strings.xml | 4 +++- 84 files changed, 160 insertions(+), 5 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 1d333fde88..e18d9cd18f 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -29,6 +29,8 @@ "Tuis" "Verdeelde skerm" "Programinligting vir %1$s" + + "Stoor apppaar" "%1$s | %2$s" "Hierdie apppaar word nie op hierdie toestel gesteun nie" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index f57812e46c..39dbfef8dc 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -29,6 +29,8 @@ "መነሻ" "የተከፈለ ማያ ገፅ" "የመተግበሪያ መረጃ ለ%1$s" + + "የመተግበሪያ ጥምረትን ያስቀምጡ" "%1$s | %2$s" "ይህ የመተግበሪያ ጥምረት በዚህ መሣሪያ ላይ አይደገፍም" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index e6f8d4aa87..1143042949 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -29,6 +29,8 @@ "الشاشة الرئيسية" "تقسيم الشاشة" "‏معلومات تطبيق %1$s" + + "حفظ استخدام التطبيقين معًا" "%1$s | ‏%2$s" "لا يمكن استخدام هذين التطبيقَين في الوقت نفسه على هذا الجهاز" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index 54cc638dce..ed4bb975ae 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -29,6 +29,8 @@ "গৃহ স্ক্ৰীন" "বিভাজিত স্ক্ৰীন" "%1$sৰ বাবে এপৰ তথ্য" + + "এপৰ পেয়াৰ ছেভ কৰক" "%1$s | %2$s" "এই ডিভাইচটোত এই এপ্‌ পেয়াৰ কৰাৰ সুবিধাটো সমৰ্থিত নহয়" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 2f71bbdfa7..e8273423af 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -29,6 +29,8 @@ "Əsas səhifə" "Ekran bölünməsi" "%1$s ilə bağlı tətbiq məlumatı" + + "Tətbiq cütünü saxlayın" "%1$s | %2$s" "Bu tətbiq cütü bu cihazda dəstəklənmir" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 7858529ece..30ba09ce2b 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -29,6 +29,7 @@ "Početni ekran" "Podeljeni ekran" "Informacije o aplikaciji za: %1$s" + "Podešavanja potrošnje za %1$s" "Sačuvaj par aplikacija" "%1$s | %2$s" "Ovaj par aplikacija nije podržan na ovom uređaju" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index c3359c8172..3ece170259 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -29,6 +29,8 @@ "Галоўны экран" "Падзелены экран" "Інфармацыя пра праграму для: %1$s" + + "Захаваць спалучэнне праграм" "%1$s | %2$s" "Дадзенае спалучэнне праграм не падтрымліваецца на гэтай прыладзе" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 26044e75e8..4d23773c3c 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -29,6 +29,8 @@ "Начален екран" "Разделен екран" "Информация за приложението за %1$s" + + "Запазване на двойката приложения" "%1$s | %2$s" "Тази двойка приложения не се поддържа на устройството" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index a159bd9d76..83f4ba1ac8 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -29,6 +29,8 @@ "হোম" "স্প্লিট স্ক্রিন" "%1$s-এর জন্য অ্যাপ সম্পর্কিত তথ্য" + + "অ্যাপ পেয়ার সেভ করুন" "%1$s | %2$s" "এই ডিভাইসে এই অ্যাপ পেয়ারটি কাজ করে না" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 8b2e821c76..2c5e22a601 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -29,6 +29,8 @@ "Početni ekran" "Podijeljeni ekran" "Informacije o aplikaciji %1$s" + + "Sačuvaj par aplikacija" "%1$s | %2$s" "Par aplikacija nije podržan na uređaju" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index c621b1cc55..f275e49ee9 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -29,6 +29,8 @@ "Inici" "Pantalla dividida" "Informació de l\'aplicació %1$s" + + "Desa la parella d\'aplicacions" "%1$s | %2$s" "Aquesta parella d\'aplicacions no s\'admet en aquest dispositiu" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8b2e71672d..c499a9a00a 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -29,6 +29,8 @@ "Domů" "Rozdělit obrazovku" "Informace o aplikaci %1$s" + + "Uložit dvojici aplikací" "%1$s | %2$s" "Tento pár aplikací není na tomto zařízení podporován" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index b41344083d..f2c08fafbd 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -29,6 +29,8 @@ "Startskærm" "Opdel skærm" "Appinfo for %1$s" + + "Gem appsammenknytning" "%1$s | %2$s" "Denne appsammenknytning understøttes ikke på enheden" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 42e3bacadc..f5ecf59e19 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -29,6 +29,8 @@ "Startbildschirm" "Splitscreen" "App-Info für %1$s" + + "App-Paar speichern" "%1$s | %2$s" "Dieses App-Paar wird auf diesem Gerät nicht unterstützt" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 4eac9caf9d..1c4700a86e 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -29,6 +29,8 @@ "Αρχική οθόνη" "Διαχωρισμός οθόνης" "Πληροφορίες εφαρμογής για %1$s" + + "Αποθήκευση ζεύγους εφαρμογών" "%1$s | %2$s" "Αυτό το ζεύγος εφαρμογών δεν υποστηρίζεται σε αυτή τη συσκευή" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 7c78fc7d40..27bcb658ae 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -29,6 +29,8 @@ "Home" "Split screen" "App info for %1$s" + + "Save app pair" "%1$s | %2$s" "This app pair isn\'t supported on this device" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index e6a7ea157a..f672a827d5 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -29,6 +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" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 7c78fc7d40..27bcb658ae 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -29,6 +29,8 @@ "Home" "Split screen" "App info for %1$s" + + "Save app pair" "%1$s | %2$s" "This app pair isn\'t supported on this device" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 7c78fc7d40..27bcb658ae 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -29,6 +29,8 @@ "Home" "Split screen" "App info for %1$s" + + "Save app pair" "%1$s | %2$s" "This app pair isn\'t supported on this device" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 13616d6a57..706c65c525 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -29,6 +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‎‏‎‎‏‎" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 71a48cb324..3ba7ece050 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -29,6 +29,8 @@ "Pantalla principal" "Pantalla dividida" "Información de la app de %1$s" + + "Guardar vinculación" "%1$s | %2$s" "No se admite esta vinculación de apps en este dispositivo" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index b5208bd504..7309e58e6f 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -29,6 +29,8 @@ "Inicio" "Pantalla dividida" "Información de la aplicación %1$s" + + "Guardar apps emparejadas" "%1$s | %2$s" "El dispositivo no admite esta aplicación emparejada" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 20a99d3e51..13500b593b 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -29,6 +29,7 @@ "Avakuva" "Jagatud ekraanikuva" "Rakenduse teave: %1$s" + "Kasutuse seaded: %1$s" "Salvesta rakendusepaar" "%1$s | %2$s" "See rakendusepaar ei ole selles seadmes toetatud" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index a477580bde..d1ff4347aa 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -29,6 +29,8 @@ "Orri nagusia" "Pantaila zatitzea" "%1$s aplikazioari buruzko informazioa" + + "Gorde aplikazio parea" "%1$s | %2$s" "Aplikazio pare hori ez da onartzen gailu honetan" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index bdf4736cec..367945b13c 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -29,6 +29,8 @@ "صفحه اصلی" "صفحهٔ دونیمه" "‏اطلاعات برنامه %1$s" + + "ذخیره جفت برنامه" "%1$s | %2$s" "از این جفت برنامه در این دستگاه پشتیبانی نمی‌شود" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index e934044c0a..5f7df00ceb 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -29,6 +29,8 @@ "Etusivu" "Jaettu näyttö" "Sovellustiedot: %1$s" + + "Tallenna sovelluspari" "%1$s | %2$s" "Sovellusparia ei tueta tällä laitteella" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 4372caa75a..9775dbcc5a 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -29,6 +29,8 @@ "Accueil" "Écran divisé" "Renseignements sur l\'appli pour %1$s" + + "Enr. paire d\'applis" "%1$s | %2$s" "Cette paire d\'applications n\'est pas prise en charge sur cet appareil" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 841fc84d77..53a30d317d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -29,6 +29,8 @@ "Accueil" "Écran partagé" "Infos sur l\'appli 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" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 83fcbcd8d6..d651692509 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -29,6 +29,8 @@ "Inicio" "Pantalla dividida" "Información da aplicación para %1$s" + + "Gardar parella de apps" "%1$s | %2$s" "O dispositivo non admite este emparellamento de aplicacións" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 963c6d109b..89291bda88 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -29,6 +29,8 @@ "હોમ સ્ક્રીન" "સ્ક્રીનને વિભાજિત કરો" "%1$s માટે ઍપ માહિતી" + + "ઍપની જોડી સાચવો" "%1$s | %2$s" "આ ડિવાઇસ પર, આ ઍપની જોડીને સપોર્ટ આપવામાં આવતો નથી" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index f2ac2e8526..d70bf08edf 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -29,6 +29,8 @@ "होम स्क्रीन" "स्प्लिट स्क्रीन" "%1$s के लिए ऐप्लिकेशन की जानकारी" + + "ऐप पेयर सेव करें" "%1$s | %2$s" "साथ में इस्तेमाल किए जा सकने वाले ये ऐप्लिकेशन, इस डिवाइस पर काम नहीं कर सकते" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index fec8e2893f..19658f6dd1 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -29,6 +29,8 @@ "Početni zaslon" "Podijeljeni zaslon" "Informacije o aplikaciji %1$s" + + "Spremi par aplikacija" "%1$s | %2$s" "Taj par aplikacija nije podržan na ovom uređaju" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index f69e1fb872..96e4981246 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -29,6 +29,8 @@ "Kezdőképernyő" "Osztott képernyő" "Alkalmazásinformáció a következőhöz: %1$s" + + "Alkalmazáspár mentése" "%1$s | %2$s" "Ezt az alkalmazáspárt nem támogatja az eszköz" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 7e220bf2b2..e2b6d34235 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -29,6 +29,8 @@ "Հիմնական էկրան" "Տրոհել էկրանը" "Տեղեկություններ %1$s հավելվածի մասին" + + "Պահել հավելվ. զույգը" "%1$s | %2$s" "Հավելվածների զույգը չի աջակցվում այս սարքում" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index fc81717371..a86380e5da 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -29,6 +29,8 @@ "Layar utama" "Layar terpisah" "Info aplikasi untuk %1$s" + + "Simpan pasangan aplikasi" "%1$s | %2$s" "Pasangan aplikasi ini tidak didukung di perangkat ini" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 5339b9391e..d903d1ae20 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -29,6 +29,8 @@ "Heim" "Skipta skjá" "Upplýsingar um forrit fyrir %1$s" + + "Vista forritapar" "%1$s | %2$s" "Þetta forritapar er ekki stutt í þessu tæki" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 5ef0145e33..3895409034 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -29,6 +29,8 @@ "Home" "Schermo diviso" "Informazioni sull\'app %1$s" + + "Salva coppia di app" "%1$s | %2$s" "Questa coppia di app non è supportata su questo dispositivo" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 0d18cdf94f..aea1fa65b1 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -29,6 +29,8 @@ "בית" "מסך מפוצל" "‏פרטים על האפליקציה %1$s" + + "שמירת צמד אפליקציות" "%1$s | %2$s" "צמד האפליקציות הזה לא נתמך במכשיר הזה" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 163afd4318..c349e546b3 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -29,6 +29,7 @@ "ホーム" "分割画面" "%1$s のアプリ情報" + "%1$s の使用設定" "アプリのペア設定を保存" "%1$s | %2$s" "このデバイスは、このアプリのペア設定に対応していません" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index d7157e9ac9..fecd50e19b 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -29,6 +29,7 @@ "მთავარი გვერდი" "ეკრანის გაყოფა" "%1$s-ის აპის ინფო" + "გამოყენების პარამეტრები %1$s-ისთვის" "აპთა წყვილის შენახვა" "%1$s | %2$s" "ამ მოწყობილობაზე აღნიშნული აპთა წყვილი არ არის მხარდაჭერილი" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index c53cd033da..f3aa5f67e7 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -29,6 +29,8 @@ "Негізгі экран" "Экранды бөлу" "%1$s қолданбасы туралы ақпарат" + + "Қолданбаларды жұптау әрекетін сақтау" "%1$s | %2$s" "Бұл құрылғы қолданбаларды жұптау функциясын қолдамайды." diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index f0c9fd9be8..1f73d4c25d 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -29,6 +29,8 @@ "អេក្រង់ដើម" "មុខងារ​បំបែកអេក្រង់" "ព័ត៌មានកម្មវិធី​សម្រាប់ %1$s" + + "រក្សាទុកគូកម្មវិធី" "%1$s | %2$s" "មិនអាចប្រើគូកម្មវិធីនេះនៅលើឧបករណ៍នេះបានទេ" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 9a81382e8e..309a1fb431 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -29,6 +29,8 @@ "ಹೋಮ್" "ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್" "%1$s ಗಾಗಿ ಆ್ಯಪ್ ಮಾಹಿತಿ" + + "ಆ್ಯಪ್ ಪೇರ್ ಸೇವ್ ಮಾಡಿ" "%1$s | %2$s" "ಈ ಆ್ಯಪ್ ಜೋಡಿಯು ಈ ಸಾಧನದಲ್ಲಿ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 6ff9d90fb7..cfc04ef4a7 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -29,6 +29,8 @@ "홈" "화면 분할" "%1$s 앱 정보" + + "앱 페어링 저장" "%1$s | %2$s" "이 앱 페어링은 이 기기에서 지원되지 않습니다" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 44ef72015d..96446e88a1 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -29,6 +29,8 @@ "Башкы экран" "Экранды бөлүү" "%1$s колдонмосу жөнүндө маалымат" + + "Колдонмолорду сактап коюу" "%1$s | %2$s" "Бул эки колдонмону бул түзмөктө бир маалда пайдаланууга болбойт" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index f8ecb7eb9c..708a2f3562 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -29,6 +29,8 @@ "ໂຮມສະກຣີນ" "ແບ່ງໜ້າຈໍ" "ຂໍ້ມູນແອັບສຳລັບ %1$s" + + "ບັນທຶກຈັບຄູ່ແອັບ" "%1$s | %2$s" "ການຈັບຄູ່ແອັບນີ້ບໍ່ຮອງຮັບຢູ່ອຸປະກອນນີ້" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index b851d5539d..bc33bd8efd 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -29,6 +29,7 @@ "Pagrindinis" "Išskaidyto ekrano režimas" "Programos „%1$s“ informacija" + "„%1$s“ naudojimo nustatymai" "Išsaugoti programų porą" "%1$s | %2$s" "Ši programų pora šiame įrenginyje nepalaikoma" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 2c1ec75e53..7dbe5facaa 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -29,6 +29,8 @@ "Sākums" "Sadalīt ekrānu" "%1$s: informācija par lietotni" + + "Saglabāt lietotņu pāri" "%1$s | %2$s" "Šis lietotņu pāris netiek atbalstīts šajā ierīcē" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index b87c2ce7c4..18849e9ce1 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -29,6 +29,8 @@ "Почетен екран" "Поделен екран" "Податоци за апликација за %1$s" + + "Зачувај го парот апликации" "%1$s | %2$s" "Паров апликации не е поддржан на уредов" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index beb2f6f8c8..529cc8d53e 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -29,6 +29,8 @@ "ഹോം" "സ്‌ക്രീൻ വിഭജന മോഡ്" "%1$s എന്നതിന്റെ ആപ്പ് വിവരങ്ങൾ" + + "ആപ്പ് ജോടി സംരക്ഷിക്കുക" "%1$s | %2$s" "ഈ ഉപകരണത്തിൽ ഈ ആപ്പ് ജോടിക്ക് പിന്തുണയില്ല" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 7b4bce7bf6..21c8ad15b2 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -29,6 +29,8 @@ "Нүүр" "Дэлгэцийг хуваах" "%1$s-н аппын мэдээлэл" + + "Апп хослуулалтыг хадгалах" "%1$s | %2$s" "Энэ апп хослуулалтыг уг төхөөрөмж дээр дэмждэггүй" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 8adb240021..1badd2124f 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -29,6 +29,7 @@ "होम" "स्प्लिट स्क्रीन" "%1$s साठी ॲपशी संबंधित माहिती" + "%1$s साठी वापरासंबंधित सेटिंग्ज" "ॲपची जोडी सेव्ह करा" "%1$s | %2$s" "या ॲपची जोडीला या डिव्हाइसवर सपोर्ट नाही" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index f194bc1483..270ebf0b68 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -29,6 +29,8 @@ "Rumah" "Skrin pisah" "Maklumat apl untuk %1$s" + + "Simpan gandingan apl" "%1$s | %2$s" "Gandingan apl ini tidak disokong pada peranti ini" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 7dc3b5ac11..cec9b1b76c 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -29,6 +29,7 @@ "ပင်မစာမျက်နှာ" "မျက်နှာပြင် ခွဲ၍ပြသခြင်း" "%1$s အတွက် အက်ပ်အချက်အလက်" + "%1$s အတွက် အသုံးပြုမှုဆက်တင်များ" "အက်ပ်တွဲချိတ်ခြင်း သိမ်းရန်" "%1$s | %2$s" "ဤအက်ပ်တွဲချိတ်ခြင်းကို ဤစက်တွင် ပံ့ပိုးမထားပါ" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 856ce9f260..392cf45721 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -29,6 +29,8 @@ "Startskjerm" "Delt skjerm" "Appinformasjon for %1$s" + + "Lagre apptilkoblingen" "%1$s | %2$s" "Denne apptilkoblingen støttes ikke på denne enheten" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 2197a8b6d2..f5a16ee257 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -29,6 +29,8 @@ "होम" "स्प्लिट स्क्रिन" "%1$s का हकमा एपसम्बन्धी जानकारी" + + "एपको पेयर सेभ गर्नुहोस्" "%1$s | %2$s" "यस डिभाइसमा यो एप पेयर प्रयोग गर्न मिल्दैन" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index bd4508cf5d..176fbc9bc9 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -29,6 +29,8 @@ "Startscherm" "Gesplitst scherm" "App-info voor %1$s" + + "App-paar opslaan" "%1$s | %2$s" "Dit app-paar wordt niet ondersteund op dit apparaat" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index e2035a291d..db656a6a0f 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -29,6 +29,8 @@ "ହୋମ" "ସ୍କ୍ରିନ‌କୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ" "%1$s ପାଇଁ ଆପ ସୂଚନା" + + "ଆପ ପେୟାର ସେଭ କରନ୍ତୁ" "%1$s | %2$s" "ଏହି ଆପ ପେୟାର ଏ ଡିଭାଇସରେ ସମର୍ଥିତ ନୁହେଁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index f41282055b..a496865c3c 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -29,6 +29,8 @@ "ਮੁੱਖ ਪੰਨਾ" "ਸਪਲਿਟ ਸਕ੍ਰੀਨ" "%1$s ਲਈ ਐਪ ਜਾਣਕਾਰੀ" + + "ਐਪ ਜੋੜਾਬੱਧ ਰੱਖਿਅਤ ਕਰੋ" "%1$s | %2$s" "ਇਸ ਐਪ ਜੋੜਾਬੱਧ ਦਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਮਰਥਨ ਨਹੀਂ ਕੀਤਾ ਜਾਂਦਾ" @@ -125,7 +127,7 @@ "ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਦਿਖਾਉਣ ਲਈ, %1$s ਲਈ ਐਪ ਸੂਚਨਾਵਾਂ ਚਾਲੂ ਕਰੋ" "ਸੈਟਿੰਗਾਂ ਬਦਲੋ" "ਸੂਚਨਾ ਬਿੰਦੂ ਦਿਖਾਓ" - "ਵਿਕਾਸਕਾਰ ਚੋਣਾਂ" + "ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ" "ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਐਪ ਪ੍ਰਤੀਕਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ" "ਨਵੀਆਂ ਐਪਾਂ ਲਈ" "ਅਗਿਆਤ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index a97d56e611..86a43ab666 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -29,6 +29,8 @@ "Ekran główny" "Podziel ekran" "Informacje o aplikacji: %1$s" + + "Zapisz parę aplikacji" "%1$s | %2$s" "Ta para aplikacji nie jest obsługiwana na tym urządzeniu" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 3257915e85..a8eadfe354 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -29,6 +29,7 @@ "Página inicial" "Ecrã dividido" "Informações da app para %1$s" + "Definições de utilização para %1$s" "Guardar par de apps" "%1$s | %2$s" "Este par de apps não é suportado neste dispositivo" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 27aa1ee861..2833a3fdb4 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -29,6 +29,8 @@ "Início" "Tela dividida" "Informações do app %1$s" + + "Salvar par de apps" "%1$s | %2$s" "Este Par de apps não está disponível no dispositivo" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 959bb1c792..a3ee56ee3f 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -29,6 +29,8 @@ "Pagina de pornire" "Ecran împărțit" "Informații despre aplicație pentru %1$s" + + "Salvează perechea de aplicații" "%1$s | %2$s" "Perechea de aplicații nu este acceptată pe acest dispozitiv" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 1844933ffd..7b99297f4a 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -29,6 +29,8 @@ "Главный экран" "Разделить экран" "Сведения о приложении \"%1$s\"" + + "Сохранить приложения" "%1$s | %2$s" "Одновременно использовать эти два приложения на устройстве нельзя." diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index d5a0114671..511d59348c 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -29,6 +29,8 @@ "මුල් පිටුව" "බෙදුම් තිරය" "%1$s සඳහා යෙදුම් තතු" + + "යෙදුම් යුගල සුරකින්න" "%1$s | %2$s" "මෙම යෙදුම් යුගලය මෙම උපාංගයෙහි සහාය නොදක්වයි" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 3d12a6513b..960259425e 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -29,6 +29,8 @@ "Domov" "Rozdeliť obrazovku" "Informácie o aplikácii pre %1$s" + + "Uložiť pár aplikácií" "%1$s | %2$s" "Tento pár aplikácií nie je v tomto zariadení podporovaný" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 070ccbbf86..2b334aa2eb 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -29,6 +29,7 @@ "Začetni zaslon" "Razdeljen zaslon" "Podatki o aplikaciji za: %1$s" + "Nastavitve uporabe za »%1$s«" "Shrani par aplikacij" "%1$s | %2$s" "Ta par aplikacij ni podprt v tej napravi" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index df2395ad10..fbeb20537d 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -29,6 +29,8 @@ "Ekrani bazë" "Ekrani i ndarë" "Informacioni i aplikacionit për %1$s" + + "Ruaj çiftin e aplikacioneve" "%1$s | %2$s" "Ky çift aplikacionesh nuk mbështetet në këtë pajisje" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 0721730178..8ae58ebb29 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -29,6 +29,7 @@ "Почетни екран" "Подељени екран" "Информације о апликацији за: %1$s" + "Подешавања потрошње за %1$s" "Сачувај пар апликација" "%1$s | %2$s" "Овај пар апликација није подржан на овом уређају" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 2b6a9aa3e0..d99fd86bbb 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -29,6 +29,8 @@ "Startskärm" "Delad skärm" "Appinformation 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" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index d44eb13972..8893a907cb 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -29,6 +29,8 @@ "Skrini ya kwanza" "Gawa skrini" "Maelezo ya programu ya %1$s" + + "Hifadhi jozi ya programu" "%1$s | %2$s" "Jozi hii ya programu haitumiki kwenye kifaa hiki" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index efa4b85959..fbd788071b 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -29,6 +29,8 @@ "முகப்பு" "திரைப் பிரிப்பு" "%1$sக்கான ஆப்ஸ் தகவல்கள்" + + "ஆப்ஸ் ஜோடியைச் சேமி" "%1$s | %2$s" "இந்தச் சாதனத்தில் இந்த ஆப்ஸ் ஜோடி ஆதரிக்கப்படவில்லை" @@ -84,8 +86,7 @@ "நிறுவல் நீக்கு" "ஆப்ஸ் தகவல்" "தனிப்பட்டதில் நிறுவு" - - + "ஆப்ஸை நிறுவல் நீக்கு" "நிறுவு" "பரிந்துரைக்காதே" "கணிக்கப்பட்ட ஆப்ஸைப் பின் செய்தல்" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index bd09562c41..11c2755cb9 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -29,6 +29,8 @@ "మొదటి ట్యాబ్" "స్ప్లిట్ స్క్రీన్" "%1$s కోసం యాప్ సమాచారం" + + "యాప్ పెయిర్‌ను సేవ్ చేయండి" "%1$s | %2$s" "ఈ పరికరంలో ఈ యాప్ పెయిర్ సపోర్ట్ చేయదు" @@ -124,7 +126,7 @@ "నోటిఫికేషన్ యాక్సెస్ అవసరం" "నోటిఫికేషన్ డాట్‌లను చూపించడానికి %1$sకు యాప్ నోటిఫికేషన్‌లను ఆన్ చేయండి" "సెట్టింగ్‌లను మార్చు" - "నోటిఫికేషన్ డాట్‌లను చూపు" + "నోటిఫికేషన్ డాట్‌లను చూపండి" "డెవలపర్ ఆప్షన్‌లు" "యాప్ చిహ్నాలను మొదటి స్క్రీన్‌కు జోడించండి" "కొత్త యాప్‌ల కోసం" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index dcaa17ba95..d006e5e117 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -29,6 +29,8 @@ "หน้าแรก" "แยกหน้าจอ" "ข้อมูลแอปสำหรับ %1$s" + + "บันทึกคู่แอป" "%1$s | %2$s" "ไม่รองรับคู่แอปนี้ในอุปกรณ์เครื่องนี้" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index ba4b6aaa21..a497d4f8d9 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -29,6 +29,8 @@ "Home" "Split screen" "Impormasyon ng app 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" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index e46ffd1360..301a754379 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -29,6 +29,8 @@ "Ana ekran" "Bölünmüş ekran" "%1$s uygulama bilgileri" + + "Uygulama çiftini kaydedin" "%1$s | %2$s" "Bu uygulama çifti bu cihazda desteklenmiyor" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 9cca61f81f..3ff70b8b28 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -29,6 +29,8 @@ "Головний екран" "Розділити екран" "Інформація про додаток для %1$s" + + "Зберегти пару додатків" "%1$s | %2$s" "Ці два додатки не можна одночасно використовувати на цьому пристрої" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 5fbfc52d6a..653959ea7a 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -29,6 +29,8 @@ "ہوم" "اسپلٹ اسکرین" "‏%1$s کے لیے ایپ کی معلومات" + + "ایپس کے جوڑے کو محفوظ کریں" "%1$s | %2$s" "ایپس کا یہ جوڑا اس آلے پر تعاون یافتہ نہیں ہے" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 10e928b8b7..194822e789 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -29,6 +29,8 @@ "Bosh ekran" "Ekranni ikkiga ajratish" "%1$s ilovasi axboroti" + + "Ilova juftini saqlash" "%1$s | %2$s" "Bu ilova jufti ushbu qurilmada ishlamaydi" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 9eebdd757d..f50b8e8d9b 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -29,6 +29,8 @@ "Màn hình chính" "Chia đôi màn hình" "Thông tin ứng dụng cho %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" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3c430c173b..b4c432b56a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -29,6 +29,8 @@ "主屏幕" "分屏" "%1$s 的应用信息" + + "保存应用组合" "%1$s | %2$s" "在该设备上无法使用此应用对" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index ce26039325..94b3ae6eaa 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -29,6 +29,8 @@ "主畫面" "分割螢幕" "%1$s 的應用程式資料" + + "儲存應用程式配對" "%1$s | %2$s" "此裝置不支援此應用程式配對" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index fc0dddf161..e0b7ab2ea1 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -29,6 +29,8 @@ "主畫面" "分割畫面" "「%1$s」的應用程式資訊" + + "儲存應用程式配對" "%1$s | %2$s" "這部裝置不支援這組應用程式配對" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 147156447f..16d71a6da3 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -29,6 +29,8 @@ "Ikhaya" "Hlukanisa isikrini" "Ulwazi lwe-App ye-%1$s" + + "Londoloza i-app ebhangqiwe" "%1$s | %2$s" "Lokhu kubhanqwa kwe-app akusekelwa kule divayisi" @@ -123,7 +125,7 @@ "Valiwe" "Ukufinyelela izaziso kuyadingeka" "Ukuze ubonisa amcashazi esaziso, vula izaziso zohlelo lokusebenza ze-%1$s" - "Shintsha izilungiselelo" + "Shintsha amasethingi" "Bonisa amacashazi esaziso" "Izinketho zonjiniyela" "Engeza izithonjana ze-app kusikrini sasekhaya" From b748c8e6ee87bc65f2fc54e5a6fb4384e5be34ac Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 3 Jun 2024 18:20:44 -0700 Subject: [PATCH 5/9] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I7d47742f878876e358fec1130708bae36149f801 --- res/values-pa/strings.xml | 2 +- res/values-te/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index f9042d3bf4..f1351c4332 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -125,7 +125,7 @@ "ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਦਿਖਾਉਣ ਲਈ, %1$s ਲਈ ਐਪ ਸੂਚਨਾਵਾਂ ਚਾਲੂ ਕਰੋ" "ਸੈਟਿੰਗਾਂ ਬਦਲੋ" "ਸੂਚਨਾ ਬਿੰਦੂ ਦਿਖਾਓ" - "ਵਿਕਾਸਕਾਰ ਚੋਣਾਂ" + "ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ" "ਹੋਮ ਸਕ੍ਰੀਨ \'ਤੇ ਐਪ ਪ੍ਰਤੀਕਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ" "ਨਵੀਆਂ ਐਪਾਂ ਲਈ" "ਅਗਿਆਤ" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 3cd412d46b..4c9de0439c 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -124,7 +124,7 @@ "నోటిఫికేషన్ యాక్సెస్ అవసరం" "నోటిఫికేషన్ డాట్‌లను చూపించడానికి %1$sకు యాప్ నోటిఫికేషన్‌లను ఆన్ చేయండి" "సెట్టింగ్‌లను మార్చు" - "నోటిఫికేషన్ డాట్‌లను చూపు" + "నోటిఫికేషన్ డాట్‌లను చూపండి" "డెవలపర్ ఆప్షన్‌లు" "యాప్ చిహ్నాలను మొదటి స్క్రీన్‌కు జోడించండి" "కొత్త యాప్‌ల కోసం" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index cbc0cb499b..675cfaf210 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -123,7 +123,7 @@ "Valiwe" "Ukufinyelela izaziso kuyadingeka" "Ukuze ubonisa amcashazi esaziso, vula izaziso zohlelo lokusebenza ze-%1$s" - "Shintsha izilungiselelo" + "Shintsha amasethingi" "Bonisa amacashazi esaziso" "Izinketho zonjiniyela" "Engeza izithonjana ze-app kusikrini sasekhaya" From 11afae1bc9320b7f583b720539690441ad9ab32f Mon Sep 17 00:00:00 2001 From: Jordan Silva Date: Fri, 31 May 2024 15:02:10 +0100 Subject: [PATCH 6/9] Adding logs to monitor OverviewCommandHelper This CL adds some logs to help analyzing why recents button with 3 button navigation sometimes don't open Overview. Bug: 337954957 Test: NONE Flag: EXEMPT Adding logs to debug issue Change-Id: I44a799319eca667b04d4e78a38ade796fc3b69fb --- .../quickstep/OverviewCommandHelper.java | 50 +++++++++++++++++-- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java index 3091e3dfc5..26a7c2f5bf 100644 --- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java +++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java @@ -28,9 +28,11 @@ import android.content.Intent; import android.graphics.PointF; import android.os.SystemClock; import android.os.Trace; +import android.util.Log; import android.view.View; import androidx.annotation.BinderThread; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; @@ -58,6 +60,7 @@ import java.util.HashMap; * Helper class to handle various atomic commands for switching between Overview. */ public class OverviewCommandHelper { + private static final String TAG = "OverviewCommandHelper"; public static final int TYPE_SHOW = 1; public static final int TYPE_KEYBOARD_INPUT = 2; @@ -105,10 +108,19 @@ public class OverviewCommandHelper { * Called when the command finishes execution. */ private void scheduleNextTask(CommandInfo command) { - if (!mPendingCommands.isEmpty() && mPendingCommands.get(0) == command) { - mPendingCommands.remove(0); - executeNext(); + if (mPendingCommands.isEmpty()) { + Log.d(TAG, "no pending commands to schedule"); + return; } + if (mPendingCommands.get(0) != command) { + Log.d(TAG, "next task not scheduled." + + " mPendingCommands[0] type is " + mPendingCommands.get(0) + + " - command type is: " + command); + return; + } + Log.d(TAG, "scheduleNextTask called: " + command); + mPendingCommands.remove(0); + executeNext(); } /** @@ -119,10 +131,14 @@ public class OverviewCommandHelper { @UiThread private void executeNext() { if (mPendingCommands.isEmpty()) { + Log.d(TAG, "executeNext - mPendingCommands is empty"); return; } CommandInfo cmd = mPendingCommands.get(0); - if (executeCommand(cmd)) { + + boolean result = executeCommand(cmd); + Log.d(TAG, "executeNext cmd type: " + cmd + ", result: " + result); + if (result) { scheduleNextTask(cmd); } } @@ -144,14 +160,18 @@ public class OverviewCommandHelper { @BinderThread public void addCommand(int type) { if (mPendingCommands.size() >= MAX_QUEUE_SIZE) { + Log.d(TAG, "the pending command queue is full (" + mPendingCommands.size() + "). " + + "command not added: " + type); return; } + Log.d(TAG, "adding command type: " + type); CommandInfo cmd = new CommandInfo(type); MAIN_EXECUTOR.execute(() -> addCommand(cmd)); } @UiThread public void clearPendingCommands() { + Log.d(TAG, "clearing pending commands - size: " + mPendingCommands.size()); mPendingCommands.clear(); } @@ -182,9 +202,11 @@ public class OverviewCommandHelper { if (callbackList != null) { callbackList.add(() -> { + Log.d(TAG, "launching task callback: " + cmd); scheduleNextTask(cmd); mWaitForToggleCommandComplete = false; }); + Log.d(TAG, "launching task - waiting for callback: " + cmd); return false; } else { recents.startHome(); @@ -200,12 +222,17 @@ public class OverviewCommandHelper { private & RecentsViewContainer> boolean executeCommand( CommandInfo cmd) { if (mWaitForToggleCommandComplete && cmd.type == TYPE_TOGGLE) { + Log.d(TAG, "executeCommand: " + cmd + + " - waiting for toggle command complete"); return true; } BaseActivityInterface activityInterface = mOverviewComponentObserver.getActivityInterface(); RecentsView visibleRecentsView = activityInterface.getVisibleRecentsView(); RecentsView createdRecentsView; + + Log.d(TAG, "executeCommand: " + cmd + + " - visibleRecentsView: " + visibleRecentsView); if (visibleRecentsView == null) { T activity = activityInterface.getCreatedContainer(); createdRecentsView = activity == null ? null : activity.getOverviewPanel(); @@ -292,14 +319,17 @@ public class OverviewCommandHelper { updateRecentsViewFocus(cmd); logShowOverviewFrom(cmd.type); } + @Override public void onAnimationEnd(Animator animation) { + Log.d(TAG, "switching to Overview state - onAnimationEnd: " + cmd); super.onAnimationEnd(animation); onRecentsViewFocusUpdated(cmd); scheduleNextTask(cmd); } }; if (activityInterface.switchToRecentsIfVisible(animatorListener)) { + Log.d(TAG, "switching to Overview state - waiting: " + cmd); // If successfully switched, wait until animation finishes return false; } @@ -366,10 +396,12 @@ public class OverviewCommandHelper { cmd.mActiveCallbacks.addListener(recentAnimListener); } Trace.beginAsyncSection(TRANSITION_NAME, 0); + Log.d(TAG, "switching via recents animation - onGestureStarted: " + cmd); return false; } private void onTransitionComplete(CommandInfo cmd, AbsSwipeUpHandler handler) { + Log.d(TAG, "switching via recents animation - onTransitionComplete: " + cmd); cmd.removeListener(handler); Trace.endAsyncSection(TRANSITION_NAME, 0); onRecentsViewFocusUpdated(cmd); @@ -478,5 +510,15 @@ public class OverviewCommandHelper { mActiveCallbacks.removeListener(listener); } } + + @NonNull + @Override + public String toString() { + return "CommandInfo(" + + "type=" + type + ", " + + "createTime=" + createTime + ", " + + "mActiveCallbacks=" + mActiveCallbacks + + ")"; + } } } From 801563328a00778030c51e5d142c1c77d9c2a751 Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Tue, 4 Jun 2024 08:54:44 +0000 Subject: [PATCH 7/9] Allow DeviceProfile tests to run on TreeHugger Robolectric device Bug: 325088842 Test: Presubmit passes Flag: EXEMPT test-only Change-Id: Id2856b2016b2e1ba467c7b8e830631f5253d6b8c --- .../src/com/android/launcher3/AbstractDeviceProfileTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt b/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt index e3787339b1..3405635426 100644 --- a/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt +++ b/tests/multivalentTests/src/com/android/launcher3/AbstractDeviceProfileTest.kt @@ -57,7 +57,7 @@ import org.mockito.kotlin.whenever * * For an implementation that mocks InvariantDeviceProfile, use [FakeInvariantDeviceProfileTest] */ -@AllowedDevices(allowed = [DeviceProduct.CF_PHONE]) +@AllowedDevices(allowed = [DeviceProduct.CF_PHONE, DeviceProduct.HOST_SIDE_X86_64]) @IgnoreLimit(ignoreLimit = BuildConfig.IS_STUDIO_BUILD) abstract class AbstractDeviceProfileTest { protected val testContext: Context = InstrumentationRegistry.getInstrumentation().context From f895a7b0bddadb3be430ad2ed460cb5802515f69 Mon Sep 17 00:00:00 2001 From: Alina Zaidi Date: Tue, 28 May 2024 18:40:20 +0000 Subject: [PATCH 8/9] Add transition source for DesktopMode enter transition event originating from AppIcon press in overview Test: Updated unit tests Flag: EXEMPT not a major feature/ user visible change Bug: b/326231756 Change-Id: I9e53cd3ec41dd2475ba90ea8fab2fb7a90f5e158 --- .../desktop/DesktopRecentsTransitionController.kt | 5 +++-- .../com/android/quickstep/DesktopSystemShortcut.kt | 6 +++++- .../src/com/android/quickstep/SystemUiProxy.java | 5 +++-- .../src/com/android/quickstep/views/RecentsView.java | 9 ++++++--- .../android/quickstep/DesktopSystemShortcutTest.kt | 12 +++++++++--- 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt b/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt index 3ef8e546e0..0000c0db2c 100644 --- a/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt +++ b/quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt @@ -30,6 +30,7 @@ import com.android.launcher3.util.Executors.MAIN_EXECUTOR import com.android.quickstep.SystemUiProxy import com.android.quickstep.TaskViewUtils import com.android.quickstep.views.DesktopTaskView +import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource import java.util.function.Consumer /** Manage recents related operations with desktop tasks */ @@ -57,8 +58,8 @@ class DesktopRecentsTransitionController( } /** Launch desktop tasks from recents view */ - fun moveToDesktop(taskId: Int) { - systemUiProxy.moveToDesktop(taskId) + fun moveToDesktop(taskId: Int, transitionSource: DesktopModeTransitionSource) { + systemUiProxy.moveToDesktop(taskId, transitionSource) } private class RemoteDesktopLaunchTransitionRunner( diff --git a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt index 50a06fcd75..9c188f31c3 100644 --- a/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt +++ b/quickstep/src/com/android/quickstep/DesktopSystemShortcut.kt @@ -24,6 +24,7 @@ import com.android.launcher3.popup.SystemShortcut import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsViewContainer import com.android.quickstep.views.TaskView.TaskContainer +import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource import com.android.wm.shell.shared.DesktopModeStatus /** A menu item, "Desktop", that allows the user to bring the current app into Desktop Windowing. */ @@ -43,7 +44,10 @@ class DesktopSystemShortcut( override fun onClick(view: View) { dismissTaskMenuView() val recentsView = mTarget.getOverviewPanel>() - recentsView.moveTaskToDesktop(taskContainer) { + recentsView.moveTaskToDesktop( + taskContainer, + DesktopModeTransitionSource.APP_FROM_OVERVIEW + ) { mTarget.statsLogManager .logger() .withItemInfo(taskContainer.itemInfo) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 0ac3ec7074..9c3fbaa25c 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -85,6 +85,7 @@ import com.android.wm.shell.back.IBackAnimation; import com.android.wm.shell.bubbles.IBubbles; import com.android.wm.shell.bubbles.IBubblesListener; import com.android.wm.shell.common.bubbles.BubbleBarLocation; +import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.common.pip.IPip; import com.android.wm.shell.common.pip.IPipAnimationListener; import com.android.wm.shell.common.split.SplitScreenConstants.PersistentSnapPosition; @@ -1494,10 +1495,10 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle, SafeCloseable { } /** Call shell to move a task with given `taskId` to desktop */ - public void moveToDesktop(int taskId) { + public void moveToDesktop(int taskId, DesktopModeTransitionSource transitionSource) { if (mDesktopMode != null) { try { - mDesktopMode.moveToDesktop(taskId); + mDesktopMode.moveToDesktop(taskId, transitionSource); } catch (RemoteException e) { Log.w(TAG, "Failed call moveToDesktop", e); } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 4804e56844..9dfcd08e7e 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -217,6 +217,7 @@ import com.android.systemui.shared.system.InteractionJankMonitorWrapper; import com.android.systemui.shared.system.PackageManagerWrapper; import com.android.systemui.shared.system.TaskStackChangeListener; import com.android.systemui.shared.system.TaskStackChangeListeners; +import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.common.pip.IPipAnimationListener; import com.android.wm.shell.shared.DesktopModeStatus; @@ -6304,20 +6305,22 @@ public abstract class RecentsView finishRecentsAnimation(/* toRecents= */true, /* shouldPip= */false, - () -> moveTaskToDesktopInternal(taskContainer, successCallback))); + () -> moveTaskToDesktopInternal(taskContainer, successCallback, transitionSource))); } private void moveTaskToDesktopInternal(TaskContainer taskContainer, - Runnable successCallback) { + Runnable successCallback, DesktopModeTransitionSource transitionSource) { if (mDesktopRecentsTransitionController == null) { return; } - mDesktopRecentsTransitionController.moveToDesktop(taskContainer.getTask().key.id); + mDesktopRecentsTransitionController.moveToDesktop(taskContainer.getTask().key.id, + transitionSource); successCallback.run(); } diff --git a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt index 36f2ccf5be..50b5df13f2 100644 --- a/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt +++ b/quickstep/tests/src/com/android/quickstep/DesktopSystemShortcutTest.kt @@ -38,6 +38,7 @@ import com.android.quickstep.views.TaskViewIcon import com.android.systemui.shared.recents.model.Task import com.android.systemui.shared.recents.model.Task.TaskKey import com.android.window.flags.Flags +import com.android.wm.shell.common.desktopmode.DesktopModeTransitionSource import com.android.wm.shell.shared.DesktopModeStatus import com.google.common.truth.Truth.assertThat import org.junit.After @@ -152,8 +153,8 @@ class DesktopSystemShortcutTest { whenever(launcher.statsLogManager).thenReturn(statsLogManager) whenever(statsLogManager.logger()).thenReturn(statsLogger) whenever(statsLogger.withItemInfo(any())).thenReturn(statsLogger) - whenever(recentsView.moveTaskToDesktop(any(), any())).thenAnswer { - val successCallback = it.getArgument(1) + whenever(recentsView.moveTaskToDesktop(any(), any(), any())).thenAnswer { + val successCallback = it.getArgument(2) successCallback.run() } doReturn(workspaceItemInfo).whenever(taskContainer).itemInfo @@ -169,7 +170,12 @@ class DesktopSystemShortcutTest { val allTypesExceptRebindSafe = AbstractFloatingView.TYPE_ALL and AbstractFloatingView.TYPE_REBIND_SAFE.inv() verify(abstractFloatingViewHelper).closeOpenViews(launcher, true, allTypesExceptRebindSafe) - verify(recentsView).moveTaskToDesktop(eq(taskContainer), any()) + verify(recentsView) + .moveTaskToDesktop( + eq(taskContainer), + eq(DesktopModeTransitionSource.APP_FROM_OVERVIEW), + any() + ) verify(statsLogger).withItemInfo(workspaceItemInfo) verify(statsLogger).log(LauncherEvent.LAUNCHER_SYSTEM_SHORTCUT_DESKTOP_TAP) } From 5580144d6b190577dbceef71358089457f19e48f Mon Sep 17 00:00:00 2001 From: Uwais Ashraf Date: Tue, 4 Jun 2024 17:27:59 +0000 Subject: [PATCH 9/9] Animate RecentsView when rotating in fake orientations Test: Manual - animations Bug: 336704871 Flag: EXEMPT bugfix Change-Id: I80629128a0730ca85d0313d15af806ddf840e82b --- .../src/com/android/quickstep/views/RecentsView.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 4804e56844..c89b6b8ee7 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -2675,17 +2675,9 @@ public abstract class RecentsView