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

Commit 0b4a4455 authored by Bill Lin's avatar Bill Lin
Browse files

2/ Migrate isInOneHanded() in OneHandedState 

It's make sense to let controller manage function states,
and left organizer handle leash & transition stuffs.

Move isInOneHanded() in OneHandedState.java

Controller can get STATEs throught organizer callback:
 - onTransition()
 - onStartFinish()
 - onStopFinsih()

Test: atest WMShellUnitTests
Bug: 185558765
Change-Id: I741b191557ed8e8ca85184d75a7bd8a2573e9b7c
parent 8a8f1172

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

+0 −18
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 
    private final Rect mDefaultDisplayBounds = new Rect();

    private final OneHandedSettingsUtil mOneHandedSettingsUtil;



    // TODO(b/185558765) Remove after OneHandedTransitionState.java merged

    private boolean mIsInOneHanded;

    private int mEnterExitAnimationDurationMs;



    private ArrayMap<WindowContainerToken, SurfaceControl> mDisplayAreaTokenMap = new ArrayMap();
@@ -261,10 +259,6 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 
    @VisibleForTesting

    void finishOffset(int offset,

            @OneHandedAnimationController.TransitionDirection int direction) {

        // Only finishOffset() can update mIsInOneHanded to ensure the state is handle in sequence,

        // the flag *MUST* be updated before dispatch mTransitionCallbacks

        // TODO(b/185558765) Remove after OneHandedTransitionState.java merged

        mIsInOneHanded = (offset > 0 || direction == TRANSITION_DIRECTION_TRIGGER);

        mLastVisualDisplayBounds.offsetTo(0,

                direction == TRANSITION_DIRECTION_TRIGGER ? offset : 0);

        for (int i = mTransitionCallbacks.size() - 1; i >= 0; i--) {
@@ -277,16 +271,6 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 
        }

    }



    /**

     * TODO(b/185558765) Remove after OneHandedTransitionState.java merged

     * The latest state of one handed mode

     *

     * @return true Currently is in one handed mode, otherwise is not in one handed mode

     */

    public boolean isInOneHanded() {

        return mIsInOneHanded;

    }



    /**

     * The latest visual bounds of displayArea translated

     *
@@ -331,8 +315,6 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 
    void dump(@NonNull PrintWriter pw) {

        final String innerPrefix = "  ";

        pw.println(TAG + "states: ");

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

        pw.println(mIsInOneHanded);

        pw.print(innerPrefix + "mDisplayLayout.rotation()=");

        pw.println(mDisplayLayout.rotation());

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