From 08f3d4d675b211b3b1bb4f95192bce15735dd5b0 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Thu, 15 Apr 2021 01:50:02 +0000 Subject: [PATCH] Revert "Make RotationTouchHelper singleton to report single rotation state" This reverts commit d8ad6b25f4a9c7ab156268a2a505d1c1c26ef74e. Reason for revert: b/185382799, b/185383656 Change-Id: Ie500fd5c4f2937df56fbd8afe5556f1a71b90d87 --- .../android/quickstep/RecentsAnimationDeviceState.java | 2 +- .../src/com/android/quickstep/RotationTouchHelper.java | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java index 4a191e16e7..23e35f6307 100644 --- a/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java +++ b/quickstep/src/com/android/quickstep/RecentsAnimationDeviceState.java @@ -138,7 +138,7 @@ public class RecentsAnimationDeviceState implements mDisplayId = mDisplayHolder.getInfo().id; mIsOneHandedModeSupported = SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false); runOnDestroy(() -> mDisplayHolder.removeChangeListener(this)); - mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context); + mRotationTouchHelper = new RotationTouchHelper(context, mDisplayHolder); runOnDestroy(mRotationTouchHelper::destroy); // Register for user unlocked if necessary diff --git a/quickstep/src/com/android/quickstep/RotationTouchHelper.java b/quickstep/src/com/android/quickstep/RotationTouchHelper.java index 1155482d37..2cf32122cf 100644 --- a/quickstep/src/com/android/quickstep/RotationTouchHelper.java +++ b/quickstep/src/com/android/quickstep/RotationTouchHelper.java @@ -28,11 +28,9 @@ import android.view.MotionEvent; import android.view.OrientationEventListener; import com.android.launcher3.testing.TestProtocol; -import com.android.launcher3.util.DisplayController; import com.android.launcher3.util.DisplayController.DisplayHolder; import com.android.launcher3.util.DisplayController.DisplayInfoChangeListener; import com.android.launcher3.util.DisplayController.Info; -import com.android.launcher3.util.MainThreadInitializedObject; import com.android.quickstep.util.RecentsOrientedState; import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.QuickStepContract; @@ -45,9 +43,6 @@ public class RotationTouchHelper implements SysUINavigationMode.NavigationModeChangeListener, DisplayInfoChangeListener { - public static final MainThreadInitializedObject INSTANCE = - new MainThreadInitializedObject<>(RotationTouchHelper::new); - private final OrientationTouchTransformer mOrientationTouchTransformer; private final DisplayHolder mDisplayHolder; private final SysUINavigationMode mSysUiNavMode; @@ -126,9 +121,9 @@ public class RotationTouchHelper implements private final Context mContext; - private RotationTouchHelper(Context context) { + public RotationTouchHelper(Context context, DisplayHolder displayHolder) { mContext = context; - mDisplayHolder = DisplayController.getDefaultDisplay(context); + mDisplayHolder = displayHolder; Resources resources = mContext.getResources(); mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context); mDisplayId = mDisplayHolder.getInfo().id;