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

Merge "Support following typing foucs in window mode [2/n]."

Browse Source
This commit is contained in:
Daniel Hsieh
2022-01-07 02:27:49 +00:00
committed by Android (Google) Code Review
parent 6ecdc3894b 8cdb9fedb9
commit 53d247ace8
9 changed files with 248 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/accessibility/IWindowMagnificationConnectionCallback.aidl
View File

@@ -67,4 +67,13 @@ import android.graphics.Rect;
*/
void onAccessibilityActionPerformed(int displayId);
/**
* Called when the user is performing dragging gesture. It is started after the offset
* between the down location and the move event location exceed
* {@link ViewConfiguration#getScaledTouchSlop()}.
*
* @param displayId The logical display id.
*/
void onDrag(int displayId);
}

7
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnification.java
View File

@@ -224,6 +224,13 @@ public class WindowMagnification extends CoreStartable implements WindowMagnifie
}
}
@Override
public void onDrag(int displayId) {
if (mWindowMagnificationConnectionImpl != null) {
mWindowMagnificationConnectionImpl.onDrag(displayId);
}
}
@Override
public void requestWindowMagnificationConnection(boolean connect) {
if (connect) {

10
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationConnectionImpl.java
View File

@@ -142,4 +142,14 @@ class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.S
}
}
}
void onDrag(int displayId) {
if (mConnectionCallback != null) {
try {
mConnectionCallback.onDrag(displayId);
} catch (RemoteException e) {
Log.e(TAG, "Failed to inform taking control by a user", e);
}
}
}
}

1
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationController.java
View File

@@ -964,6 +964,7 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
@Override
public boolean onDrag(float offsetX, float offsetY) {
moveWindowMagnifier(offsetX, offsetY);
mWindowMagnifierCallback.onDrag(mDisplayId);
return true;
}

10
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnifierCallback.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.accessibility;
import android.graphics.Rect;
import android.view.ViewConfiguration;
/**
* A callback to inform {@link com.android.server.accessibility.AccessibilityManagerService} about
@@ -53,4 +54,13 @@ interface WindowMagnifierCallback {
* @param displayId The logical display id.
*/
void onAccessibilityActionPerformed(int displayId);
/**
* Called when the user is performing dragging gesture. It is started after the offset
* between the down location and the move event location exceed
* {@link ViewConfiguration#getScaledTouchSlop()}.
*
* @param displayId The logical display id.
*/
void onDrag(int displayId);
}

10
packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationTest.java
View File

@@ -148,6 +148,16 @@ public class WindowMagnificationTest extends SysuiTestCase {
verify(mConnectionCallback).onAccessibilityActionPerformed(TEST_DISPLAY);
}
@Test
public void onDrag_enabled_notifyCallback() throws RemoteException {
mCommandQueue.requestWindowMagnificationConnection(true);
waitForIdleSync();
mWindowMagnification.onDrag(TEST_DISPLAY);
verify(mConnectionCallback).onDrag(TEST_DISPLAY);
}
@Test
public void onConfigurationChanged_updateModeSwitches() {
final Configuration config = new Configuration();

1
services/accessibility/java/com/android/server/accessibility/magnification/MagnificationController.java
View File

@@ -437,6 +437,7 @@ public class MagnificationController implements WindowMagnificationManager.Callb
synchronized (mLock) {
mImeWindowVisible = shown;
}
getWindowMagnificationMgr().onImeWindowVisibilityChanged(shown);
logMagnificationModeWithImeOnIfNeeded();
}

107
services/accessibility/java/com/android/server/accessibility/magnification/WindowMagnificationManager.java
View File

@@ -299,13 +299,66 @@ public class WindowMagnificationManager implements
@Override
public void onRectangleOnScreenRequested(int displayId, int left, int top, int right,
int bottom) {
// TODO(b/194668976): We will implement following typing focus in window mode after
// our refactor.
float toCenterX = (float) (left + right) / 2;
float toCenterY = (float) (top + bottom) / 2;
if (!isPositionInSourceBounds(displayId, toCenterX, toCenterY)
&& isTrackingTypingFocusEnabled(displayId)) {
enableWindowMagnification(displayId, Float.NaN, toCenterX, toCenterY);
}
}
/**
* Enable or disable tracking typing focus for the specific magnification window.
*
* The tracking typing focus should be set to enabled with the following conditions:
* 1. IME is shown.
*
* The tracking typing focus should be set to disabled with the following conditions:
* 1. A user drags the magnification window by 1 finger.
* 2. A user scroll the magnification window by 2 fingers.
*
* @param displayId The logical display id.
* @param trackingTypingFocusEnabled Enabled or disable the function of tracking typing focus.
*/
private void setTrackingTypingFocusEnabled(int displayId, boolean trackingTypingFocusEnabled) {
synchronized (mLock) {
WindowMagnifier magnifier = mWindowMagnifiers.get(displayId);
if (magnifier == null) {
return;
}
magnifier.setTrackingTypingFocusEnabled(trackingTypingFocusEnabled);
}
}
/**
* Enable tracking typing focus function for all magnifications.
*/
private void enableAllTrackingTypingFocus() {
synchronized (mLock) {
for (int i = 0; i < mWindowMagnifiers.size(); i++) {
WindowMagnifier magnifier = mWindowMagnifiers.valueAt(i);
magnifier.setTrackingTypingFocusEnabled(true);
}
}
}
/**
* Called when the IME window visibility changed.
*
* @param shown {@code true} means the IME window shows on the screen. Otherwise, it's hidden.
*/
void onImeWindowVisibilityChanged(boolean shown) {
if (shown) {
enableAllTrackingTypingFocus();
}
}
@Override
public boolean processScroll(int displayId, float distanceX, float distanceY) {
moveWindowMagnification(displayId, -distanceX, -distanceY);
setTrackingTypingFocusEnabled(displayId, false);
return /* event consumed: */ true;
}
@@ -477,6 +530,16 @@ public class WindowMagnificationManager implements
}
}
boolean isPositionInSourceBounds(int displayId, float x, float y) {
synchronized (mLock) {
WindowMagnifier magnifier = mWindowMagnifiers.get(displayId);
if (magnifier == null) {
return false;
}
return magnifier.isPositionInSourceBounds(x, y);
}
}
/**
* Indicates whether window magnification is enabled on specified display.
*
@@ -606,6 +669,16 @@ public class WindowMagnificationManager implements
}
}
boolean isTrackingTypingFocusEnabled(int displayId) {
synchronized (mLock) {
WindowMagnifier magnifier = mWindowMagnifiers.get(displayId);
if (magnifier == null) {
return false;
}
return magnifier.isTrackingTypingFocusEnabled();
}
}
/**
* Populates magnified bounds on the screen. And the populated magnified bounds would be
* empty If window magnifier is not activated.
@@ -722,6 +795,17 @@ public class WindowMagnificationManager implements
mCallback.onAccessibilityActionPerformed(displayId);
}
@Override
public void onDrag(int displayId) {
if (mTrace.isA11yTracingEnabledForTypes(
FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + "ConnectionCallback.onDrag",
FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
"displayId=" + displayId);
}
setTrackingTypingFocusEnabled(displayId, false);
}
@Override
public void binderDied() {
synchronized (mLock) {
@@ -758,7 +842,9 @@ public class WindowMagnificationManager implements
private int mIdOfLastServiceToControl = INVALID_SERVICE_ID;
private PointF mMagnificationFrameOffsetRatio = new PointF(0f, 0f);
private final PointF mMagnificationFrameOffsetRatio = new PointF(0f, 0f);
private boolean mTrackingTypingFocusEnabled = true;
WindowMagnifier(int displayId, WindowMagnificationManager windowMagnificationManager) {
mDisplayId = displayId;
@@ -799,7 +885,6 @@ public class WindowMagnificationManager implements
}
}
@GuardedBy("mLock")
boolean disableWindowMagnificationInternal(
@Nullable MagnificationAnimationCallback animationResultCallback) {
if (!mEnabled) {
@@ -809,6 +894,7 @@ public class WindowMagnificationManager implements
mDisplayId, animationResultCallback)) {
mEnabled = false;
mIdOfLastServiceToControl = INVALID_SERVICE_ID;
mTrackingTypingFocusEnabled = false;
return true;
}
return false;
@@ -857,7 +943,18 @@ public class WindowMagnificationManager implements
return count;
}
@GuardedBy("mLock")
boolean isPositionInSourceBounds(float x, float y) {
return mSourceBounds.contains((int) x, (int) y);
}
void setTrackingTypingFocusEnabled(boolean trackingTypingFocusEnabled) {
mTrackingTypingFocusEnabled = trackingTypingFocusEnabled;
}
boolean isTrackingTypingFocusEnabled() {
return mTrackingTypingFocusEnabled;
}
boolean isEnabled() {
return mEnabled;
}

98
services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationManagerTest.java
View File

@@ -273,6 +273,104 @@ public class WindowMagnificationManagerTest {
MagnificationScaleProvider.MAX_SCALE);
}
@Test
public void onRectangleOnScreenRequested_trackingDisabledByOnDrag_withoutMovingMagnification()
throws RemoteException {
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3.0f, 50f, 50f);
final Region outRegion = new Region();
mWindowMagnificationManager.getMagnificationSourceBounds(TEST_DISPLAY, outRegion);
final Rect requestedRect = outRegion.getBounds();
requestedRect.offsetTo(requestedRect.right + 10, requestedRect.bottom + 10);
mMockConnection.getConnectionCallback().onDrag(TEST_DISPLAY);
mWindowMagnificationManager.onRectangleOnScreenRequested(TEST_DISPLAY,
requestedRect.left, requestedRect.top, requestedRect.right, requestedRect.bottom);
verify(mMockConnection.getConnection(), never()).enableWindowMagnification(eq(TEST_DISPLAY),
eq(3f), eq(requestedRect.exactCenterX()), eq(requestedRect.exactCenterY()),
eq(0f), eq(0f), notNull());
}
@Test
public void onRectangleOnScreenRequested_trackingDisabledByScroll_withoutMovingMagnification()
throws RemoteException {
final float distanceX = 10f;
final float distanceY = 10f;
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3.0f, 50f, 50f);
final Region outRegion = new Region();
mWindowMagnificationManager.getMagnificationSourceBounds(TEST_DISPLAY, outRegion);
final Rect requestedRect = outRegion.getBounds();
requestedRect.offsetTo(requestedRect.right + 10, requestedRect.bottom + 10);
mWindowMagnificationManager.processScroll(TEST_DISPLAY, distanceX, distanceY);
mWindowMagnificationManager.onRectangleOnScreenRequested(TEST_DISPLAY,
requestedRect.left, requestedRect.top, requestedRect.right, requestedRect.bottom);
verify(mMockConnection.getConnection(), never()).enableWindowMagnification(eq(TEST_DISPLAY),
eq(3f), eq(requestedRect.exactCenterX()), eq(requestedRect.exactCenterY()),
eq(0f), eq(0f), notNull());
}
@Test
public void onRectangleOnScreenRequested_requestRectangleInBound_withoutMovingMagnification()
throws RemoteException {
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3.0f, 50f, 50f);
final Region outRegion = new Region();
mWindowMagnificationManager.getMagnificationSourceBounds(TEST_DISPLAY, outRegion);
final Rect requestedRect = outRegion.getBounds();
requestedRect.inset(-10, -10);
mWindowMagnificationManager.onRectangleOnScreenRequested(TEST_DISPLAY,
requestedRect.left, requestedRect.top, requestedRect.right, requestedRect.bottom);
verify(mMockConnection.getConnection(), never()).enableWindowMagnification(eq(TEST_DISPLAY),
eq(3f), eq(500f), eq(500f), eq(0f), eq(0f), notNull());
}
@Test
public void onRectangleOnScreenRequested_trackingEnabledByDefault_movingMagnification()
throws RemoteException {
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3.0f, 50f, 50f);
final Region outRegion = new Region();
mWindowMagnificationManager.getMagnificationSourceBounds(TEST_DISPLAY, outRegion);
final Rect requestedRect = outRegion.getBounds();
requestedRect.offsetTo(requestedRect.right + 10, requestedRect.bottom + 10);
mWindowMagnificationManager.onRectangleOnScreenRequested(TEST_DISPLAY,
requestedRect.left, requestedRect.top, requestedRect.right, requestedRect.bottom);
verify(mMockConnection.getConnection()).enableWindowMagnification(eq(TEST_DISPLAY), eq(3f),
eq(requestedRect.exactCenterX()), eq(requestedRect.exactCenterY()),
eq(0f), eq(0f), notNull());
}
@Test
public void onRectangleOnScreenRequested_trackingEnabledByDragAndReset_movingMagnification()
throws RemoteException {
final PointF initialPoint = new PointF(50f, 50f);
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3.0f,
initialPoint.x, initialPoint.y);
mMockConnection.getConnectionCallback().onDrag(TEST_DISPLAY);
mWindowMagnificationManager.onImeWindowVisibilityChanged(true);
final Region outRegion = new Region();
mWindowMagnificationManager.getMagnificationSourceBounds(TEST_DISPLAY, outRegion);
final Rect requestedRect = outRegion.getBounds();
requestedRect.offsetTo(requestedRect.right + 10, requestedRect.bottom + 10);
mWindowMagnificationManager.onRectangleOnScreenRequested(TEST_DISPLAY,
requestedRect.left, requestedRect.top, requestedRect.right, requestedRect.bottom);
verify(mMockConnection.getConnection()).enableWindowMagnification(eq(TEST_DISPLAY),
eq(3f), eq(requestedRect.exactCenterX()), eq(requestedRect.exactCenterY()),
eq(0f), eq(0f), notNull());
}
@Test
public void moveWindowMagnifier_enabled_invokeConnectionMethod() throws RemoteException {
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());