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

Commit bb1e047d authored by Bill Lin's avatar Bill Lin
Browse files

Revert "Revert "2/ Resolve gesture one handed conflicts swipe up..." 

Revert "Revert "1/ Add onStartTransition() callback for SYSUI_ST..."

Revert submission 14315426-revert_fix_ohm_exit_flicker

Reason for revert: The root cause of b/186197537 is ag/14296935
I should safe to re-landing the 2 CLs

Reverted Changes: 
Ifd17094f0:Revert "1/ Add onStartTransition() callback for SY...
Ia921d073c:Revert "2/ Resolve gesture one handed conflicts sw...

Change-Id: If2164819e96919ca8c0c184639b3cbff0f91caf5
parent d7b6a429

quickstep/src/com/android/quickstep/TouchInteractionService.java

+3 −3
Original line number Diff line number Diff line
@@ -506,7 +506,8 @@ public class TouchInteractionService extends Service implements PluginListener<O 
            }

            mRotationTouchHelper.setOrientationTransformIfNeeded(event);



            if (mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {

            if (!mDeviceState.isOneHandedModeActive()

                    && mRotationTouchHelper.isInSwipeUpTouchRegion(event)) {

                if (TestProtocol.sDebugTracing) {

                    Log.d(TestProtocol.NO_SWIPE_TO_HOME,

                            "TouchInteractionService.onInputEvent:isInSwipeUpTouchRegion");
@@ -535,8 +536,7 @@ public class TouchInteractionService extends Service implements PluginListener<O 
                            InputConsumer.NO_OP, mInputMonitorCompat,

                            mDeviceState,

                            event);

                } else if (mDeviceState.canTriggerOneHandedAction(event)

                    && !mDeviceState.isOneHandedModeActive()) {

                } else if (mDeviceState.canTriggerOneHandedAction(event)) {

                    // Consume gesture event for triggering one handed feature.

                    mUncheckedConsumer = new OneHandedModeInputConsumer(this, mDeviceState,

                        InputConsumer.NO_OP, mInputMonitorCompat);