| commit | 889dfd07cd7fea4c24ae371b44572190e164c598 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Oct 01 19:46:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 01 19:46:43 2021 +0000 |
| tree | e00053a69ebd62296336e5fe051b69c08ba6ae3b | |
| parent | 775843922d9ec920fa36b51a202f041fed0ad482 [diff] | |
| parent | a5a22a2970160808f3d2e61ea7db4593a104d5c7 [diff] |
Merge "Don't snap to task when tapping task icon in overview grid" into sc-v2-dev am: f5942afeb5 am: a5a22a2970 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15960194 Change-Id: I3b1826f21c6f643f87ddfa5022385e36005f9558
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 7b4bf62..ea8282f 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -795,7 +795,8 @@ return true; } - if (!getRecentsView().isClearAllHidden()) { + if (!mActivity.getDeviceProfile().overviewShowAsGrid + && !getRecentsView().isClearAllHidden()) { getRecentsView().snapToPage(getRecentsView().indexOfChild(this)); return false; } else {