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

Commit 5ba782aa authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "1/ Add onStartTransition() callback for SYSUI_STATE_ONE_HANDED_ACTIVE"" into sc-dev am: 68f11944

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

Change-Id: I19ce95452671d15fc83ee5b506c430639106f615
parents 2411f6be 68f11944

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

+3 −12
Original line number Diff line number Diff line
@@ -81,14 +81,6 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 
                @Override

                public void onOneHandedAnimationStart(

                        OneHandedAnimationController.OneHandedTransitionAnimator animator) {

                    final boolean isEntering = animator.getTransitionDirection()

                            == TRANSITION_DIRECTION_TRIGGER;

                    if (!mTransitionCallbacks.isEmpty()) {

                        for (int i = mTransitionCallbacks.size() - 1; i >= 0; i--) {

                            final OneHandedTransitionCallback cb = mTransitionCallbacks.get(i);

                            cb.onStartTransition(isEntering);

                        }

                    }

                }



                @Override
@@ -270,12 +262,11 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer { 
        mLastVisualDisplayBounds.offsetTo(0,

                direction == TRANSITION_DIRECTION_TRIGGER ? offset : 0);

        for (int i = mTransitionCallbacks.size() - 1; i >= 0; i--) {

            final OneHandedTransitionCallback cb = mTransitionCallbacks.get(i);

            cb.onStartTransition(false /* isTransitioning */);

            final OneHandedTransitionCallback callback = mTransitionCallbacks.get(i);

            if (direction == TRANSITION_DIRECTION_TRIGGER) {

                cb.onStartFinished(getLastVisualDisplayBounds());

                callback.onStartFinished(getLastVisualDisplayBounds());

            } else {

                cb.onStopFinished(getLastVisualDisplayBounds());

                callback.onStopFinished(getLastVisualDisplayBounds());

            }

        }

    }

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

+0 −6
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ import android.graphics.Rect; 
 * touch region.(e.g: one handed activated, user tap out regions of displayArea to stop one handed)

 */

public interface OneHandedTransitionCallback {

    /**

     * Called when one handed mode entering or exiting transition starting

     */

    default void onStartTransition(boolean isEntering) {

    }



    /**

     * Called when start one handed transition finished

     */

packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java

+0 −8
Original line number Diff line number Diff line
@@ -235,14 +235,6 @@ public final class WMShell extends SystemUI 
        oneHanded.setThreeButtonModeEnabled(currentMode == NAV_BAR_MODE_3BUTTON);



        oneHanded.registerTransitionCallback(new OneHandedTransitionCallback() {

            @Override

            public void onStartTransition(boolean isEntering) {

                mSysUiMainExecutor.execute(() -> {

                    mSysUiState.setFlag(SYSUI_STATE_ONE_HANDED_ACTIVE,

                            true).commitUpdate(DEFAULT_DISPLAY);

                });

            }



            @Override

            public void onStartFinished(Rect bounds) {

                mSysUiMainExecutor.execute(() -> {