Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "1/ Add onStartTransition() callback for SYSUI_STATE_ONE_HANDED_ACTIVE"

Browse Source 
This reverts commit 3e20856215.

Reason for revert: test for b/186197537

Change-Id: Ifd17094f0231b0d6efcf1318cbc86560c5a8f6d1
This commit is contained in:
Bill Lin
2021-04-26 23:35:09 +00:00
parent 3e20856215
commit e3e06447cb
3 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}
}
}

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

@@ -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
*/

8
packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
View File

@@ -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(() -> {