| commit | c03a5a6e8034f3150055e67ff3f67d2c9544ed2d | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu Apr 14 20:15:51 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 14 20:15:51 2022 +0000 |
| tree | 23eca50691c5f8aee20f11532e77e15ff3145525 | |
| parent | f8a6c58e0db62c1b79bf0c8bdbcb4af851fc21e3 [diff] | |
| parent | bc25ec02a2977dfb5018c5cb8069e8eaf6aa68c4 [diff] |
Merge "Updating code due to TaskStackChangeListener changes" into tm-dev am: bc25ec02a2 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17730696 Change-Id: I2cb0a6148e225319f5b9ef187eef68fe1cf7d802 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java index 5d77a6e..d11d50b 100644 --- a/quickstep/src/com/android/quickstep/RecentsModel.java +++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -54,7 +54,7 @@ * Singleton class to load and manage recents model. */ @TargetApi(Build.VERSION_CODES.O) -public class RecentsModel extends TaskStackChangeListener implements IconChangeListener { +public class RecentsModel implements IconChangeListener, TaskStackChangeListener { // We do not need any synchronization for this variable as its only written on UI thread. public static final MainThreadInitializedObject<RecentsModel> INSTANCE =
diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java index f952e0d..f1e20db 100644 --- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java +++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -74,7 +74,6 @@ @Override public void onActivityRotation(int displayId) { - super.onActivityRotation(displayId); // This always gets called before onDisplayInfoChanged() so we know how to process // the rotation in that method. This is done to avoid having a race condition between // the sensor readings and onDisplayInfoChanged() call