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

Merge "Re-map DisplayAreaAppearedInfo to token-leash map" into sc-dev am: 9cc46e4fe3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I334c4e60c84a6f37e02ad25cef10231d56880d68
This commit is contained in:
TreeHugger Robot
2021-01-29 06:36:16 +00:00
committed by Automerger Merge Worker
parent 34b036f0e6 9cc46e4fe3
commit 2ed6bdf0fe
4 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedAnimationController.java
View File

@@ -24,6 +24,7 @@ import android.graphics.Rect;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.animation.Interpolator; import android.view.animation.Interpolator;
import android.view.animation.OvershootInterpolator; import android.view.animation.OvershootInterpolator;
import android.window.WindowContainerToken;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
@@ -55,7 +56,7 @@ public class OneHandedAnimationController {
private final Interpolator mOvershootInterpolator; private final Interpolator mOvershootInterpolator;
private final OneHandedSurfaceTransactionHelper mSurfaceTransactionHelper; private final OneHandedSurfaceTransactionHelper mSurfaceTransactionHelper;
private final HashMap<SurfaceControl, OneHandedTransitionAnimator> mAnimatorMap = private final HashMap<WindowContainerToken, OneHandedTransitionAnimator> mAnimatorMap =
new HashMap<>(); new HashMap<>();
/** /**
@@ -67,23 +68,23 @@ public class OneHandedAnimationController {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
OneHandedTransitionAnimator getAnimator(SurfaceControl leash, Rect startBounds, OneHandedTransitionAnimator getAnimator(WindowContainerToken token, SurfaceControl leash,
Rect endBounds) { Rect startBounds, Rect endBounds) {
final OneHandedTransitionAnimator animator = mAnimatorMap.get(leash); final OneHandedTransitionAnimator animator = mAnimatorMap.get(token);
if (animator == null) { if (animator == null) {
mAnimatorMap.put(leash, setupOneHandedTransitionAnimator( mAnimatorMap.put(token, setupOneHandedTransitionAnimator(
OneHandedTransitionAnimator.ofBounds(leash, startBounds, endBounds))); OneHandedTransitionAnimator.ofBounds(token, leash, startBounds, endBounds)));
} else if (animator.isRunning()) { } else if (animator.isRunning()) {
animator.updateEndValue(endBounds); animator.updateEndValue(endBounds);
} else { } else {
animator.cancel(); animator.cancel();
mAnimatorMap.put(leash, setupOneHandedTransitionAnimator( mAnimatorMap.put(token, setupOneHandedTransitionAnimator(
OneHandedTransitionAnimator.ofBounds(leash, startBounds, endBounds))); OneHandedTransitionAnimator.ofBounds(token, leash, startBounds, endBounds)));
} }
return mAnimatorMap.get(leash); return mAnimatorMap.get(token);
} }
HashMap<SurfaceControl, OneHandedTransitionAnimator> getAnimatorMap() { HashMap<WindowContainerToken, OneHandedTransitionAnimator> getAnimatorMap() {
return mAnimatorMap; return mAnimatorMap;
} }
@@ -91,8 +92,8 @@ public class OneHandedAnimationController {
return mAnimatorMap.isEmpty(); return mAnimatorMap.isEmpty();
} }
void removeAnimator(SurfaceControl key) { void removeAnimator(WindowContainerToken token) {
final OneHandedTransitionAnimator animator = mAnimatorMap.remove(key); final OneHandedTransitionAnimator animator = mAnimatorMap.remove(token);
if (animator != null && animator.isRunning()) { if (animator != null && animator.isRunning()) {
animator.cancel(); animator.cancel();
} }
@@ -116,6 +117,7 @@ public class OneHandedAnimationController {
ValueAnimator.AnimatorListener { ValueAnimator.AnimatorListener {
private final SurfaceControl mLeash; private final SurfaceControl mLeash;
private final WindowContainerToken mToken;
private T mStartValue; private T mStartValue;
private T mEndValue; private T mEndValue;
private T mCurrentValue; private T mCurrentValue;
@@ -128,8 +130,10 @@ public class OneHandedAnimationController {
private @TransitionDirection int mTransitionDirection; private @TransitionDirection int mTransitionDirection;
private OneHandedTransitionAnimator(SurfaceControl leash, T startValue, T endValue) { private OneHandedTransitionAnimator(WindowContainerToken token, SurfaceControl leash,
T startValue, T endValue) {
mLeash = leash; mLeash = leash;
mToken = token;
mStartValue = startValue; mStartValue = startValue;
mEndValue = endValue; mEndValue = endValue;
addListener(this); addListener(this);
@@ -208,8 +212,8 @@ public class OneHandedAnimationController {
return this; return this;
} }
SurfaceControl getLeash() { WindowContainerToken getToken() {
return mLeash; return mToken;
} }
Rect getDestinationBounds() { Rect getDestinationBounds() {
@@ -254,10 +258,10 @@ public class OneHandedAnimationController {
} }
@VisibleForTesting @VisibleForTesting
static OneHandedTransitionAnimator<Rect> ofBounds(SurfaceControl leash, static OneHandedTransitionAnimator<Rect> ofBounds(WindowContainerToken token,
Rect startValue, Rect endValue) { SurfaceControl leash, Rect startValue, Rect endValue) {
return new OneHandedTransitionAnimator<Rect>(leash, new Rect(startValue), return new OneHandedTransitionAnimator<Rect>(token, leash, new Rect(startValue),
new Rect(endValue)) { new Rect(endValue)) {
private final Rect mTmpRect = new Rect(); private final Rect mTmpRect = new Rect();

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

@@ -26,11 +26,11 @@ import android.graphics.Point;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.window.DisplayAreaAppearedInfo; import android.window.DisplayAreaAppearedInfo;
import android.window.DisplayAreaInfo; import android.window.DisplayAreaInfo;
import android.window.DisplayAreaOrganizer; import android.window.DisplayAreaOrganizer;
import android.window.WindowContainerToken;
import android.window.WindowContainerTransaction; import android.window.WindowContainerTransaction;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -44,8 +44,6 @@ import com.android.wm.shell.common.ShellExecutor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.concurrent.Executor;
/** /**
* Manages OneHanded display areas such as offset. * Manages OneHanded display areas such as offset.
@@ -69,7 +67,7 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
private int mEnterExitAnimationDurationMs; private int mEnterExitAnimationDurationMs;
@VisibleForTesting @VisibleForTesting
ArrayMap<DisplayAreaInfo, SurfaceControl> mDisplayAreaMap = new ArrayMap(); ArrayMap<WindowContainerToken, SurfaceControl> mDisplayAreaTokenMap = new ArrayMap();
private DisplayController mDisplayController; private DisplayController mDisplayController;
private OneHandedAnimationController mAnimationController; private OneHandedAnimationController mAnimationController;
private OneHandedSurfaceTransactionHelper.SurfaceControlTransactionFactory private OneHandedSurfaceTransactionHelper.SurfaceControlTransactionFactory
@@ -89,7 +87,7 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
@Override @Override
public void onOneHandedAnimationEnd(SurfaceControl.Transaction tx, public void onOneHandedAnimationEnd(SurfaceControl.Transaction tx,
OneHandedAnimationController.OneHandedTransitionAnimator animator) { OneHandedAnimationController.OneHandedTransitionAnimator animator) {
mAnimationController.removeAnimator(animator.getLeash()); mAnimationController.removeAnimator(animator.getToken());
if (mAnimationController.isAnimatorsConsumed()) { if (mAnimationController.isAnimatorsConsumed()) {
finishOffset(animator.getDestinationOffset(), finishOffset(animator.getDestinationOffset(),
animator.getTransitionDirection()); animator.getTransitionDirection());
@@ -99,7 +97,7 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
@Override @Override
public void onOneHandedAnimationCancel( public void onOneHandedAnimationCancel(
OneHandedAnimationController.OneHandedTransitionAnimator animator) { OneHandedAnimationController.OneHandedTransitionAnimator animator) {
mAnimationController.removeAnimator(animator.getLeash()); mAnimationController.removeAnimator(animator.getToken());
if (mAnimationController.isAnimatorsConsumed()) { if (mAnimationController.isAnimatorsConsumed()) {
finishOffset(animator.getDestinationOffset(), finishOffset(animator.getDestinationOffset(),
animator.getTransitionDirection()); animator.getTransitionDirection());
@@ -119,7 +117,6 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
super(mainExecutor); super(mainExecutor);
mAnimationController = animationController; mAnimationController = animationController;
mDisplayController = displayController; mDisplayController = displayController;
mDefaultDisplayBounds.set(getDisplayBounds());
mLastVisualDisplayBounds.set(getDisplayBounds()); mLastVisualDisplayBounds.set(getDisplayBounds());
final int animationDurationConfig = context.getResources().getInteger( final int animationDurationConfig = context.getResources().getInteger(
R.integer.config_one_handed_translate_animation_duration); R.integer.config_one_handed_translate_animation_duration);
@@ -134,24 +131,12 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
@Override @Override
public void onDisplayAreaAppeared(@NonNull DisplayAreaInfo displayAreaInfo, public void onDisplayAreaAppeared(@NonNull DisplayAreaInfo displayAreaInfo,
@NonNull SurfaceControl leash) { @NonNull SurfaceControl leash) {
Objects.requireNonNull(displayAreaInfo, "displayAreaInfo must not be null"); mDisplayAreaTokenMap.put(displayAreaInfo.token, leash);
Objects.requireNonNull(leash, "leash must not be null");
if (mDisplayAreaMap.get(displayAreaInfo) == null) {
// mDefaultDisplayBounds may out of date after removeDisplayChangingController()
mDefaultDisplayBounds.set(getDisplayBounds());
mDisplayAreaMap.put(displayAreaInfo, leash);
}
} }
@Override @Override
public void onDisplayAreaVanished(@NonNull DisplayAreaInfo displayAreaInfo) { public void onDisplayAreaVanished(@NonNull DisplayAreaInfo displayAreaInfo) {
Objects.requireNonNull(displayAreaInfo, mDisplayAreaTokenMap.remove(displayAreaInfo.token);
"Requires valid displayArea, and displayArea must not be null");
if (!mDisplayAreaMap.containsKey(displayAreaInfo)) {
Log.w(TAG, "Unrecognized token: " + displayAreaInfo.token);
return;
}
mDisplayAreaMap.remove(displayAreaInfo);
} }
@Override @Override
@@ -162,6 +147,7 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
final DisplayAreaAppearedInfo info = displayAreaInfos.get(i); final DisplayAreaAppearedInfo info = displayAreaInfos.get(i);
onDisplayAreaAppeared(info.getDisplayAreaInfo(), info.getLeash()); onDisplayAreaAppeared(info.getDisplayAreaInfo(), info.getLeash());
} }
mDefaultDisplayBounds.set(getDisplayBounds());
return displayAreaInfos; return displayAreaInfos;
} }
@@ -176,9 +162,9 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
* handles 90 degree display rotation changes {@link Surface.Rotation}. * handles 90 degree display rotation changes {@link Surface.Rotation}.
* *
* @param fromRotation starting rotation of the display. * @param fromRotation starting rotation of the display.
* @param toRotation target rotation of the display (after rotating). * @param toRotation target rotation of the display (after rotating).
* @param wct A task transaction {@link WindowContainerTransaction} from * @param wct A task transaction {@link WindowContainerTransaction} from
* {@link DisplayChangeController} to populate. * {@link DisplayChangeController} to populate.
*/ */
public void onRotateDisplay(int fromRotation, int toRotation, WindowContainerTransaction wct) { public void onRotateDisplay(int fromRotation, int toRotation, WindowContainerTransaction wct) {
// Stop one handed without animation and reset cropped size immediately // Stop one handed without animation and reset cropped size immediately
@@ -210,11 +196,11 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
: TRANSITION_DIRECTION_EXIT; : TRANSITION_DIRECTION_EXIT;
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
mDisplayAreaMap.forEach( mDisplayAreaTokenMap.forEach(
(key, leash) -> { (token, leash) -> {
animateWindows(leash, fromBounds, toBounds, direction, animateWindows(token, leash, fromBounds, toBounds, direction,
mEnterExitAnimationDurationMs); mEnterExitAnimationDurationMs);
wct.setBounds(key.token, toBounds); wct.setBounds(token, toBounds);
}); });
applyTransaction(wct); applyTransaction(wct);
} }
@@ -222,10 +208,10 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
private void resetWindowsOffset(WindowContainerTransaction wct) { private void resetWindowsOffset(WindowContainerTransaction wct) {
final SurfaceControl.Transaction tx = final SurfaceControl.Transaction tx =
mSurfaceControlTransactionFactory.getTransaction(); mSurfaceControlTransactionFactory.getTransaction();
mDisplayAreaMap.forEach( mDisplayAreaTokenMap.forEach(
(key, leash) -> { (token, leash) -> {
final OneHandedAnimationController.OneHandedTransitionAnimator animator = final OneHandedAnimationController.OneHandedTransitionAnimator animator =
mAnimationController.getAnimatorMap().remove(leash); mAnimationController.getAnimatorMap().remove(token);
if (animator != null && animator.isRunning()) { if (animator != null && animator.isRunning()) {
animator.cancel(); animator.cancel();
} }
@@ -233,16 +219,17 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
.setWindowCrop(leash, -1/* reset */, -1/* reset */); .setWindowCrop(leash, -1/* reset */, -1/* reset */);
// DisplayRotationController will applyTransaction() after finish rotating // DisplayRotationController will applyTransaction() after finish rotating
if (wct != null) { if (wct != null) {
wct.setBounds(key.token, null/* reset */); wct.setBounds(token, null/* reset */);
} }
}); });
tx.apply(); tx.apply();
} }
private void animateWindows(SurfaceControl leash, Rect fromBounds, Rect toBounds, private void animateWindows(WindowContainerToken token, SurfaceControl leash, Rect fromBounds,
@OneHandedAnimationController.TransitionDirection int direction, int durationMs) { Rect toBounds, @OneHandedAnimationController.TransitionDirection int direction,
int durationMs) {
final OneHandedAnimationController.OneHandedTransitionAnimator animator = final OneHandedAnimationController.OneHandedTransitionAnimator animator =
mAnimationController.getAnimator(leash, fromBounds, toBounds); mAnimationController.getAnimator(token, leash, fromBounds, toBounds);
if (animator != null) { if (animator != null) {
animator.setTransitionDirection(direction) animator.setTransitionDirection(direction)
.addOneHandedAnimationCallback(mOneHandedAnimationCallback) .addOneHandedAnimationCallback(mOneHandedAnimationCallback)
@@ -311,8 +298,8 @@ public class OneHandedDisplayAreaOrganizer extends DisplayAreaOrganizer {
pw.println(TAG + "states: "); pw.println(TAG + "states: ");
pw.print(innerPrefix + "mIsInOneHanded="); pw.print(innerPrefix + "mIsInOneHanded=");
pw.println(mIsInOneHanded); pw.println(mIsInOneHanded);
pw.print(innerPrefix + "mDisplayAreaMap="); pw.print(innerPrefix + "mDisplayAreaTokenMap=");
pw.println(mDisplayAreaMap); pw.println(mDisplayAreaTokenMap);
pw.print(innerPrefix + "mDefaultDisplayBounds="); pw.print(innerPrefix + "mDefaultDisplayBounds=");
pw.println(mDefaultDisplayBounds); pw.println(mDefaultDisplayBounds);
pw.print(innerPrefix + "mLastVisualDisplayBounds="); pw.print(innerPrefix + "mLastVisualDisplayBounds=");

5
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedAnimationControllerTest.java
View File

@@ -22,6 +22,7 @@ import android.graphics.Rect;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper; import android.testing.TestableLooper;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.window.WindowContainerToken;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
@@ -50,6 +51,8 @@ public class OneHandedAnimationControllerTest extends OneHandedTestCase {
@Mock @Mock
private SurfaceControl mMockLeash; private SurfaceControl mMockLeash;
@Mock
private WindowContainerToken mMockToken;
@Mock @Mock
private ShellExecutor mMainExecutor; private ShellExecutor mMainExecutor;
@@ -69,7 +72,7 @@ public class OneHandedAnimationControllerTest extends OneHandedTestCase {
destinationBounds.offset(0, 300); destinationBounds.offset(0, 300);
final OneHandedAnimationController.OneHandedTransitionAnimator animator = final OneHandedAnimationController.OneHandedTransitionAnimator animator =
mOneHandedAnimationController mOneHandedAnimationController
.getAnimator(mMockLeash, originalBounds, destinationBounds); .getAnimator(mMockToken, mMockLeash, originalBounds, destinationBounds);
assertNotNull(animator); assertNotNull(animator);
} }

11
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedDisplayAreaOrganizerTest.java
View File

@@ -24,13 +24,14 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyFloat;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.any; import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Handler; import android.os.Binder;
import android.testing.AndroidTestingRunner; import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper; import android.testing.TestableLooper;
import android.view.Display; import android.view.Display;
@@ -89,12 +90,14 @@ public class OneHandedDisplayAreaOrganizerTest extends OneHandedTestCase {
public void setUp() throws Exception { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mTestableLooper = TestableLooper.get(this); mTestableLooper = TestableLooper.get(this);
Binder binder = new Binder();
doReturn(binder).when(mMockRealToken).asBinder();
mToken = new WindowContainerToken(mMockRealToken); mToken = new WindowContainerToken(mMockRealToken);
mLeash = new SurfaceControl(); mLeash = new SurfaceControl();
mDisplay = mContext.getDisplay(); mDisplay = mContext.getDisplay();
mDisplayAreaInfo = new DisplayAreaInfo(mToken, DEFAULT_DISPLAY, FEATURE_ONE_HANDED); mDisplayAreaInfo = new DisplayAreaInfo(mToken, DEFAULT_DISPLAY, FEATURE_ONE_HANDED);
mDisplayAreaInfo.configuration.orientation = Configuration.ORIENTATION_PORTRAIT; mDisplayAreaInfo.configuration.orientation = Configuration.ORIENTATION_PORTRAIT;
when(mMockAnimationController.getAnimator(any(), any(), any())).thenReturn(null); when(mMockAnimationController.getAnimator(any(), any(), any(), any())).thenReturn(null);
when(mMockDisplayController.getDisplay(anyInt())).thenReturn(mDisplay); when(mMockDisplayController.getDisplay(anyInt())).thenReturn(mDisplay);
when(mMockSurfaceTransactionHelper.translate(any(), any(), anyFloat())).thenReturn( when(mMockSurfaceTransactionHelper.translate(any(), any(), anyFloat())).thenReturn(
mMockSurfaceTransactionHelper); mMockSurfaceTransactionHelper);
@@ -121,7 +124,7 @@ public class OneHandedDisplayAreaOrganizerTest extends OneHandedTestCase {
public void testOnDisplayAreaAppeared() { public void testOnDisplayAreaAppeared() {
mDisplayAreaOrganizer.onDisplayAreaAppeared(mDisplayAreaInfo, mLeash); mDisplayAreaOrganizer.onDisplayAreaAppeared(mDisplayAreaInfo, mLeash);
verify(mMockAnimationController, never()).getAnimator(any(), any(), any()); verify(mMockAnimationController, never()).getAnimator(any(), any(), any(), any());
} }
@Test @Test
@@ -129,7 +132,7 @@ public class OneHandedDisplayAreaOrganizerTest extends OneHandedTestCase {
mDisplayAreaOrganizer.onDisplayAreaAppeared(mDisplayAreaInfo, mLeash); mDisplayAreaOrganizer.onDisplayAreaAppeared(mDisplayAreaInfo, mLeash);
mDisplayAreaOrganizer.onDisplayAreaVanished(mDisplayAreaInfo); mDisplayAreaOrganizer.onDisplayAreaVanished(mDisplayAreaInfo);
assertThat(mDisplayAreaOrganizer.mDisplayAreaMap).isEmpty(); assertThat(mDisplayAreaOrganizer.mDisplayAreaTokenMap).isEmpty();
} }
@Test @Test