Merge "refactor(magnification): Renaming IWindowMagnificationConnectionCallback as IMagnificationConnectionCallback" into main
diff --git a/core/java/android/accessibilityservice/AccessibilityTrace.java b/core/java/android/accessibilityservice/AccessibilityTrace.java
index 7700b33..87304c8 100644
--- a/core/java/android/accessibilityservice/AccessibilityTrace.java
+++ b/core/java/android/accessibilityservice/AccessibilityTrace.java
@@ -36,7 +36,7 @@
"IAccessibilityInteractionConnectionCallback";
String NAME_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK = "IRemoteMagnificationAnimationCallback";
String NAME_MAGNIFICATION_CONNECTION = "IMagnificationConnection";
- String NAME_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK = "IWindowMagnificationConnectionCallback";
+ String NAME_MAGNIFICATION_CONNECTION_CALLBACK = "IMagnificationConnectionCallback";
String NAME_WINDOW_MANAGER_INTERNAL = "WindowManagerInternal";
String NAME_WINDOWS_FOR_ACCESSIBILITY_CALLBACK = "WindowsForAccessibilityCallback";
String NAME_MAGNIFICATION_CALLBACK = "MagnificationCallbacks";
@@ -59,7 +59,7 @@
long FLAGS_ACCESSIBILITY_INTERACTION_CONNECTION_CALLBACK = 0x0000000000000020L;
long FLAGS_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK = 0x0000000000000040L;
long FLAGS_MAGNIFICATION_CONNECTION = 0x0000000000000080L;
- long FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK = 0x0000000000000100L;
+ long FLAGS_MAGNIFICATION_CONNECTION_CALLBACK = 0x0000000000000100L;
long FLAGS_WINDOW_MANAGER_INTERNAL = 0x0000000000000200L;
long FLAGS_WINDOWS_FOR_ACCESSIBILITY_CALLBACK = 0x0000000000000400L;
long FLAGS_MAGNIFICATION_CALLBACK = 0x0000000000000800L;
@@ -100,8 +100,8 @@
new AbstractMap.SimpleEntry<String, Long>(
NAME_MAGNIFICATION_CONNECTION, FLAGS_MAGNIFICATION_CONNECTION),
new AbstractMap.SimpleEntry<String, Long>(
- NAME_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK),
+ NAME_MAGNIFICATION_CONNECTION_CALLBACK,
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK),
new AbstractMap.SimpleEntry<String, Long>(
NAME_WINDOW_MANAGER_INTERNAL, FLAGS_WINDOW_MANAGER_INTERNAL),
new AbstractMap.SimpleEntry<String, Long>(
diff --git a/core/java/android/view/accessibility/IMagnificationConnection.aidl b/core/java/android/view/accessibility/IMagnificationConnection.aidl
index a5e8aaf..aae51ab 100644
--- a/core/java/android/view/accessibility/IMagnificationConnection.aidl
+++ b/core/java/android/view/accessibility/IMagnificationConnection.aidl
@@ -18,7 +18,7 @@
import android.graphics.PointF;
import android.graphics.Rect;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
/**
@@ -110,11 +110,11 @@
void removeMagnificationSettingsPanel(int displayId);
/**
- * Sets {@link IWindowMagnificationConnectionCallback} to receive the request or the callback.
+ * Sets {@link IMagnificationConnectionCallback} to receive the request or the callback.
*
* @param callback the interface to be called.
*/
- void setConnectionCallback(in IWindowMagnificationConnectionCallback callback);
+ void setConnectionCallback(in IMagnificationConnectionCallback callback);
/**
* Notify System UI the magnification scale on the specified display for userId is changed.
diff --git a/core/java/android/view/accessibility/IWindowMagnificationConnectionCallback.aidl b/core/java/android/view/accessibility/IMagnificationConnectionCallback.aidl
similarity index 97%
rename from core/java/android/view/accessibility/IWindowMagnificationConnectionCallback.aidl
rename to core/java/android/view/accessibility/IMagnificationConnectionCallback.aidl
index 21b4334..0ba61b1 100644
--- a/core/java/android/view/accessibility/IWindowMagnificationConnectionCallback.aidl
+++ b/core/java/android/view/accessibility/IMagnificationConnectionCallback.aidl
@@ -24,7 +24,7 @@
*
* @hide
*/
- oneway interface IWindowMagnificationConnectionCallback {
+ oneway interface IMagnificationConnectionCallback {
/**
* Called when the bounds of the mirrow window is changed.
diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java
index 4944531..ba943b0 100644
--- a/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java
@@ -22,8 +22,8 @@
import android.os.RemoteException;
import android.util.Log;
import android.view.accessibility.IMagnificationConnection;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
import com.android.systemui.dagger.qualifiers.Main;
@@ -36,7 +36,7 @@
private static final String TAG = "WindowMagnificationConnectionImpl";
- private IWindowMagnificationConnectionCallback mConnectionCallback;
+ private IMagnificationConnectionCallback mConnectionCallback;
private final Magnification mMagnification;
private final Handler mHandler;
@@ -105,7 +105,7 @@
}
@Override
- public void setConnectionCallback(IWindowMagnificationConnectionCallback callback) {
+ public void setConnectionCallback(IMagnificationConnectionCallback callback) {
mConnectionCallback = callback;
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java
index 235aa21..f8856c9 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java
@@ -34,8 +34,8 @@
import android.view.Display;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.IMagnificationConnection;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
import androidx.test.filters.SmallTest;
@@ -67,7 +67,7 @@
@Mock
private CommandQueue mCommandQueue;
@Mock
- private IWindowMagnificationConnectionCallback mConnectionCallback;
+ private IMagnificationConnectionCallback mConnectionCallback;
@Mock
private WindowMagnificationController mWindowMagnificationController;
@Mock
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 39c8f5d..d0e1678 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationTest.java
@@ -44,7 +44,7 @@
import android.view.Display;
import android.view.accessibility.AccessibilityManager;
import android.view.accessibility.IMagnificationConnection;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
+import android.view.accessibility.IMagnificationConnectionCallback;
import androidx.test.filters.SmallTest;
@@ -75,7 +75,7 @@
@Mock
private SysUiState mSysUiState;
@Mock
- private IWindowMagnificationConnectionCallback mConnectionCallback;
+ private IMagnificationConnectionCallback mConnectionCallback;
@Mock
private OverviewProxyService mOverviewProxyService;
@Mock
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java
index 307b555..8471061 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityTraceManager.java
@@ -224,7 +224,7 @@
pw.println(" IAccessibilityInteractionConnectionCallback");
pw.println(" IRemoteMagnificationAnimationCallback");
pw.println(" IMagnificationConnection");
- pw.println(" IWindowMagnificationConnectionCallback");
+ pw.println(" IMagnificationConnectionCallback");
pw.println(" WindowManagerInternal");
pw.println(" WindowsForAccessibilityCallback");
pw.println(" MagnificationCallbacks");
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 eff6488..e6af54b 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionManager.java
@@ -17,7 +17,7 @@
package com.android.server.accessibility.magnification;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION;
-import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK;
+import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION_CALLBACK;
import static android.view.accessibility.MagnificationAnimationCallback.STUB_ANIMATION_CALLBACK;
import static com.android.server.accessibility.AccessibilityManagerService.INVALID_SERVICE_ID;
@@ -43,7 +43,7 @@
import android.util.SparseBooleanArray;
import android.view.MotionEvent;
import android.view.accessibility.IMagnificationConnection;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.MagnificationAnimationCallback;
import com.android.internal.accessibility.common.MagnificationConstants;
@@ -922,16 +922,16 @@
disableWindowMagnification(displayId, true);
}
- private class ConnectionCallback extends IWindowMagnificationConnectionCallback.Stub implements
+ private class ConnectionCallback extends IMagnificationConnectionCallback.Stub implements
IBinder.DeathRecipient {
private boolean mExpiredDeathRecipient = false;
@Override
public void onWindowMagnifierBoundsChanged(int displayId, Rect bounds) {
if (mTrace.isA11yTracingEnabledForTypes(
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + "ConnectionCallback.onWindowMagnifierBoundsChanged",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK,
"displayId=" + displayId + ";bounds=" + bounds);
}
synchronized (mLock) {
@@ -951,9 +951,9 @@
public void onChangeMagnificationMode(int displayId, int magnificationMode)
throws RemoteException {
if (mTrace.isA11yTracingEnabledForTypes(
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + "ConnectionCallback.onChangeMagnificationMode",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK,
"displayId=" + displayId + ";mode=" + magnificationMode);
}
mCallback.onChangeMagnificationMode(displayId, magnificationMode);
@@ -962,9 +962,9 @@
@Override
public void onSourceBoundsChanged(int displayId, Rect sourceBounds) {
if (mTrace.isA11yTracingEnabledForTypes(
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + "ConnectionCallback.onSourceBoundsChanged",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK,
"displayId=" + displayId + ";source=" + sourceBounds);
}
synchronized (mLock) {
@@ -980,9 +980,9 @@
@Override
public void onPerformScaleAction(int displayId, float scale, boolean updatePersistence) {
if (mTrace.isA11yTracingEnabledForTypes(
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + "ConnectionCallback.onPerformScaleAction",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK,
"displayId=" + displayId + ";scale=" + scale
+ ";updatePersistence=" + updatePersistence);
}
@@ -992,9 +992,9 @@
@Override
public void onAccessibilityActionPerformed(int displayId) {
if (mTrace.isA11yTracingEnabledForTypes(
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + "ConnectionCallback.onAccessibilityActionPerformed",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK,
"displayId=" + displayId);
}
mCallback.onAccessibilityActionPerformed(displayId);
@@ -1003,9 +1003,9 @@
@Override
public void onMove(int displayId) {
if (mTrace.isA11yTracingEnabledForTypes(
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + "ConnectionCallback.onMove",
- FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
+ FLAGS_MAGNIFICATION_CONNECTION_CALLBACK,
"displayId=" + displayId);
}
setTrackingTypingFocusEnabled(displayId, false);
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 d7098a7..c63784a 100644
--- a/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionWrapper.java
+++ b/services/accessibility/java/com/android/server/accessibility/magnification/MagnificationConnectionWrapper.java
@@ -17,8 +17,8 @@
package com.android.server.accessibility.magnification;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION;
+import static android.accessibilityservice.AccessibilityTrace.FLAGS_MAGNIFICATION_CONNECTION_CALLBACK;
import static android.accessibilityservice.AccessibilityTrace.FLAGS_REMOTE_MAGNIFICATION_ANIMATION_CALLBACK;
-import static android.accessibilityservice.AccessibilityTrace.FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK;
import static android.os.IBinder.DeathRecipient;
import android.annotation.NonNull;
@@ -26,8 +26,8 @@
import android.os.RemoteException;
import android.util.Slog;
import android.view.accessibility.IMagnificationConnection;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
import android.view.accessibility.MagnificationAnimationCallback;
import com.android.server.accessibility.AccessibilityTraceManager;
@@ -217,13 +217,13 @@
return true;
}
- boolean setConnectionCallback(IWindowMagnificationConnectionCallback connectionCallback) {
+ boolean setConnectionCallback(IMagnificationConnectionCallback connectionCallback) {
if (mTrace.isA11yTracingEnabledForTypes(
FLAGS_MAGNIFICATION_CONNECTION
- | FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK)) {
+ | FLAGS_MAGNIFICATION_CONNECTION_CALLBACK)) {
mTrace.logTrace(TAG + ".setConnectionCallback",
FLAGS_MAGNIFICATION_CONNECTION
- | FLAGS_WINDOW_MAGNIFICATION_CONNECTION_CALLBACK,
+ | FLAGS_MAGNIFICATION_CONNECTION_CALLBACK,
"callback=" + connectionCallback);
}
try {
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 a7cf361..009bfb7 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
@@ -52,8 +52,8 @@
import android.test.mock.MockContentResolver;
import android.view.InputDevice;
import android.view.MotionEvent;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
import android.view.accessibility.MagnificationAnimationCallback;
import androidx.test.core.app.ApplicationProvider;
@@ -146,7 +146,7 @@
assertTrue(mMagnificationConnectionManager.isConnected());
verify(mMockConnection.asBinder()).linkToDeath(any(IBinder.DeathRecipient.class), eq(0));
verify(mMockConnection.getConnection()).setConnectionCallback(
- any(IWindowMagnificationConnectionCallback.class));
+ any(IMagnificationConnectionCallback.class));
}
@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 8fdd884..07f3036 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
@@ -25,8 +25,8 @@
import android.provider.Settings;
import android.view.Display;
import android.view.accessibility.IMagnificationConnection;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
import android.view.accessibility.MagnificationAnimationCallback;
import com.android.server.accessibility.AccessibilityTraceManager;
@@ -49,7 +49,7 @@
@Mock
private AccessibilityTraceManager mTrace;
@Mock
- private IWindowMagnificationConnectionCallback mCallback;
+ private IMagnificationConnectionCallback mCallback;
@Mock
private MagnificationAnimationCallback mAnimationCallback;
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockMagnificationConnection.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockMagnificationConnection.java
index 3d3d0b7..35b6c90 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockMagnificationConnection.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/MockMagnificationConnection.java
@@ -32,8 +32,8 @@
import android.os.RemoteException;
import android.view.Display;
import android.view.accessibility.IMagnificationConnection;
+import android.view.accessibility.IMagnificationConnectionCallback;
import android.view.accessibility.IRemoteMagnificationAnimationCallback;
-import android.view.accessibility.IWindowMagnificationConnectionCallback;
import java.util.ArrayList;
import java.util.List;
@@ -53,7 +53,7 @@
private boolean mHasPendingCallback = false;
private boolean mWindowMagnificationEnabled = false;
private IBinder.DeathRecipient mDeathRecipient;
- private IWindowMagnificationConnectionCallback mIMirrorWindowCallback;
+ private IMagnificationConnectionCallback mIMagnificationCallback;
private Rect mMirrorWindowFrame = new Rect(0, 0, 500, 500);
private float mScale = 2.0f;
@@ -74,10 +74,10 @@
mBinder = mock(Binder.class);
when(mConnection.asBinder()).thenReturn(mBinder);
doAnswer((invocation) -> {
- mIMirrorWindowCallback = invocation.getArgument(0);
+ mIMagnificationCallback = invocation.getArgument(0);
return null;
}).when(mConnection).setConnectionCallback(
- any(IWindowMagnificationConnectionCallback.class));
+ any(IMagnificationConnectionCallback.class));
doAnswer((invocation) -> {
mDeathRecipient = invocation.getArgument(0);
@@ -166,8 +166,8 @@
return mDeathRecipient;
}
- IWindowMagnificationConnectionCallback getConnectionCallback() {
- return mIMirrorWindowCallback;
+ IMagnificationConnectionCallback getConnectionCallback() {
+ return mIMagnificationCallback;
}
Rect getMirrorWindowFrame() {
@@ -185,10 +185,10 @@
if (!mHasPendingCallback) {
throw new IllegalStateException("There is no any pending callbacks");
}
- if (mWindowMagnificationEnabled && mIMirrorWindowCallback != null) {
- mIMirrorWindowCallback.onWindowMagnifierBoundsChanged(TEST_DISPLAY,
+ if (mWindowMagnificationEnabled && mIMagnificationCallback != null) {
+ mIMagnificationCallback.onWindowMagnifierBoundsChanged(TEST_DISPLAY,
mMirrorWindowFrame);
- mIMirrorWindowCallback.onSourceBoundsChanged(TEST_DISPLAY,
+ mIMagnificationCallback.onSourceBoundsChanged(TEST_DISPLAY,
mSourceBounds);
}
sendAnimationEndCallbackIfNeeded(success);