From e3e06447cb6fb274319570102405f36a1e07a2c4 Mon Sep 17 00:00:00 2001
From: Bill Lin <lbill@google.com>
Date: Mon, 26 Apr 2021 23:35:09 +0000
Subject: [PATCH] Revert "1/ Add onStartTransition() callback for
 SYSUI_STATE_ONE_HANDED_ACTIVE"

This reverts commit 3e208562150aed2dfcacd3ebe9c50b5c04a67c0f.

Reason for revert: test for b/186197537

Change-Id: Ifd17094f0231b0d6efcf1318cbc86560c5a8f6d1
---
 .../onehanded/OneHandedDisplayAreaOrganizer.java  | 15 +++------------
 .../onehanded/OneHandedTransitionCallback.java    |  6 ------
 .../src/com/android/systemui/wmshell/WMShell.java |  8 --------
 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 390985c09dcc9..d1b3f1a2e8a54 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
@@ -82,14 +82,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
@@ -274,12 +266,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 e8291862947b5..3af7c4b71d0ac 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
@@ -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
      */
diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
index 74077a2482d13..81bb819d77eac 100644
--- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
+++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
@@ -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(() -> {