commit 5b7bf9147b7cf99116f4ed28dd367444b4876d26
author Winson Chung <winsonc@google.com> Mon Jul 20 13:57:56 2020 -0700
committer Winson Chung <winsonc@google.com> Mon Jul 20 22:05:46 2020 +0000
tree 8d649d8f655d1b41a75c9166b32079138b74bb3e
parent 008c2d17c8e8525f1459691df1c6244872fbecc2

Create a new instance of rotation touch helper per device state

Change-Id: I4e4288eaf37aab5bf0b8115f5e06e64459c20f00
(cherry picked from commit 00850fb588bf7b33b49d4771883039d5fd70be81)

quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java

diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
index dd80bd7..7a6bbb4 100644
--- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
+++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java
@@ -114,7 +114,7 @@
         mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);
         mDisplayId = mDefaultDisplay.getInfo().id;
         runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));
-        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);
+        mRotationTouchHelper = new RotationTouchHelper(context);
         runOnDestroy(mRotationTouchHelper::destroy);
 
         // Register for user unlocked if necessary

quickstep/src/com/android/quickstep/RotationTouchHelper.java

diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
index d89ca10..5f3c022 100644
--- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java
+++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java
@@ -41,8 +41,6 @@
 public class RotationTouchHelper implements
         SysUINavigationMode.NavigationModeChangeListener,
         DefaultDisplay.DisplayInfoChangeListener {
-    public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =
-            new MainThreadInitializedObject<>(RotationTouchHelper::new);
 
     private final OrientationTouchTransformer mOrientationTouchTransformer;
     private final DefaultDisplay mDefaultDisplay;
@@ -122,7 +120,7 @@
 
     private final Context mContext;
 
-    private RotationTouchHelper(Context context) {
+    public RotationTouchHelper(Context context) {
         mContext = context;
         Resources resources = mContext.getResources();
         mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);