From 3fcc90b44db98199f004cb16f16b31579db93d87 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 31 May 2022 08:43:04 -0700 Subject: [PATCH 1/9] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I2eb1c6b32fc7bee412388555747cf46d5f951936 --- quickstep/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml index 1650a5c2bf..250724e1af 100644 --- a/quickstep/res/values-nb/strings.xml +++ b/quickstep/res/values-nb/strings.xml @@ -87,7 +87,7 @@ "Trykk på en annen app for å bruke delt skjerm" "Appen støtter ikke delt skjerm." "Appen eller organisasjonen din tillater ikke denne handlingen" - "Vil du hoppe over navigeringsveiledning?" + "Vil du hoppe over navigeringsveiledningen?" "Du kan finne dette i %1$s-appen senere" "Avbryt" "Hopp over" From b75f873d266795f116a1a6df242dc572da4e6f1f Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 31 May 2022 08:43:38 -0700 Subject: [PATCH 2/9] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I7919385e959a6a1cc687d03df9a3b8aba14d0c33 --- quickstep/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml index 1650a5c2bf..250724e1af 100644 --- a/quickstep/res/values-nb/strings.xml +++ b/quickstep/res/values-nb/strings.xml @@ -87,7 +87,7 @@ "Trykk på en annen app for å bruke delt skjerm" "Appen støtter ikke delt skjerm." "Appen eller organisasjonen din tillater ikke denne handlingen" - "Vil du hoppe over navigeringsveiledning?" + "Vil du hoppe over navigeringsveiledningen?" "Du kan finne dette i %1$s-appen senere" "Avbryt" "Hopp over" From 3b8026fd1dd131b2ec68f2139f247824de2919ce Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 31 May 2022 08:46:54 -0700 Subject: [PATCH 3/9] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ide677bcf0bab99f44d6e06c7f7bed2f3404e5c58 --- res/values-bs/strings.xml | 4 ++-- res/values-fr/strings.xml | 6 ++---- res/values-nb/strings.xml | 6 ++---- res/values-pl/strings.xml | 6 ++---- res/values-uk/strings.xml | 6 ++---- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 15899ecc34..173518f75f 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -171,7 +171,7 @@ "Pauziraj poslovne aplikacije" "Uključi poslovne aplikacije" "Filtrirajte" - "Pretraživanje telefona" - "Pretraživanje tableta" + "Pretražite telefon" + "Pretražite tablet" "Nije uspjelo: %1$s" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 960651c1f5..9b30b1efaf 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -171,9 +171,7 @@ "Mettre en pause les applis professionnelles" "Activer les applications professionnelles" "Filtre" - - - - + "Rechercher sur votre téléphone" + "Rechercher sur votre tablette" "Échec : %1$s" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index be94a6a7bf..eba195c8bd 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -171,9 +171,7 @@ "Sett jobbapper på pause" "Slå på jobbapper" "Filter" - - - - + "Søk på telefonen" + "Søk på nettbrettet" "Mislyktes: %1$s" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5c99b3d026..869e91b68f 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -171,9 +171,7 @@ "Wstrzymaj aplikacje służbowe" "Włącz aplikacje służbowe" "Filtruj" - - - - + "Przeszukuj telefon" + "Przeszukuj tablet" "Niepowodzenie: %1$s" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 0f1e448c65..2b43a4db68 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -171,9 +171,7 @@ "Призупинити робочі додатки" "Увімкнути робочі додатки" "Фільтр" - - - - + "Пошук на телефоні" + "Пошук на планшеті" "Не вдалося %1$s" From e3af8d858ec507340e72007a1024ba029e7c2908 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 31 May 2022 08:47:32 -0700 Subject: [PATCH 4/9] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Id908e5e836e2b7cec65c23c02ebcdfd91427538b --- res/values-bs/strings.xml | 4 ++-- res/values-fr/strings.xml | 6 ++---- res/values-nb/strings.xml | 6 ++---- res/values-pl/strings.xml | 6 ++---- res/values-uk/strings.xml | 6 ++---- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 15899ecc34..173518f75f 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -171,7 +171,7 @@ "Pauziraj poslovne aplikacije" "Uključi poslovne aplikacije" "Filtrirajte" - "Pretraživanje telefona" - "Pretraživanje tableta" + "Pretražite telefon" + "Pretražite tablet" "Nije uspjelo: %1$s" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 960651c1f5..9b30b1efaf 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -171,9 +171,7 @@ "Mettre en pause les applis professionnelles" "Activer les applications professionnelles" "Filtre" - - - - + "Rechercher sur votre téléphone" + "Rechercher sur votre tablette" "Échec : %1$s" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index be94a6a7bf..eba195c8bd 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -171,9 +171,7 @@ "Sett jobbapper på pause" "Slå på jobbapper" "Filter" - - - - + "Søk på telefonen" + "Søk på nettbrettet" "Mislyktes: %1$s" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 5c99b3d026..869e91b68f 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -171,9 +171,7 @@ "Wstrzymaj aplikacje służbowe" "Włącz aplikacje służbowe" "Filtruj" - - - - + "Przeszukuj telefon" + "Przeszukuj tablet" "Niepowodzenie: %1$s" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 0f1e448c65..2b43a4db68 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -171,9 +171,7 @@ "Призупинити робочі додатки" "Увімкнути робочі додатки" "Фільтр" - - - - + "Пошук на телефоні" + "Пошук на планшеті" "Не вдалося %1$s" From 2a7fbee0d43ee64689054ac4280234e82d9b2830 Mon Sep 17 00:00:00 2001 From: Stefan Andonian Date: Fri, 27 May 2022 22:34:52 +0000 Subject: [PATCH 5/9] Give FloatingIconView a copy of, rather than, the original icon. Previously, if a user tapped on the clock icon then rapidly swiped back, the clock icon would stop updating. This fixes that issue by avoiding changes to the original icon's inner callback state while preparing and displaying the FloatingIconView. Bug: 188377749 Test: Locally enabled the second hand on the clock icon in addition to the minute and hour hands, then verified that it was incrementing correctly every second even after tapping then rapidly swiping back on the clock icon. Change-Id: Ib8eddb53de293194e5f9dce2fcafe8a481a6116c --- src/com/android/launcher3/views/FloatingIconView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java index babe607ca1..acdd9a19df 100644 --- a/src/com/android/launcher3/views/FloatingIconView.java +++ b/src/com/android/launcher3/views/FloatingIconView.java @@ -525,7 +525,7 @@ public class FloatingIconView extends FrameLayout implements & ItemInfoWithIcon.FLAG_SHOW_DOWNLOAD_PROGRESS_MASK) != 0) { btvIcon = btv.makePreloadIcon(); } else { - btvIcon = btv.getIcon(); + btvIcon = (FastBitmapDrawable) btv.getIcon().getConstantState().newDrawable(); } } else { btvIcon = null; From 7ca87c785abfd252c64d58478dca2d4236bd4421 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 27 May 2022 22:13:16 +0000 Subject: [PATCH 6/9] Ignore pinned tasks for purposes of gesture nav Bug: 234170890 Test: Enter content pip, swipe up and see if a duplicate stub taskview is created Change-Id: I62a994749fcaeff48901410ede26b848fa15b830 --- .../com/android/quickstep/TopTaskTracker.java | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TopTaskTracker.java b/quickstep/src/com/android/quickstep/TopTaskTracker.java index 39c5f2ad98..723dc721a9 100644 --- a/quickstep/src/com/android/quickstep/TopTaskTracker.java +++ b/quickstep/src/com/android/quickstep/TopTaskTracker.java @@ -15,12 +15,13 @@ */ package com.android.quickstep; +import static android.app.ActivityTaskManager.INVALID_TASK_ID; +import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; import static android.content.Intent.ACTION_CHOOSER; import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; -import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.ACTIVITY_TYPE_ASSISTANT; import android.app.ActivityManager.RunningTaskInfo; import android.content.Context; @@ -64,6 +65,7 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta private final StagedSplitTaskPosition mMainStagePosition = new StagedSplitTaskPosition(); private final StagedSplitTaskPosition mSideStagePosition = new StagedSplitTaskPosition(); + private int mPinnedTaskId = INVALID_TASK_ID; private TopTaskTracker(Context context) { mMainStagePosition.stageType = SplitConfigurationOptions.STAGE_TYPE_MAIN; @@ -132,8 +134,18 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta } } + @Override + public void onActivityPinned(String packageName, int userId, int taskId, int stackId) { + mPinnedTaskId = taskId; + } + + @Override + public void onActivityUnpinned() { + mPinnedTaskId = INVALID_TASK_ID; + } + private void resetTaskId(StagedSplitTaskPosition taskPosition) { - taskPosition.taskId = -1; + taskPosition.taskId = INVALID_TASK_ID; } /** @@ -141,7 +153,8 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta * Will return empty array if device is not in staged split */ public int[] getRunningSplitTaskIds() { - if (mMainStagePosition.taskId == -1 || mSideStagePosition.taskId == -1) { + if (mMainStagePosition.taskId == INVALID_TASK_ID + || mSideStagePosition.taskId == INVALID_TASK_ID) { return new int[]{}; } int[] out = new int[2]; @@ -175,7 +188,11 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta false /* filterOnlyVisibleRecents */)); Collections.addAll(mOrderedTaskList, tasks); } - return new CachedTaskInfo(new ArrayList<>(mOrderedTaskList)); + + // Strip the pinned task + ArrayList tasks = new ArrayList<>(mOrderedTaskList); + tasks.removeIf(t -> t.taskId == mPinnedTaskId); + return new CachedTaskInfo(tasks); } /** @@ -194,7 +211,7 @@ public class TopTaskTracker extends ISplitScreenListener.Stub implements TaskSta } public int getTaskId() { - return mTopTask == null ? -1 : mTopTask.taskId; + return mTopTask == null ? INVALID_TASK_ID : mTopTask.taskId; } /** From 1a9044d1ad657af8d3e7e3db4ade996789392d85 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 31 May 2022 23:42:39 -0700 Subject: [PATCH 7/9] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Iee62c40d6bd83696f03465a7fbe96dba58f981a5 --- quickstep/res/values-nb/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml index e2ae437312..118c7b1376 100644 --- a/quickstep/res/values-nb/strings.xml +++ b/quickstep/res/values-nb/strings.xml @@ -83,7 +83,7 @@ "Trykk på en annen app for å bruke delt skjerm" "Appen støtter ikke delt skjerm." "Appen eller organisasjonen din tillater ikke denne handlingen" - "Vil du hoppe over navigeringsveiledning?" + "Vil du hoppe over navigeringsveiledningen?" "Du kan finne dette i %1$s-appen senere" "Avbryt" "Hopp over" From 6132cc36d765845f68554abffeb82e879214a198 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Mon, 30 May 2022 12:07:02 -0700 Subject: [PATCH 8/9] Tune floating rotation button size Bug: 216182085 Test: https://recall.googleplex.com/projects/8b6d2fc1-ac47-4776-b2cd-919ec4f7c74c/sessions/95608ec0-1b25-46c9-9e15-eddaaa03e50b Change-Id: I4bc3ab7aad2840d4029c3dae6053cfa2c936fe81 --- quickstep/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 3072a3ee10..0fd3c4a3db 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -239,7 +239,7 @@ 0dp - 40dp + 52dp 20dp 20dp 10dp From 959a9f5444172dd5fbe970daa2a7c3f04dd2dc7f Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 1 Jun 2022 15:02:39 -0700 Subject: [PATCH 9/9] Fixing wrong diffing logic in AdapterItem Bug: 232932442 Test: Verified on device Change-Id: I87eae4c238a7b2d9749859307d253822916bb31c --- src/com/android/launcher3/allapps/BaseAllAppsAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java b/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java index c7c4607d6e..fcba246c95 100644 --- a/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java +++ b/src/com/android/launcher3/allapps/BaseAllAppsAdapter.java @@ -119,7 +119,7 @@ public abstract class BaseAllAppsAdapter ex * Returns true if the items represent the same object */ public boolean isSameAs(AdapterItem other) { - return (other.viewType != viewType) && (other.getClass() == getClass()); + return (other.viewType == viewType) && (other.getClass() == getClass()); } /**