Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08f3d4d6 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Revert "Make RotationTouchHelper singleton to report single rotation state" 

This reverts commit d8ad6b25.

Reason for revert: b/185382799, b/185383656

Change-Id: Ie500fd5c4f2937df56fbd8afe5556f1a71b90d87
parent d8ad6b25

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

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+2 −7
Original line number Diff line number Diff line
@@ -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<RotationTouchHelper> 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;