Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83bd30bf authored by Candice Lo's avatar Candice Lo
Browse files

refactor(magnification): Renaming IWindowMagnificationConnectionCallback as... 

refactor(magnification): Renaming IWindowMagnificationConnectionCallback as IMagnificationConnectionCallback

Considering the connection callback is handling functions more than window magnification operations, we would like to rename it as IMagnificationConnectionCallback.

Bug: 310109308
Test: manually. Renaming the class and methods
      atest IMagnificationConnectionTest
      atest MagnificationConnectionManagerTest
      atest MagnificationConnectionWrapperTest
Flag: NA
Change-Id: Ic2e17dcb40602b97e07c5491f668ae6815240dd9
parent 2b6ba138

core/java/android/accessibilityservice/AccessibilityTrace.java

+4 −4
Original line number Diff line number Diff line
@@ -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>(

core/java/android/view/accessibility/IMagnificationConnection.aidl

+3 −3
Original line number Diff line number Diff line
@@ -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.

core/java/android/view/accessibility/IWindowMagnificationConnectionCallback.aidl→core/java/android/view/accessibility/IMagnificationConnectionCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -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.

packages/SystemUI/src/com/android/systemui/accessibility/MagnificationConnectionImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

    }

packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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