diff options
12 files changed, 49 insertions, 49 deletions
diff --git a/core/java/android/accessibilityservice/AccessibilityTrace.java b/core/java/android/accessibilityservice/AccessibilityTrace.java index 7700b33253fd..87304c8311bd 100644 --- a/core/java/android/accessibilityservice/AccessibilityTrace.java +++ b/core/java/android/accessibilityservice/AccessibilityTrace.java @@ -36,7 +36,7 @@ public interface AccessibilityTrace { "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 @@ public interface AccessibilityTrace { 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 @@ public interface AccessibilityTrace { 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 a5e8aaf97de4..aae51abd3c78 100644 --- a/core/java/android/view/accessibility/IMagnificationConnection.aidl +++ b/core/java/android/view/accessibility/IMagnificationConnection.aidl @@ -18,7 +18,7 @@ package android.view.accessibility; 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 @@ oneway interface IMagnificationConnection { 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 index 21b433465a3a..0ba61b10811f 100644 --- a/core/java/android/view/accessibility/IWindowMagnificationConnectionCallback.aidl +++ b/core/java/android/view/accessibility/IMagnificationConnectionCallback.aidl @@ -24,7 +24,7 @@ import android.graphics.Rect; * * @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 4944531989d3..ba943b07b704 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.Handler; 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 @@ class MagnificationConnectionImpl extends IMagnificationConnection.Stub { private static final String TAG = "WindowMagnificationConnectionImpl"; - private IWindowMagnificationConnectionCallback mConnectionCallback; + private IMagnificationConnectionCallback mConnectionCallback; private final Magnification mMagnification; private final Handler mHandler; @@ -105,7 +105,7 @@ class MagnificationConnectionImpl extends IMagnificationConnection.Stub { } @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 235aa218715d..f8856c968a23 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.testing.TestableLooper; 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 @@ public class IMagnificationConnectionTest extends SysuiTestCase { @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 39c8f5d724b0..d0e1678739c4 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.testing.TestableLooper; 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 @@ public class MagnificationTest extends SysuiTestCase { @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 307b555b3b99..8471061358dd 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 @@ public class AccessibilityTraceManager implements AccessibilityTrace { 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 eff6488bc032..e6af54bd937c 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.SparseArray; 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 @@ public class MagnificationConnectionManager implements 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 class MagnificationConnectionManager implements 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 @@ public class MagnificationConnectionManager implements @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 @@ public class MagnificationConnectionManager implements @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 @@ public class MagnificationConnectionManager implements @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 @@ public class MagnificationConnectionManager implements @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 d7098a78d248..c63784a79ffd 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.annotation.Nullable; 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 @@ class MagnificationConnectionWrapper { 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 a7cf361c7bc1..009bfb7efca6 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.provider.Settings; 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 @@ public class MagnificationConnectionManagerTest { 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 8fdd884380d5..07f3036410a0 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.os.RemoteException; 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 @@ public class MagnificationConnectionWrapperTest { @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 3d3d0b7aa07a..35b6c9085501 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.IBinder; 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 @@ class MockMagnificationConnection { 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 @@ class MockMagnificationConnection { 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 @@ class MockMagnificationConnection { return mDeathRecipient; } - IWindowMagnificationConnectionCallback getConnectionCallback() { - return mIMirrorWindowCallback; + IMagnificationConnectionCallback getConnectionCallback() { + return mIMagnificationCallback; } Rect getMirrorWindowFrame() { @@ -185,10 +185,10 @@ class MockMagnificationConnection { 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); |