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

3 files changed, 3 insertions, 26 deletions

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java
index 4b4d934bef43..6bd960397fae 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizer.java
@@ -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());
             }
         }
     }
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTransitionCallback.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTransitionCallback.java
index e8291862947b..3af7c4b71d0a 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTransitionCallback.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedTransitionCallback.java
@@ -24,12 +24,6 @@ import android.graphics.Rect;
  */
 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
      */
     default void onStartFinished(Rect bounds) {
diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
index 74077a2482d1..81bb819d77ea 100644
--- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
+++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
@@ -236,14 +236,6 @@ public final class WMShell extends SystemUI
 
         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(() -> {
                     mSysUiState.setFlag(SYSUI_STATE_ONE_HANDED_ACTIVE,