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

Merge "Update PIP menu accessiblity bounds when it is moved" into sc-dev

Browse Source
This commit is contained in:
Jorge Gil
2021-03-10 23:51:52 +00:00
committed by Android (Google) Code Review
parent 11891c768c a5547def07
commit fa63935a61
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java
View File

@@ -121,6 +121,19 @@ public class PhonePipMenuController implements PipMenuController {
}
};
private final float[] mTmpValues = new float[9];
private final Runnable mUpdateEmbeddedMatrix = () -> {
if (mPipMenuView == null || mPipMenuView.getViewRootImpl() == null) {
return;
}
mMoveTransform.getValues(mTmpValues);
try {
mPipMenuView.getViewRootImpl().getAccessibilityEmbeddedConnection()
.setScreenMatrix(mTmpValues);
} catch (RemoteException e) {
}
};
public PhonePipMenuController(Context context, PipMediaController mediaController,
SystemWindows systemWindows, ShellExecutor mainExecutor,
Handler mainHandler) {
@@ -306,6 +319,11 @@ public class PhonePipMenuController implements PipMenuController {
} else {
mApplier.scheduleApply(params);
}
if (mPipMenuView.getViewRootImpl() != null) {
mPipMenuView.getHandler().removeCallbacks(mUpdateEmbeddedMatrix);
mPipMenuView.getHandler().post(mUpdateEmbeddedMatrix);
}
}
/**

8
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/PipAppHelper.kt
View File

@@ -17,7 +17,6 @@
package com.android.wm.shell.flicker.helpers
import android.app.Instrumentation
import android.graphics.Point
import android.media.session.MediaController
import android.media.session.MediaSessionManager
import android.os.SystemClock
@@ -135,11 +134,8 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper(
expandPipWindow(wmHelper)
val exitPipObject = uiDevice.findObject(By.res(SYSTEMUI_PACKAGE, "dismiss"))
requireNotNull(exitPipObject) { "PIP window dismiss button not found" }
val coordinatesInWindow = exitPipObject.visibleBounds
val windowOffset = wmHelper.getWindowRegion(component).bounds
val newCoordinates = Point(windowOffset.left + coordinatesInWindow.centerX(),
windowOffset.top + coordinatesInWindow.centerY())
uiDevice.click(newCoordinates.x, newCoordinates.y)
val dismissButtonBounds = exitPipObject.visibleBounds
uiDevice.click(dismissButtonBounds.centerX(), dismissButtonBounds.centerY())
}
// Wait for animation to complete.