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" 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 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; } /** 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" 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()); } /** 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;