refactor(magnification): Renaming IWindowMagnificationConnection as IMagnificationConnection
Considering the connection is handling functions more than window
magnification operations, we would like to rename it as
IMagnificationconnection.
Bug: 310109308
Test: manually. Renaming the class and methods
atest IMagnificationConnectionTest
atest android.view.accessibility.AccessibilityManagerTest
atest MagnificationTest
atest CommandQueueTest
atest com.android.server.accessibility.magnification.FullScreenMagnificationControllerTest
atest MagnificationConnectionWrapperTest
atest MagnificationControllerTest
atest MagnificationConnectionManagerTest
atest WindowMagnificationGestureHandlerTest
Flag: NA
Change-Id: I6a19621dcf83e3c37b99204631e9bc022e894b5a
diff --git a/boot/preloaded-classes b/boot/preloaded-classes
index 72322ef5..548fa2f 100644
--- a/boot/preloaded-classes
+++ b/boot/preloaded-classes
@@ -8924,9 +8924,9 @@
android.view.accessibility.IAccessibilityManagerClient$Stub$Proxy
android.view.accessibility.IAccessibilityManagerClient$Stub
android.view.accessibility.IAccessibilityManagerClient
-android.view.accessibility.IWindowMagnificationConnection$Stub$Proxy
-android.view.accessibility.IWindowMagnificationConnection$Stub
-android.view.accessibility.IWindowMagnificationConnection
+android.view.accessibility.IMagnificationConnection$Stub$Proxy
+android.view.accessibility.IMagnificationConnection$Stub
+android.view.accessibility.IMagnificationConnection
android.view.accessibility.WeakSparseArray$WeakReferenceWithId
android.view.accessibility.WeakSparseArray
android.view.animation.AccelerateDecelerateInterpolator
diff --git a/config/preloaded-classes b/config/preloaded-classes
index cace87c..c49971e 100644
--- a/config/preloaded-classes
+++ b/config/preloaded-classes
@@ -8955,9 +8955,9 @@
android.view.accessibility.IAccessibilityManagerClient$Stub$Proxy
android.view.accessibility.IAccessibilityManagerClient$Stub
android.view.accessibility.IAccessibilityManagerClient
-android.view.accessibility.IWindowMagnificationConnection$Stub$Proxy
-android.view.accessibility.IWindowMagnificationConnection$Stub
-android.view.accessibility.IWindowMagnificationConnection
+android.view.accessibility.IMagnificationConnection$Stub$Proxy
+android.view.accessibility.IMagnificationConnection$Stub
+android.view.accessibility.IMagnificationConnection
android.view.accessibility.WeakSparseArray$WeakReferenceWithId
android.view.accessibility.WeakSparseArray
android.view.animation.AccelerateDecelerateInterpolator
diff --git a/core/java/android/accessibilityservice/AccessibilityTrace.java b/core/java/android/accessibilityservice/AccessibilityTrace.java
index f28015a..7700b33 100644
--- a/core/java/android/accessibilityservice/AccessibilityTrace.java
+++ b/core/java/android/accessibilityservice/AccessibilityTrace.java
@@ -35,7 +35,7 @@
String NAME_ACCESSIBILITY_INTERACTION_CONNECTION_CALLBACK =
"IAccessibilityInteractionConnectionCallback";
String NAME_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK = "IRemoteMagnificationAnimationCallback";
- String NAME_WINDOW_MAGNIFICATION_CONNECTION = "IWindowMagnificationConnection";
+ String NAME_MAGNIFICATION_CONNECTION = "IMagnificationConnection";
String NAME_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK = "IWindowMagnificationConnectionCallback";
String NAME_WINDOW_MANAGER_INTERNAL = "WindowManagerInternal";
String NAME_WINDOWS_FOR_ACCESSIBILITY_CALLBACK = "WindowsForAccessibilityCallback";
@@ -58,7 +58,7 @@
long FLAGS_ACCESSIBILITY_INTERACTION_CONNECTION = 0x0000000000000010L;
long FLAGS_ACCESSIBILITY_INTERACTION_CONNECTION_CALLBACK = 0x0000000000000020L;
long FLAGS_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK = 0x0000000000000040L;
- long FLAGS_WINDOW_MAGNIFICATION_CONNECTION = 0x0000000000000080L;
+ long FLAGS_MAGNIFICATION_CONNECTION = 0x0000000000000080L;
long FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK = 0x0000000000000100L;
long FLAGS_WINDOW_MANAGER_INTERNAL = 0x0000000000000200L;
long FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK = 0x0000000000000400L;
@@ -98,7 +98,7 @@
NAME_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK,
FLAGS_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK),
new AbstractMap.SimpleEntry<String, Long>(
- NAME_WINDOW_MAGNIFICATION_CONNECTION, FLAGS_WINDOW_MAGNIFICATION_CONNECTION),
+ NAME_MAGNIFICATION_CONNECTION, FLAGS_MAGNIFICATION_CONNECTION),
new AbstractMap.SimpleEntry<String, Long>(
NAME_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK),
diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index 07ae134..3dbe65e 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -1823,13 +1823,13 @@
/**
*
- * Sets an {@link IWindowMagnificationConnection} that manipulates window magnification.
+ * Sets an {@link IMagnificationConnection} that manipulates magnification in SystemUI.
*
- * @param connection The connection that manipulates window magnification.
+ * @param connection The connection that manipulates magnification in SystemUI.
* @hide
*/
- public void setWindowMagnificationConnection(@Nullable
- IWindowMagnificationConnection connection) {
+ public void setMagnificationConnection(@Nullable
+ IMagnificationConnection connection) {
final IAccessibilityManager service;
synchronized (mLock) {
service = getServiceLocked();
@@ -1838,9 +1838,9 @@
}
}
try {
- service.setWindowMagnificationConnection(connection);
+ service.setMagnificationConnection(connection);
} catch (RemoteException re) {
- Log.e(LOG_TAG, "Error setting window magnfication connection", re);
+ Log.e(LOG_TAG, "Error setting magnification connection", re);
}
}
diff --git a/core/java/android/view/accessibility/IAccessibilityManager.aidl b/core/java/android/view/accessibility/IAccessibilityManager.aidl
index 7a1112f..f741080 100644
--- a/core/java/android/view/accessibility/IAccessibilityManager.aidl
+++ b/core/java/android/view/accessibility/IAccessibilityManager.aidl
@@ -27,7 +27,7 @@
import android.view.accessibility.IAccessibilityInteractionConnection;
import android.view.accessibility.IAccessibilityManagerClient;
import android.view.accessibility.AccessibilityWindowAttributes;
-import android.view.accessibility.IWindowMagnificationConnection;
+import android.view.accessibility.IMagnificationConnection;
import android.view.InputEvent;
import android.view.IWindow;
import android.view.MagnificationSpec;
@@ -90,7 +90,7 @@
oneway void registerSystemAction(in RemoteAction action, int actionId);
oneway void unregisterSystemAction(int actionId);
- oneway void setWindowMagnificationConnection(in IWindowMagnificationConnection connection);
+ oneway void setMagnificationConnection(in IMagnificationConnection connection);
void associateEmbeddedHierarchy(IBinder host, IBinder embedded);
diff --git a/core/java/android/view/accessibility/IWindowMagnificationConnection.aidl b/core/java/android/view/accessibility/IMagnificationConnection.aidl
similarity index 98%
rename from core/java/android/view/accessibility/IWindowMagnificationConnection.aidl
rename to core/java/android/view/accessibility/IMagnificationConnection.aidl
index a404bd6..a5e8aaf 100644
--- a/core/java/android/view/accessibility/IWindowMagnificationConnection.aidl
+++ b/core/java/android/view/accessibility/IMagnificationConnection.aidl
@@ -23,11 +23,11 @@
/**
* Interface for interaction between {@link AccessibilityManagerService}
- * and {@link WindowMagnification} in SystemUI.
+ * and {@link Magnification} in SystemUI.
*
* @hide
*/
-oneway interface IWindowMagnificationConnection {
+oneway interface IMagnificationConnection {
/**
* Enables window magnification on specified display with given center and scale and animation.
diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 4d8eeac..5351c6d 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -285,12 +285,12 @@
void suppressAmbientDisplay(boolean suppress);
/**
- * Requests {@link WindowMagnification} to set window magnification connection through
- * {@link AccessibilityManager#setWindowMagnificationConnection(IWindowMagnificationConnection)}
+ * Requests {@link Magnification} to set magnification connection to SystemUI through
+ * {@link AccessibilityManager#setMagnificationConnection(IMagnificationConnection)}
*
* @param connect {@code true} if needs connection, otherwise set the connection to null.
*/
- void requestWindowMagnificationConnection(boolean connect);
+ void requestMagnificationConnection(boolean connect);
/**
* Allow for pass-through arguments from `adb shell cmd statusbar <args>`, and write to the
diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java
index 84252f9..e2f2554 100644
--- a/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java
+++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityManagerTest.java
@@ -208,14 +208,14 @@
}
@Test
- public void testSetWindowMagnificationConnection() throws Exception {
+ public void testSetMagnificationConnection() throws Exception {
AccessibilityManager manager = createManager(WITH_A11Y_ENABLED);
- IWindowMagnificationConnection connection = Mockito.mock(
- IWindowMagnificationConnection.class);
+ IMagnificationConnection connection = Mockito.mock(
+ IMagnificationConnection.class);
- manager.setWindowMagnificationConnection(connection);
+ manager.setMagnificationConnection(connection);
- verify(mMockService).setWindowMagnificationConnection(connection);
+ verify(mMockService).setMagnificationConnection(connection);
}
@Test
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/Magnification.java b/packages/SystemUI/src/com/android/systemui/accessibility/Magnification.java
index 1edb551..3cb6314 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/Magnification.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/Magnification.java
@@ -34,8 +34,8 @@
import android.view.SurfaceControl;
import android.view.WindowManagerGlobal;
import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnection;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.graphics.SfVsyncFrameCallbackProvider;
@@ -55,7 +55,7 @@
/**
* Class to handle the interaction with
* {@link com.android.server.accessibility.AccessibilityManagerService}. It invokes
- * {@link AccessibilityManager#setWindowMagnificationConnection(IWindowMagnificationConnection)}
+ * {@link AccessibilityManager#setMagnificationConnection(IMagnificationConnection)}
* when {@code IStatusBar#requestWindowMagnificationConnection(boolean)} is called.
*/
@SysUISingleton
@@ -484,11 +484,11 @@
}
@Override
- public void requestWindowMagnificationConnection(boolean connect) {
+ public void requestMagnificationConnection(boolean connect) {
if (connect) {
- setWindowMagnificationConnection();
+ setMagnificationConnection();
} else {
- clearWindowMagnificationConnection();
+ clearMagnificationConnection();
}
}
@@ -499,17 +499,17 @@
magnificationController -> magnificationController.dump(pw));
}
- private void setWindowMagnificationConnection() {
+ private void setMagnificationConnection() {
if (mMagnificationConnectionImpl == null) {
mMagnificationConnectionImpl = new MagnificationConnectionImpl(this,
mHandler);
}
- mAccessibilityManager.setWindowMagnificationConnection(
+ mAccessibilityManager.setMagnificationConnection(
mMagnificationConnectionImpl);
}
- private void clearWindowMagnificationConnection() {
- mAccessibilityManager.setWindowMagnificationConnection(null);
+ private void clearMagnificationConnection() {
+ mAccessibilityManager.setMagnificationConnection(null);
//TODO: destroy controllers.
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java
index 5f0d496..4944531 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java
@@ -21,8 +21,8 @@
import android.os.Handler;
import android.os.RemoteException;
import android.util.Log;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnection;
import android.view.accessibility.IWindowMagnificationConnectionCallback;
import com.android.systemui.dagger.qualifiers.Main;
@@ -30,9 +30,9 @@
/**
* Implementation of window magnification connection.
*
- * @see IWindowMagnificationConnection
+ * @see IMagnificationConnection
*/
-class MagnificationConnectionImpl extends IWindowMagnificationConnection.Stub {
+class MagnificationConnectionImpl extends IMagnificationConnection.Stub {
private static final String TAG = "WindowMagnificationConnectionImpl";
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
index d88fab0..ada7d3e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
@@ -153,7 +153,7 @@
private static final int MSG_HIDE_TOAST = 53 << MSG_SHIFT;
private static final int MSG_TRACING_STATE_CHANGED = 54 << MSG_SHIFT;
private static final int MSG_SUPPRESS_AMBIENT_DISPLAY = 55 << MSG_SHIFT;
- private static final int MSG_REQUEST_WINDOW_MAGNIFICATION_CONNECTION = 56 << MSG_SHIFT;
+ private static final int MSG_REQUEST_MAGNIFICATION_CONNECTION = 56 << MSG_SHIFT;
//TODO(b/169175022) Update name and when feature name is locked.
private static final int MSG_EMERGENCY_ACTION_LAUNCH_GESTURE = 58 << MSG_SHIFT;
private static final int MSG_SET_NAVIGATION_BAR_LUMA_SAMPLING_ENABLED = 59 << MSG_SHIFT;
@@ -426,11 +426,11 @@
/**
* Requests {@link com.android.systemui.accessibility.Magnification} to invoke
* {@code android.view.accessibility.AccessibilityManager#
- * setWindowMagnificationConnection(IWindowMagnificationConnection)}
+ * setMagnificationConnection(IMagnificationConnection)}
*
* @param connect {@code true} if needs connection, otherwise set the connection to null.
*/
- default void requestWindowMagnificationConnection(boolean connect) { }
+ default void requestMagnificationConnection(boolean connect) { }
/**
* @see IStatusBar#setNavigationBarLumaSamplingEnabled(int, boolean)
@@ -1125,9 +1125,9 @@
}
@Override
- public void requestWindowMagnificationConnection(boolean connect) {
+ public void requestMagnificationConnection(boolean connect) {
synchronized (mLock) {
- mHandler.obtainMessage(MSG_REQUEST_WINDOW_MAGNIFICATION_CONNECTION, connect)
+ mHandler.obtainMessage(MSG_REQUEST_MAGNIFICATION_CONNECTION, connect)
.sendToTarget();
}
}
@@ -1767,9 +1767,9 @@
callbacks.suppressAmbientDisplay((boolean) msg.obj);
}
break;
- case MSG_REQUEST_WINDOW_MAGNIFICATION_CONNECTION:
+ case MSG_REQUEST_MAGNIFICATION_CONNECTION:
for (int i = 0; i < mCallbacks.size(); i++) {
- mCallbacks.get(i).requestWindowMagnificationConnection((Boolean) msg.obj);
+ mCallbacks.get(i).requestMagnificationConnection((Boolean) msg.obj);
}
break;
case MSG_SET_NAVIGATION_BAR_LUMA_SAMPLING_ENABLED:
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/IWindowMagnificationConnectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java
similarity index 83%
rename from packages/SystemUI/tests/src/com/android/systemui/accessibility/IWindowMagnificationConnectionTest.java
rename to packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java
index 4395282..235aa21 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/IWindowMagnificationConnectionTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java
@@ -33,8 +33,8 @@
import android.testing.TestableLooper;
import android.view.Display;
import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnection;
import android.view.accessibility.IWindowMagnificationConnectionCallback;
import androidx.test.filters.SmallTest;
@@ -53,13 +53,13 @@
import org.mockito.MockitoAnnotations;
/**
- * Tests for {@link android.view.accessibility.IWindowMagnificationConnection} retrieved from
+ * Tests for {@link android.view.accessibility.IMagnificationConnection} retrieved from
* {@link Magnification}
*/
@SmallTest
@RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper
-public class IWindowMagnificationConnectionTest extends SysuiTestCase {
+public class IMagnificationConnectionTest extends SysuiTestCase {
private static final int TEST_DISPLAY = Display.DEFAULT_DISPLAY;
@Mock
@@ -85,7 +85,7 @@
@Mock
private AccessibilityLogger mA11yLogger;
- private IWindowMagnificationConnection mIWindowMagnificationConnection;
+ private IMagnificationConnection mIMagnificationConnection;
private Magnification mMagnification;
private FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext);
@@ -94,10 +94,10 @@
MockitoAnnotations.initMocks(this);
getContext().addMockSystemService(Context.ACCESSIBILITY_SERVICE, mAccessibilityManager);
doAnswer(invocation -> {
- mIWindowMagnificationConnection = invocation.getArgument(0);
+ mIMagnificationConnection = invocation.getArgument(0);
return null;
- }).when(mAccessibilityManager).setWindowMagnificationConnection(
- any(IWindowMagnificationConnection.class));
+ }).when(mAccessibilityManager).setMagnificationConnection(
+ any(IMagnificationConnection.class));
mMagnification = new Magnification(getContext(),
getContext().getMainThreadHandler(), mCommandQueue,
mModeSwitchesController, mSysUiState, mOverviewProxyService, mSecureSettings,
@@ -107,14 +107,14 @@
mMagnification.mMagnificationSettingsSupplier = new FakeSettingsSupplier(
mContext.getSystemService(DisplayManager.class));
- mMagnification.requestWindowMagnificationConnection(true);
- assertNotNull(mIWindowMagnificationConnection);
- mIWindowMagnificationConnection.setConnectionCallback(mConnectionCallback);
+ mMagnification.requestMagnificationConnection(true);
+ assertNotNull(mIMagnificationConnection);
+ mIMagnificationConnection.setConnectionCallback(mConnectionCallback);
}
@Test
public void enableWindowMagnification_passThrough() throws RemoteException {
- mIWindowMagnificationConnection.enableWindowMagnification(TEST_DISPLAY, 3.0f, Float.NaN,
+ mIMagnificationConnection.enableWindowMagnification(TEST_DISPLAY, 3.0f, Float.NaN,
Float.NaN, 0f, 0f, mAnimationCallback);
waitForIdleSync();
@@ -124,7 +124,7 @@
@Test
public void disableWindowMagnification_deleteWindowMagnification() throws RemoteException {
- mIWindowMagnificationConnection.disableWindowMagnification(TEST_DISPLAY,
+ mIMagnificationConnection.disableWindowMagnification(TEST_DISPLAY,
mAnimationCallback);
waitForIdleSync();
@@ -134,7 +134,7 @@
@Test
public void setScaleForWindowMagnification() throws RemoteException {
- mIWindowMagnificationConnection.setScaleForWindowMagnification(TEST_DISPLAY, 3.0f);
+ mIMagnificationConnection.setScaleForWindowMagnification(TEST_DISPLAY, 3.0f);
waitForIdleSync();
verify(mWindowMagnificationController).setScale(3.0f);
@@ -142,7 +142,7 @@
@Test
public void moveWindowMagnifier() throws RemoteException {
- mIWindowMagnificationConnection.moveWindowMagnifier(TEST_DISPLAY, 100f, 200f);
+ mIMagnificationConnection.moveWindowMagnifier(TEST_DISPLAY, 100f, 200f);
waitForIdleSync();
verify(mWindowMagnificationController).moveWindowMagnifier(100f, 200f);
@@ -150,7 +150,7 @@
@Test
public void moveWindowMagnifierToPosition() throws RemoteException {
- mIWindowMagnificationConnection.moveWindowMagnifierToPosition(TEST_DISPLAY,
+ mIMagnificationConnection.moveWindowMagnifierToPosition(TEST_DISPLAY,
100f, 200f, mAnimationCallback);
waitForIdleSync();
@@ -163,7 +163,7 @@
// magnification settings panel should not be showing
assertFalse(mMagnification.isMagnificationSettingsPanelShowing(TEST_DISPLAY));
- mIWindowMagnificationConnection.showMagnificationButton(TEST_DISPLAY,
+ mIMagnificationConnection.showMagnificationButton(TEST_DISPLAY,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
waitForIdleSync();
@@ -173,7 +173,7 @@
@Test
public void removeMagnificationButton() throws RemoteException {
- mIWindowMagnificationConnection.removeMagnificationButton(TEST_DISPLAY);
+ mIMagnificationConnection.removeMagnificationButton(TEST_DISPLAY);
waitForIdleSync();
verify(mModeSwitchesController).removeButton(TEST_DISPLAY);
@@ -181,7 +181,7 @@
@Test
public void removeMagnificationSettingsPanel() throws RemoteException {
- mIWindowMagnificationConnection.removeMagnificationSettingsPanel(TEST_DISPLAY);
+ mIMagnificationConnection.removeMagnificationSettingsPanel(TEST_DISPLAY);
waitForIdleSync();
verify(mMagnificationSettingsController).closeMagnificationSettings();
@@ -191,7 +191,7 @@
public void onUserMagnificationScaleChanged() throws RemoteException {
final int testUserId = 1;
final float testScale = 3.0f;
- mIWindowMagnificationConnection.onUserMagnificationScaleChanged(
+ mIMagnificationConnection.onUserMagnificationScaleChanged(
testUserId, TEST_DISPLAY, testScale);
waitForIdleSync();
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java
index c972feb..39c8f5d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java
@@ -43,7 +43,7 @@
import android.testing.TestableLooper;
import android.view.Display;
import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.IWindowMagnificationConnection;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IWindowMagnificationConnectionCallback;
import androidx.test.filters.SmallTest;
@@ -98,11 +98,11 @@
MockitoAnnotations.initMocks(this);
getContext().addMockSystemService(Context.ACCESSIBILITY_SERVICE, mAccessibilityManager);
doAnswer(invocation -> {
- IWindowMagnificationConnection connection = invocation.getArgument(0);
+ IMagnificationConnection connection = invocation.getArgument(0);
connection.setConnectionCallback(mConnectionCallback);
return null;
- }).when(mAccessibilityManager).setWindowMagnificationConnection(
- any(IWindowMagnificationConnection.class));
+ }).when(mAccessibilityManager).setMagnificationConnection(
+ any(IMagnificationConnection.class));
when(mSysUiState.setFlag(anyInt(), anyBoolean())).thenReturn(mSysUiState);
@@ -138,22 +138,22 @@
@Test
public void requestWindowMagnificationConnection_setConnectionAndListener() {
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
- verify(mAccessibilityManager).setWindowMagnificationConnection(any(
- IWindowMagnificationConnection.class));
+ verify(mAccessibilityManager).setMagnificationConnection(any(
+ IMagnificationConnection.class));
- mCommandQueue.requestWindowMagnificationConnection(false);
+ mCommandQueue.requestMagnificationConnection(false);
waitForIdleSync();
- verify(mAccessibilityManager).setWindowMagnificationConnection(isNull());
+ verify(mAccessibilityManager).setMagnificationConnection(isNull());
}
@Test
public void onWindowMagnifierBoundsChanged() throws RemoteException {
final Rect testBounds = new Rect(0, 0, 500, 600);
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
mMagnification.mWindowMagnifierCallback
@@ -166,7 +166,7 @@
public void onPerformScaleAction_enabled_notifyCallback() throws RemoteException {
final float newScale = 4.0f;
final boolean updatePersistence = true;
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
mMagnification.mWindowMagnifierCallback
@@ -178,7 +178,7 @@
@Test
public void onAccessibilityActionPerformed_enabled_notifyCallback() throws RemoteException {
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
mMagnification.mWindowMagnifierCallback
@@ -189,7 +189,7 @@
@Test
public void onMove_enabled_notifyCallback() throws RemoteException {
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
mMagnification.mWindowMagnifierCallback.onMove(TEST_DISPLAY);
@@ -254,7 +254,7 @@
@Test
public void onMagnifierScale_notifyCallback() throws RemoteException {
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
final float scale = 3.0f;
final boolean updatePersistence = false;
@@ -271,7 +271,7 @@
public void onModeSwitch_windowEnabledAndSwitchToFullscreen_hidePanelAndNotifyCallback()
throws RemoteException {
when(mWindowMagnificationController.isActivated()).thenReturn(true);
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
mMagnification.mMagnificationSettingsControllerCallback.onModeSwitch(
@@ -289,7 +289,7 @@
public void onModeSwitch_switchToSameMode_doNothing()
throws RemoteException {
when(mWindowMagnificationController.isActivated()).thenReturn(true);
- mCommandQueue.requestWindowMagnificationConnection(true);
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
mMagnification.mMagnificationSettingsControllerCallback.onModeSwitch(
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java
index b04d5d3..260bef8 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java
@@ -503,10 +503,10 @@
}
@Test
- public void testRequestWindowMagnificationConnection() {
- mCommandQueue.requestWindowMagnificationConnection(true);
+ public void testRequestMagnificationConnection() {
+ mCommandQueue.requestMagnificationConnection(true);
waitForIdleSync();
- verify(mCallbacks).requestWindowMagnificationConnection(true);
+ verify(mCallbacks).requestMagnificationConnection(true);
}
@Test
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 2186a82..d93abeb 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -24,7 +24,7 @@
import static android.accessibilityservice.AccessibilityTrace.FLAGS_INPUT_FILTER;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_PACKAGE_BROADCAST_RECEIVER;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_USER_BROADCAST_RECEIVER;
-import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MAGNIFICATION_CONNECTION;
+import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MANAGER_INTERNAL;
import static android.companion.virtual.VirtualDeviceManager.ACTION_VIRTUAL_DEVICE_REMOVED;
import static android.companion.virtual.VirtualDeviceManager.EXTRA_VIRTUAL_DEVICE_ID;
@@ -135,7 +135,7 @@
import android.view.accessibility.IAccessibilityInteractionConnectionCallback;
import android.view.accessibility.IAccessibilityManager;
import android.view.accessibility.IAccessibilityManagerClient;
-import android.view.accessibility.IWindowMagnificationConnection;
+import android.view.accessibility.IMagnificationConnection;
import android.view.inputmethod.EditorInfo;
import com.android.internal.R;
@@ -3431,7 +3431,7 @@
}
}
- private void updateWindowMagnificationConnectionIfNeeded(AccessibilityUserState userState) {
+ private void updateMagnificationConnectionIfNeeded(AccessibilityUserState userState) {
if (!mMagnificationController.supportWindowMagnification()) {
return;
}
@@ -4110,12 +4110,12 @@
}
@Override
- public void setWindowMagnificationConnection(
- IWindowMagnificationConnection connection) throws RemoteException {
+ public void setMagnificationConnection(
+ IMagnificationConnection connection) throws RemoteException {
if (mTraceManager.isA11yTracingEnabledForTypes(
- FLAGS_ACCESSIBILITY_MANAGER | FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
- mTraceManager.logTrace(LOG_TAG + ".setWindowMagnificationConnection",
- FLAGS_ACCESSIBILITY_MANAGER | FLAGS_WINDOW_MAGNIFICATION_CONNECTION,
+ FLAGS_ACCESSIBILITY_MANAGER | FLAGS_MAGNIFICATION_CONNECTION)) {
+ mTraceManager.logTrace(LOG_TAG + ".setMagnificationConnection",
+ FLAGS_ACCESSIBILITY_MANAGER | FLAGS_MAGNIFICATION_CONNECTION,
"connection=" + connection);
}
@@ -4422,7 +4422,7 @@
pw.append("visibleBgUserIds=").append(mVisibleBgUserIds.toString());
pw.println();
}
- pw.append("hasWindowMagnificationConnection=").append(
+ pw.append("hasMagnificationConnection=").append(
String.valueOf(getMagnificationConnectionManager().isConnected()));
pw.println();
mMagnificationProcessor.dump(pw, getValidDisplayList());
@@ -5132,7 +5132,7 @@
updateMagnificationModeChangeSettingsLocked(userState, displayId);
}
}
- updateWindowMagnificationConnectionIfNeeded(userState);
+ updateMagnificationConnectionIfNeeded(userState);
// Remove magnification button UI when the magnification capability is not all mode or
// magnification is disabled.
if (!(userState.isMagnificationSingleFingerTripleTapEnabledLocked()
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java
index 6114213..307b555 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java
@@ -223,7 +223,7 @@
pw.println(" IAccessibilityInteractionConnection");
pw.println(" IAccessibilityInteractionConnectionCallback");
pw.println(" IRemoteMagnificationAnimationCallback");
- pw.println(" IWindowMagnificationConnection");
+ pw.println(" IMagnificationConnection");
pw.println(" IWindowMagnificationConnectionCallback");
pw.println(" WindowManagerInternal");
pw.println(" WindowsForAccessibilityCallback");
diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
index 5a3c070..eff6488 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
@@ -16,7 +16,7 @@
package com.android.server.accessibility.magnification;
-import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MAGNIFICATION_CONNECTION;
+import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK;
import static android.view.accessibility.MagnificationAnimationCallback.STUB_ANIMATION_CALLBACK;
@@ -42,7 +42,7 @@
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.view.MotionEvent;
-import android.view.accessibility.IWindowMagnificationConnection;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IWindowMagnificationConnectionCallback;
import android.view.accessibility.MagnificationAnimationCallback;
@@ -61,8 +61,8 @@
/**
* A class to manipulate magnification through {@link MagnificationConnectionWrapper}
- * create by {@link #setConnection(IWindowMagnificationConnection)}. To set the connection with
- * SysUI, call {@code StatusBarManagerInternal#requestWindowMagnificationConnection(boolean)}.
+ * create by {@link #setConnection(IMagnificationConnection)}. To set the connection with
+ * SysUI, call {@code StatusBarManagerInternal#requestMagnificationConnection(boolean)}.
* The applied magnification scale is constrained by
* {@link MagnificationScaleProvider#constrainScale(float)}
*/
@@ -93,13 +93,13 @@
})
public @interface WindowPosition {}
- /** Window magnification connection is connecting. */
+ /** Magnification connection is connecting. */
private static final int CONNECTING = 0;
- /** Window magnification connection is connected. */
+ /** Magnification connection is connected. */
private static final int CONNECTED = 1;
- /** Window magnification connection is disconnecting. */
+ /** Magnification connection is disconnecting. */
private static final int DISCONNECTING = 2;
- /** Window magnification connection is disconnected. */
+ /** Magnification connection is disconnected. */
private static final int DISCONNECTED = 3;
@Retention(RetentionPolicy.SOURCE)
@@ -195,7 +195,7 @@
void onSourceBoundsChanged(int displayId, Rect bounds);
/**
- * Called from {@link IWindowMagnificationConnection} to request changing the magnification
+ * Called from {@link IMagnificationConnection} to request changing the magnification
* mode on the given display.
*
* @param displayId the logical display id
@@ -218,11 +218,11 @@
}
/**
- * Sets {@link IWindowMagnificationConnection}.
+ * Sets {@link IMagnificationConnection}.
*
- * @param connection {@link IWindowMagnificationConnection}
+ * @param connection {@link IMagnificationConnection}
*/
- public void setConnection(@Nullable IWindowMagnificationConnection connection) {
+ public void setConnection(@Nullable IMagnificationConnection connection) {
if (DBG) {
Slog.d(TAG, "setConnection :" + connection + ", mConnectionState="
+ connectionStateToString(mConnectionState));
@@ -266,7 +266,7 @@
}
/**
- * @return {@code true} if {@link IWindowMagnificationConnection} is available
+ * @return {@code true} if {@link IMagnificationConnection} is available
*/
public boolean isConnected() {
synchronized (mLock) {
@@ -275,21 +275,21 @@
}
/**
- * Requests {@link IWindowMagnificationConnection} through
- * {@link StatusBarManagerInternal#requestWindowMagnificationConnection(boolean)} and
+ * Requests {@link IMagnificationConnection} through
+ * {@link StatusBarManagerInternal#requestMagnificationConnection(boolean)} and
* destroys all window magnifications if necessary.
*
* @param connect {@code true} if needs connection, otherwise set the connection to null and
* destroy all window magnifications.
- * @return {@code true} if {@link IWindowMagnificationConnection} state is going to change.
+ * @return {@code true} if {@link IMagnificationConnection} state is going to change.
*/
public boolean requestConnection(boolean connect) {
if (DBG) {
Slog.d(TAG, "requestConnection :" + connect);
}
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
- mTrace.logTrace(TAG + ".requestWindowMagnificationConnection",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION, "connect=" + connect);
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
+ mTrace.logTrace(TAG + ".requestMagnificationConnection",
+ FLAGS_MAGNIFICATION_CONNECTION, "connect=" + connect);
}
synchronized (mLock) {
if ((connect && (mConnectionState == CONNECTED || mConnectionState == CONNECTING))
@@ -329,7 +329,7 @@
final StatusBarManagerInternal service = LocalServices.getService(
StatusBarManagerInternal.class);
if (service != null) {
- return service.requestWindowMagnificationConnection(connect);
+ return service.requestMagnificationConnection(connect);
}
} finally {
Binder.restoreCallingIdentity(identity);
diff --git a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionWrapper.java b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionWrapper.java
index 20538f1..d7098a7 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionWrapper.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionWrapper.java
@@ -16,8 +16,8 @@
package com.android.server.accessibility.magnification;
+import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK;
-import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MAGNIFICATION_CONNECTION;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK;
import static android.os.IBinder.DeathRecipient;
@@ -25,25 +25,25 @@
import android.annotation.Nullable;
import android.os.RemoteException;
import android.util.Slog;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnection;
import android.view.accessibility.IWindowMagnificationConnectionCallback;
import android.view.accessibility.MagnificationAnimationCallback;
import com.android.server.accessibility.AccessibilityTraceManager;
/**
- * A wrapper of {@link IWindowMagnificationConnection}.
+ * A wrapper of {@link IMagnificationConnection}.
*/
class MagnificationConnectionWrapper {
private static final boolean DBG = false;
private static final String TAG = "MagnificationConnectionWrapper";
- private final @NonNull IWindowMagnificationConnection mConnection;
+ private final @NonNull IMagnificationConnection mConnection;
private final @NonNull AccessibilityTraceManager mTrace;
- MagnificationConnectionWrapper(@NonNull IWindowMagnificationConnection connection,
+ MagnificationConnectionWrapper(@NonNull IMagnificationConnection connection,
@NonNull AccessibilityTraceManager trace) {
mConnection = connection;
mTrace = trace;
@@ -61,9 +61,9 @@
boolean enableWindowMagnification(int displayId, float scale, float centerX, float centerY,
float magnificationFrameOffsetRatioX, float magnificationFrameOffsetRatioY,
@Nullable MagnificationAnimationCallback callback) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
mTrace.logTrace(TAG + ".enableWindowMagnification",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION,
+ FLAGS_MAGNIFICATION_CONNECTION,
"displayId=" + displayId + ";scale=" + scale + ";centerX=" + centerX
+ ";centerY=" + centerY + ";magnificationFrameOffsetRatioX="
+ magnificationFrameOffsetRatioX + ";magnificationFrameOffsetRatioY="
@@ -83,8 +83,8 @@
}
boolean setScaleForWindowMagnification(int displayId, float scale) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
- mTrace.logTrace(TAG + ".setScale", FLAGS_WINDOW_MAGNIFICATION_CONNECTION,
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
+ mTrace.logTrace(TAG + ".setScale", FLAGS_MAGNIFICATION_CONNECTION,
"displayId=" + displayId + ";scale=" + scale);
}
try {
@@ -100,9 +100,9 @@
boolean disableWindowMagnification(int displayId,
@Nullable MagnificationAnimationCallback callback) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
mTrace.logTrace(TAG + ".disableWindowMagnification",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION,
+ FLAGS_MAGNIFICATION_CONNECTION,
"displayId=" + displayId + ";callback=" + callback);
}
try {
@@ -118,8 +118,8 @@
}
boolean moveWindowMagnifier(int displayId, float offsetX, float offsetY) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
- mTrace.logTrace(TAG + ".moveWindowMagnifier", FLAGS_WINDOW_MAGNIFICATION_CONNECTION,
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
+ mTrace.logTrace(TAG + ".moveWindowMagnifier", FLAGS_MAGNIFICATION_CONNECTION,
"displayId=" + displayId + ";offsetX=" + offsetX + ";offsetY=" + offsetY);
}
try {
@@ -135,9 +135,9 @@
boolean moveWindowMagnifierToPosition(int displayId, float positionX, float positionY,
@Nullable MagnificationAnimationCallback callback) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
mTrace.logTrace(TAG + ".moveWindowMagnifierToPosition",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION, "displayId=" + displayId
+ FLAGS_MAGNIFICATION_CONNECTION, "displayId=" + displayId
+ ";positionX=" + positionX + ";positionY=" + positionY);
}
try {
@@ -153,9 +153,9 @@
}
boolean showMagnificationButton(int displayId, int magnificationMode) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
mTrace.logTrace(TAG + ".showMagnificationButton",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION,
+ FLAGS_MAGNIFICATION_CONNECTION,
"displayId=" + displayId + ";mode=" + magnificationMode);
}
try {
@@ -170,9 +170,9 @@
}
boolean removeMagnificationButton(int displayId) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
mTrace.logTrace(TAG + ".removeMagnificationButton",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION, "displayId=" + displayId);
+ FLAGS_MAGNIFICATION_CONNECTION, "displayId=" + displayId);
}
try {
mConnection.removeMagnificationButton(displayId);
@@ -186,9 +186,9 @@
}
boolean removeMagnificationSettingsPanel(int displayId) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
mTrace.logTrace(TAG + ".removeMagnificationSettingsPanel",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION, "displayId=" + displayId);
+ FLAGS_MAGNIFICATION_CONNECTION, "displayId=" + displayId);
}
try {
mConnection.removeMagnificationSettingsPanel(displayId);
@@ -202,9 +202,9 @@
}
boolean onUserMagnificationScaleChanged(int userId, int displayId, float scale) {
- if (mTrace.isA11yTracingEnabledForTypes(FLAGS_WINDOW_MAGNIFICATION_CONNECTION)) {
+ if (mTrace.isA11yTracingEnabledForTypes(FLAGS_MAGNIFICATION_CONNECTION)) {
mTrace.logTrace(TAG + ".onMagnificationScaleUpdated",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION, "displayId=" + displayId);
+ FLAGS_MAGNIFICATION_CONNECTION, "displayId=" + displayId);
}
try {
mConnection.onUserMagnificationScaleChanged(userId, displayId, scale);
@@ -219,10 +219,10 @@
boolean setConnectionCallback(IWindowMagnificationConnectionCallback connectionCallback) {
if (mTrace.isA11yTracingEnabledForTypes(
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION
+ FLAGS_MAGNIFICATION_CONNECTION
| FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + ".setConnectionCallback",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION
+ FLAGS_MAGNIFICATION_CONNECTION
| FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
"callback=" + connectionCallback);
}
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
index a512331..b271a03 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerInternal.java
@@ -196,10 +196,10 @@
void hideToast(String packageName, IBinder token);
/**
- * @see com.android.internal.statusbar.IStatusBar#requestWindowMagnificationConnection(boolean
+ * @see com.android.internal.statusbar.IStatusBar#requestMagnificationConnection(boolean
* request)
*/
- boolean requestWindowMagnificationConnection(boolean request);
+ boolean requestMagnificationConnection(boolean request);
/**
* @see com.android.internal.statusbar.IStatusBar#setNavigationBarLumaSamplingEnabled(int,
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 7c51e7b..b21721a 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -760,11 +760,11 @@
}
@Override
- public boolean requestWindowMagnificationConnection(boolean request) {
+ public boolean requestMagnificationConnection(boolean request) {
IStatusBar bar = mBar;
if (bar != null) {
try {
- bar.requestWindowMagnificationConnection(request);
+ bar.requestMagnificationConnection(request);
return true;
} catch (RemoteException ex) { }
}
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java
index 1b02498..52726ca 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationControllerTest.java
@@ -19,7 +19,7 @@
import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;
import static com.android.server.accessibility.magnification.FullScreenMagnificationController.MagnificationInfoChangedCallback;
-import static com.android.server.accessibility.magnification.MockWindowMagnificationConnection.TEST_DISPLAY;
+import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java
index 3843e25..a7cf361 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionManagerTest.java
@@ -16,8 +16,8 @@
package com.android.server.accessibility.magnification;
-import static com.android.server.accessibility.magnification.MockWindowMagnificationConnection.TEST_DISPLAY;
-import static com.android.server.accessibility.magnification.MockWindowMagnificationConnection.TEST_DISPLAY_2;
+import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY;
+import static com.android.server.accessibility.magnification.MockMagnificationConnection.TEST_DISPLAY_2;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -79,7 +79,7 @@
private static final int CURRENT_USER_ID = UserHandle.USER_SYSTEM;
private static final int SERVICE_ID = 1;
- private MockWindowMagnificationConnection mMockConnection;
+ private MockMagnificationConnection mMockConnection;
@Mock
private Context mContext;
@Mock
@@ -99,7 +99,7 @@
LocalServices.removeServiceForTest(StatusBarManagerInternal.class);
LocalServices.addService(StatusBarManagerInternal.class, mMockStatusBarManagerInternal);
mResolver = new MockContentResolver();
- mMockConnection = new MockWindowMagnificationConnection();
+ mMockConnection = new MockMagnificationConnection();
mMagnificationConnectionManager = new MagnificationConnectionManager(mContext, new Object(),
mMockCallback, mMockTrace, new MagnificationScaleProvider(mContext));
@@ -128,7 +128,7 @@
connect ? mMockConnection.getConnection() : null);
}
return true;
- }).when(mMockStatusBarManagerInternal).requestWindowMagnificationConnection(anyBoolean());
+ }).when(mMockStatusBarManagerInternal).requestMagnificationConnection(anyBoolean());
}
@Test
@@ -169,8 +169,7 @@
public void setSecondConnectionAndFormerConnectionBinderDead_hasWrapperAndNotCallUnlinkToDeath()
throws RemoteException {
mMagnificationConnectionManager.setConnection(mMockConnection.getConnection());
- MockWindowMagnificationConnection secondConnection =
- new MockWindowMagnificationConnection();
+ MockMagnificationConnection secondConnection = new MockMagnificationConnection();
mMagnificationConnectionManager.setConnection(secondConnection.getConnection());
mMockConnection.getDeathRecipient().binderDied();
@@ -620,13 +619,13 @@
assertTrue(mMagnificationConnectionManager.requestConnection(false));
verify(mMockConnection.getConnection()).disableWindowMagnification(TEST_DISPLAY, null);
- verify(mMockStatusBarManagerInternal).requestWindowMagnificationConnection(false);
+ verify(mMockStatusBarManagerInternal).requestMagnificationConnection(false);
}
@Test
public void requestConnection_requestWindowMagnificationConnection() throws RemoteException {
assertTrue(mMagnificationConnectionManager.requestConnection(true));
- verify(mMockStatusBarManagerInternal).requestWindowMagnificationConnection(true);
+ verify(mMockStatusBarManagerInternal).requestMagnificationConnection(true);
}
@Test
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionWrapperTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionWrapperTest.java
index 8f85f11..8fdd884 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionWrapperTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationConnectionWrapperTest.java
@@ -24,8 +24,8 @@
import android.os.RemoteException;
import android.provider.Settings;
import android.view.Display;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnection;
import android.view.accessibility.IWindowMagnificationConnectionCallback;
import android.view.accessibility.MagnificationAnimationCallback;
@@ -45,7 +45,7 @@
private static final int TEST_DISPLAY = Display.DEFAULT_DISPLAY;
- private IWindowMagnificationConnection mConnection;
+ private IMagnificationConnection mConnection;
@Mock
private AccessibilityTraceManager mTrace;
@Mock
@@ -53,14 +53,14 @@
@Mock
private MagnificationAnimationCallback mAnimationCallback;
- private MockWindowMagnificationConnection mMockWindowMagnificationConnection;
+ private MockMagnificationConnection mMockMagnificationConnection;
private MagnificationConnectionWrapper mConnectionWrapper;
@Before
public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this);
- mMockWindowMagnificationConnection = new MockWindowMagnificationConnection();
- mConnection = mMockWindowMagnificationConnection.getConnection();
+ mMockMagnificationConnection = new MockMagnificationConnection();
+ mConnection = mMockMagnificationConnection.getConnection();
mConnectionWrapper = new MagnificationConnectionWrapper(mConnection, mTrace);
}
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java
index e8cdf35..28d07f9 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MagnificationControllerTest.java
@@ -130,7 +130,7 @@
@Captor
private ArgumentCaptor<MagnificationAnimationCallback> mCallbackArgumentCaptor;
- private MockWindowMagnificationConnection mMockConnection;
+ private MockMagnificationConnection mMockConnection;
private MagnificationConnectionManager mMagnificationConnectionManager;
private MockContentResolver mMockResolver;
private MagnificationController mMagnificationController;
@@ -208,7 +208,7 @@
mMagnificationConnectionManager = spy(
new MagnificationConnectionManager(mContext, globalLock,
mWindowMagnificationCallbackDelegate, mTraceManager, mScaleProvider));
- mMockConnection = new MockWindowMagnificationConnection(true);
+ mMockConnection = new MockMagnificationConnection(true);
mMagnificationConnectionManager.setConnection(mMockConnection.getConnection());
mMagnificationController = spy(new MagnificationController(mService, globalLock, mContext,
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockWindowMagnificationConnection.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockMagnificationConnection.java
similarity index 94%
rename from services/tests/servicestests/src/com/android/server/accessibility/magnification/MockWindowMagnificationConnection.java
rename to services/tests/servicestests/src/com/android/server/accessibility/magnification/MockMagnificationConnection.java
index 4c03ec3..3d3d0b7 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockWindowMagnificationConnection.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockMagnificationConnection.java
@@ -31,8 +31,8 @@
import android.os.IBinder;
import android.os.RemoteException;
import android.view.Display;
+import android.view.accessibility.IMagnificationConnection;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnection;
import android.view.accessibility.IWindowMagnificationConnectionCallback;
import java.util.ArrayList;
@@ -42,12 +42,12 @@
* Mocks the basic logic of window magnification in System UI. We assume the screen size is
* unlimited, so source bounds is always on the center of the mirror window bounds.
*/
-class MockWindowMagnificationConnection {
+class MockMagnificationConnection {
public static final int TEST_DISPLAY = Display.DEFAULT_DISPLAY;
public static final int TEST_DISPLAY_2 = Display.DEFAULT_DISPLAY + 1;
private final List mValidDisplayIds;
- private final IWindowMagnificationConnection mConnection;
+ private final IMagnificationConnection mConnection;
private final Binder mBinder;
private final boolean mSuspendCallback;
private boolean mHasPendingCallback = false;
@@ -60,17 +60,17 @@
private Rect mSourceBounds = new Rect();
private IRemoteMagnificationAnimationCallback mAnimationCallback;
- MockWindowMagnificationConnection() throws RemoteException {
+ MockMagnificationConnection() throws RemoteException {
this(false);
}
- MockWindowMagnificationConnection(boolean suspendCallback) throws RemoteException {
+ MockMagnificationConnection(boolean suspendCallback) throws RemoteException {
mValidDisplayIds = new ArrayList();
mValidDisplayIds.add(TEST_DISPLAY);
mValidDisplayIds.add(TEST_DISPLAY_2);
mSuspendCallback = suspendCallback;
- mConnection = mock(IWindowMagnificationConnection.class);
+ mConnection = mock(IMagnificationConnection.class);
mBinder = mock(Binder.class);
when(mConnection.asBinder()).thenReturn(mBinder);
doAnswer((invocation) -> {
@@ -154,7 +154,7 @@
}
}
- IWindowMagnificationConnection getConnection() {
+ IMagnificationConnection getConnection() {
return mConnection;
}
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationGestureHandlerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationGestureHandlerTest.java
index c4be51f..a3b67ae 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationGestureHandlerTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/WindowMagnificationGestureHandlerTest.java
@@ -86,14 +86,14 @@
public static final float DEFAULT_TAP_X = 301;
public static final float DEFAULT_TAP_Y = 299;
public static final PointF DEFAULT_POINT = new PointF(DEFAULT_TAP_X, DEFAULT_TAP_Y);
- private static final int DISPLAY_0 = MockWindowMagnificationConnection.TEST_DISPLAY;
+ private static final int DISPLAY_0 = MockMagnificationConnection.TEST_DISPLAY;
@Rule
public final TestableContext mContext = new TestableContext(
InstrumentationRegistry.getInstrumentation().getContext());
private MagnificationConnectionManager mMagnificationConnectionManager;
- private MockWindowMagnificationConnection mMockConnection;
+ private MockMagnificationConnection mMockConnection;
private SpyWindowMagnificationGestureHandler mWindowMagnificationGestureHandler;
private WindowMagnificationGestureHandler mMockWindowMagnificationGestureHandler;
@Mock
@@ -107,7 +107,7 @@
mMagnificationConnectionManager = new MagnificationConnectionManager(mContext, new Object(),
mock(MagnificationConnectionManager.Callback.class), mMockTrace,
new MagnificationScaleProvider(mContext));
- mMockConnection = new MockWindowMagnificationConnection();
+ mMockConnection = new MockMagnificationConnection();
mWindowMagnificationGestureHandler = new SpyWindowMagnificationGestureHandler(
mContext, mMagnificationConnectionManager, mMockTrace, mMockCallback,
/** detectSingleFingerTripleTap= */ true, /** detectTwoFingerTripleTap= */ true,