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

Commit 57d54ccd authored by Jason Chang's avatar Jason Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix screen will flicker when swipe-down around NavigationBar to trigger... 

Merge "Fix screen will flicker when swipe-down around NavigationBar to trigger One-Handed mode many times quickly in a short time" into sc-dev am: 7833cf0a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14211065

Change-Id: I3cbc7ab7054d4e8f2f13ed24a2cd488f41335c07
parents bd6d5f6d 7833cf0a

libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java

+31 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.om.IOverlayManager; 
import android.content.om.OverlayInfo;

import android.content.res.Configuration;

import android.database.ContentObserver;

import android.graphics.Rect;

import android.os.Handler;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -61,7 +62,8 @@ import java.io.PrintWriter; 
/**

 * Manages and manipulates the one handed states, transitions, and gesture for phones.

 */

public class OneHandedController implements RemoteCallable<OneHandedController> {

public class OneHandedController implements RemoteCallable<OneHandedController>,

        OneHandedTransitionCallback {

    private static final String TAG = "OneHandedController";



    private static final String ONE_HANDED_MODE_OFFSET_PERCENTAGE =
@@ -73,6 +75,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 


    private volatile boolean mIsOneHandedEnabled;

    private volatile boolean mIsSwipeToNotificationEnabled;

    private volatile boolean mIsTransitioning;

    private boolean mTaskChangeToExit;

    private boolean mLockedDisabled;

    private int mUserId;
@@ -327,7 +330,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 


    @VisibleForTesting

    void startOneHanded() {

        if (isLockedDisabled()) {

        if (isLockedDisabled() || mIsTransitioning) {

            Slog.d(TAG, "Temporary lock disabled");

            return;

        }
@@ -337,6 +340,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 
            return;

        }

        if (!mDisplayAreaOrganizer.isInOneHanded()) {

            mIsTransitioning = true;

            final int yOffSet = Math.round(

                    mDisplayAreaOrganizer.getDisplayLayout().height() * mOffSetFraction);

            mOneHandedAccessibilityUtil.announcementForScreenReader(
@@ -362,7 +366,8 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 
    }



    private void stopOneHanded(int uiEvent) {

        if (mDisplayAreaOrganizer.isInOneHanded()) {

        if (mDisplayAreaOrganizer.isInOneHanded() && !mIsTransitioning) {

            mIsTransitioning = true;

            mOneHandedAccessibilityUtil.announcementForScreenReader(

                    mOneHandedAccessibilityUtil.getOneHandedStopDescription());

            mDisplayAreaOrganizer.scheduleOffset(0, 0);
@@ -391,6 +396,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 
        mDisplayAreaOrganizer.registerTransitionCallback(mGestureHandler);

        mDisplayAreaOrganizer.registerTransitionCallback(mTutorialHandler);

        mDisplayAreaOrganizer.registerTransitionCallback(mBackgroundPanelOrganizer);

        mDisplayAreaOrganizer.registerTransitionCallback(this);

        if (mTaskChangeToExit) {

            mTaskStackListener.addListener(mTaskStackListenerCallback);

        }
@@ -617,6 +623,8 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 
        pw.println(mLockedDisabled);

        pw.print(innerPrefix + "mUserId=");

        pw.println(mUserId);

        pw.print(innerPrefix + "mIsTransitioning=");

        pw.println(mIsTransitioning);



        if (mBackgroundPanelOrganizer != null) {

            mBackgroundPanelOrganizer.dump(pw);
@@ -662,6 +670,26 @@ public class OneHandedController implements RemoteCallable<OneHandedController> 
        }

    }



    /**

     * TODO(b/185558765) To implement a state machine for One-Handed transition state machine.

     * ONE_HANDDE_STATE_TRANSITION {

     * STATE_DEFAULT,

     * STATE_TRANSITIONING,

     * STATE_ENTER_ONE_HANED,

     * STATE_EXIT_ONE_HANDED

     * }

     * and we need to align the state to launcher3 quick steps through SysuiProxy.

     */

    @Override

    public void onStartFinished(Rect bounds) {

        mIsTransitioning = false;

    }



    @Override

    public void onStopFinished(Rect bounds) {

        mIsTransitioning = false;

    }



    /**

     * The interface for calls from outside the Shell, within the host process.

     */