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

Merge "Updates magnification button after an accessibility action is performed" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-07 03:25:32 +00:00
committed by Android (Google) Code Review
parent 086a0be6b2 80a35549c8
commit 7d8ae59fee
11 changed files with 138 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,4 +60,11 @@ import android.graphics.Rect;
*/
void onPerformScaleAction(int displayId, float scale);
/**
* Called when the accessibility action is performed.
*
* @param displayId The logical display id.
*/
void onAccessibilityActionPerformed(int displayId);
}

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

@@ -194,6 +194,13 @@ public class WindowMagnification extends SystemUI implements WindowMagnifierCall
}
}
@Override
public void onAccessibilityActionPerformed(int displayId) {
if (mWindowMagnificationConnectionImpl != null) {
mWindowMagnificationConnectionImpl.onAccessibilityActionPerformed(displayId);
}
}
@Override
public void requestWindowMagnificationConnection(boolean connect) {
if (connect) {

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

@@ -120,4 +120,14 @@ class WindowMagnificationConnectionImpl extends IWindowMagnificationConnection.S
}
}
}
void onAccessibilityActionPerformed(int displayId) {
if (mConnectionCallback != null) {
try {
mConnectionCallback.onAccessibilityActionPerformed(displayId);
} catch (RemoteException e) {
Log.e(TAG, "Failed to inform an accessibility action is already performed", e);
}
}
}
}

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

@@ -756,31 +756,23 @@ class WindowMagnificationController implements View.OnTouchListener, SurfaceHold
final float scale = mScale + A11Y_CHANGE_SCALE_DIFFERENCE;
mWindowMagnifierCallback.onPerformScaleAction(mDisplayId,
A11Y_ACTION_SCALE_RANGE.clamp(scale));
return true;
}
if (action == R.id.accessibility_action_zoom_out) {
} else if (action == R.id.accessibility_action_zoom_out) {
final float scale = mScale - A11Y_CHANGE_SCALE_DIFFERENCE;
mWindowMagnifierCallback.onPerformScaleAction(mDisplayId,
A11Y_ACTION_SCALE_RANGE.clamp(scale));
return true;
}
if (action == R.id.accessibility_action_move_up) {
} else if (action == R.id.accessibility_action_move_up) {
move(0, -mSourceBounds.height());
return true;
}
if (action == R.id.accessibility_action_move_down) {
} else if (action == R.id.accessibility_action_move_down) {
move(0, mSourceBounds.height());
return true;
}
if (action == R.id.accessibility_action_move_left) {
} else if (action == R.id.accessibility_action_move_left) {
move(-mSourceBounds.width(), 0);
return true;
}
if (action == R.id.accessibility_action_move_right) {
} else if (action == R.id.accessibility_action_move_right) {
move(mSourceBounds.width(), 0);
return true;
} else {
return false;
}
return false;
mWindowMagnifierCallback.onAccessibilityActionPerformed(mDisplayId);
return true;
}
}
}

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

@@ -46,4 +46,11 @@ interface WindowMagnifierCallback {
* @param scale the target scale, or {@link Float#NaN} to leave unchanged
*/
void onPerformScaleAction(int displayId, float scale);
/**
* Called when the accessibility action is performed.
*
* @param displayId The logical display id.
*/
void onAccessibilityActionPerformed(int displayId);
}

13
packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java
View File

@@ -302,6 +302,19 @@ public class WindowMagnificationControllerTest extends SysuiTestCase {
mMirrorView.performAccessibilityAction(R.id.accessibility_action_move_left, null));
}
@Test
public void performA11yActions_visible_notifyAccessibilityActionPerformed() {
final int displayId = mContext.getDisplayId();
mInstrumentation.runOnMainSync(() -> {
mWindowMagnificationController.enableWindowMagnification(2.5f, Float.NaN,
Float.NaN);
});
mMirrorView.performAccessibilityAction(R.id.accessibility_action_move_up, null);
verify(mWindowMagnifierCallback).onAccessibilityActionPerformed(eq(displayId));
}
@Test
public void onNavigationModeChanged_updateMirrorViewLayout() {
mInstrumentation.runOnMainSync(() -> {

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

@@ -117,6 +117,16 @@ public class WindowMagnificationTest extends SysuiTestCase {
eq(newScale));
}
@Test
public void onAccessibilityActionPerformed_enabled_notifyCallback() throws RemoteException {
mCommandQueue.requestWindowMagnificationConnection(true);
waitForIdleSync();
mWindowMagnification.onAccessibilityActionPerformed(Display.DEFAULT_DISPLAY);
verify(mConnectionCallback).onAccessibilityActionPerformed(eq(Display.DEFAULT_DISPLAY));
}
@Test
public void onConfigurationChanged_updateModeSwitches() {
final Configuration config = new Configuration();

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

@@ -118,6 +118,11 @@ public class MagnificationController implements WindowMagnificationManager.Callb
getWindowMagnificationMgr().persistScale(displayId);
}
@Override
public void onAccessibilityActionPerformed(int displayId) {
updateMagnificationButton(displayId, ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
}
@Override
public void onTouchInteractionStart(int displayId, int mode) {
handleUserInteractionChanged(displayId, mode);
@@ -148,8 +153,13 @@ public class MagnificationController implements WindowMagnificationManager.Callb
}
private void updateMagnificationButton(int displayId, int mode) {
if (isActivated(displayId, mode) && mMagnificationCapabilities
== Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL) {
final boolean isActivated = isActivated(displayId, mode);
final boolean showButton;
synchronized (mLock) {
showButton = isActivated && mMagnificationCapabilities
== Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL;
}
if (showButton) {
getWindowMagnificationMgr().showMagnificationButton(displayId, mode);
} else {
getWindowMagnificationMgr().removeMagnificationButton(displayId);
@@ -430,13 +440,22 @@ public class MagnificationController implements WindowMagnificationManager.Callb
private boolean isActivated(int displayId, int mode) {
boolean isActivated = false;
if (mode == ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
&& mFullScreenMagnificationController != null) {
isActivated = mFullScreenMagnificationController.isMagnifying(displayId)
|| mFullScreenMagnificationController.isForceShowMagnifiableBounds(displayId);
} else if (mode == ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW
&& mWindowMagnificationMgr != null) {
isActivated = mWindowMagnificationMgr.isWindowMagnifierEnabled(displayId);
if (mode == ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN) {
synchronized (mLock) {
if (mFullScreenMagnificationController == null) {
return false;
}
isActivated = mFullScreenMagnificationController.isMagnifying(displayId)
|| mFullScreenMagnificationController.isForceShowMagnifiableBounds(
displayId);
}
} else if (mode == ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW) {
synchronized (mLock) {
if (mWindowMagnificationMgr == null) {
return false;
}
isActivated = mWindowMagnificationMgr.isWindowMagnifierEnabled(displayId);
}
}
return isActivated;
}

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

@@ -94,6 +94,13 @@ public class WindowMagnificationManager implements
*/
void onPerformScaleAction(int displayId, float scale);
/**
* Called when the accessibility action is performed.
*
* @param displayId The logical display id.
*/
void onAccessibilityActionPerformed(int displayId);
/**
* Called when the state of the magnification activation is changed.
*
@@ -536,9 +543,12 @@ public class WindowMagnificationManager implements
@Override
public void onPerformScaleAction(int displayId, float scale) {
synchronized (mLock) {
mCallback.onPerformScaleAction(displayId, scale);
}
mCallback.onPerformScaleAction(displayId, scale);
}
@Override
public void onAccessibilityActionPerformed(int displayId) {
mCallback.onAccessibilityActionPerformed(displayId);
}
@Override

23
services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java
View File

@@ -330,6 +330,29 @@ public class MagnificationControllerTest {
verify(mWindowMagnificationManager).persistScale(eq(TEST_DISPLAY));
}
@Test
public void onAccessibilityActionPerformed_magnifierEnabled_showMagnificationButton()
throws RemoteException {
setMagnificationEnabled(MODE_WINDOW);
mMagnificationController.onAccessibilityActionPerformed(TEST_DISPLAY);
verify(mWindowMagnificationManager).showMagnificationButton(eq(TEST_DISPLAY),
eq(MODE_WINDOW));
}
@Test
public void onAccessibilityActionPerformed_capabilityNotAll_removeMagnificationButton()
throws RemoteException {
mMagnificationController.setMagnificationCapabilities(
ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
setMagnificationEnabled(MODE_WINDOW);
mMagnificationController.onAccessibilityActionPerformed(TEST_DISPLAY);
verify(mWindowMagnificationManager).removeMagnificationButton(eq(TEST_DISPLAY));
}
@Test
public void onWindowMagnificationActivationState_windowActivated_logWindowDuration() {
mMagnificationController.onWindowMagnificationActivationState(TEST_DISPLAY, true);

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

@@ -312,6 +312,17 @@ public class WindowMagnificationManagerTest {
verify(mMockCallback).onPerformScaleAction(eq(TEST_DISPLAY), eq(newScale));
}
@Test
public void onAccessibilityActionPerformed_magnifierEnabled_notifyAction()
throws RemoteException {
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());
mWindowMagnificationManager.enableWindowMagnification(TEST_DISPLAY, 3.0f, NaN, NaN);
mMockConnection.getConnectionCallback().onAccessibilityActionPerformed(TEST_DISPLAY);
verify(mMockCallback).onAccessibilityActionPerformed(eq(TEST_DISPLAY));
}
@Test
public void binderDied_windowMagnifierIsEnabled_resetState() throws RemoteException {
mWindowMagnificationManager.setConnection(mMockConnection.getConnection());