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

Commit 355ceb1a authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Create a new instance of rotation touch helper per device state" into ub-launcher3-master

parents 63c64097 00850fb5

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ public class RecentsAnimationDeviceState implements 
        mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);

        mDefaultDisplay = DefaultDisplay.INSTANCE.get(context);

        mDisplayId = mDefaultDisplay.getInfo().id;

        mDisplayId = mDefaultDisplay.getInfo().id;

        runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));

        runOnDestroy(() -> mDefaultDisplay.removeChangeListener(this));

        mRotationTouchHelper = RotationTouchHelper.INSTANCE.get(context);

        mRotationTouchHelper = new RotationTouchHelper(context);

        runOnDestroy(mRotationTouchHelper::destroy);

        runOnDestroy(mRotationTouchHelper::destroy);





        // Register for user unlocked if necessary

        // Register for user unlocked if necessary

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -41,8 +41,6 @@ import java.util.ArrayList; 
public class RotationTouchHelper implements

public class RotationTouchHelper implements

        SysUINavigationMode.NavigationModeChangeListener,

        SysUINavigationMode.NavigationModeChangeListener,

        DefaultDisplay.DisplayInfoChangeListener {

        DefaultDisplay.DisplayInfoChangeListener {

    public static final MainThreadInitializedObject<RotationTouchHelper> INSTANCE =

            new MainThreadInitializedObject<>(RotationTouchHelper::new);





    private final OrientationTouchTransformer mOrientationTouchTransformer;

    private final OrientationTouchTransformer mOrientationTouchTransformer;

    private final DefaultDisplay mDefaultDisplay;

    private final DefaultDisplay mDefaultDisplay;
@@ -122,7 +120,7 @@ public class RotationTouchHelper implements 




    private final Context mContext;

    private final Context mContext;





    private RotationTouchHelper(Context context) {

    public RotationTouchHelper(Context context) {

        mContext = context;

        mContext = context;

        Resources resources = mContext.getResources();

        Resources resources = mContext.getResources();

        mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);

        mSysUiNavMode = SysUINavigationMode.INSTANCE.get(context);