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

Commit 95cfaec2 authored by Candice Lo's avatar Candice Lo Committed by Android (Google) Code Review
Browse files

Merge "refactor(magnification): Renaming IWindowMagnificationConnection as... 

Merge "refactor(magnification): Renaming IWindowMagnificationConnection as IMagnificationConnection" into main
parents 7b953be3 27ca5590

boot/preloaded-classes

+3 −3
Original line number Diff line number Diff line
@@ -8924,9 +8924,9 @@ android.view.accessibility.IAccessibilityManager 
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

config/preloaded-classes

+3 −3
Original line number Diff line number Diff line
@@ -8955,9 +8955,9 @@ android.view.accessibility.IAccessibilityManager 
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

core/java/android/accessibilityservice/AccessibilityTrace.java

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public interface AccessibilityTrace { 
    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 @@ public interface AccessibilityTrace { 
    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 @@ public interface AccessibilityTrace { 
                    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),

core/java/android/view/accessibility/AccessibilityManager.java

+6 −6
Original line number Diff line number Diff line
@@ -1823,13 +1823,13 @@ public final class AccessibilityManager { 


    /**

     *

     * 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 @@ public final class AccessibilityManager { 
            }

        }

        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);

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.view.accessibility.AccessibilityNodeInfo; 
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 @@ interface IAccessibilityManager { 


    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);