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

Commit dff36f08 authored by Sally's avatar Sally
Browse files

Make AccessibilityServicesStateChangeListener public 

Bug: 185275778
Test: Manual, atest android.widget.cts29.ToastTest,
android.widget.cts.ToastTest AccessibilityShortcutTest,
test navigation bar is updated, test a11y volume bar
appears/disappears when TalkBack is turned on/off

Change-Id: I8bb414d8bd492528be590ed654fb1373e98c65ff
parent 97330667

core/api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -50677,6 +50677,8 @@ package android.view.accessibility { 














  public final class AccessibilityManager {















    method public void addAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);













    method public void addAccessibilityServicesStateChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);













    method public void addAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);















    method public boolean addAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);















    method public void addAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener, @Nullable android.os.Handler);















    method public boolean addTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);









@@ -50692,6 +50694,7 @@ package android.view.accessibility {













    method public boolean isEnabled();















    method public boolean isTouchExplorationEnabled();















    method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);













    method public boolean removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);















    method public boolean removeAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);















    method public boolean removeTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);















    method public void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent);









@@ -50700,6 +50703,10 @@ package android.view.accessibility {













    field public static final int FLAG_CONTENT_TEXT = 2; // 0x2















  }



























  public static interface AccessibilityManager.AccessibilityServicesStateChangeListener {













    method public void onAccessibilityServicesStateChanged(@NonNull android.view.accessibility.AccessibilityManager);













  }



























  public static interface AccessibilityManager.AccessibilityStateChangeListener {















    method public void onAccessibilityStateChanged(boolean);















  }

























core/api/test-current.txt



+0
−6




























Original line number
Diff line number
Diff line








@@ -2849,13 +2849,7 @@ package android.view {













package android.view.accessibility {































  public final class AccessibilityManager {













    method public void addAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener, @Nullable android.os.Handler);















    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public java.util.List<java.lang.String> getAccessibilityShortcutTargets(int);













    method public void removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);













  }



























  public static interface AccessibilityManager.AccessibilityServicesStateChangeListener {













    method public void onAccessibilityServicesStateChanged(android.view.accessibility.AccessibilityManager);















  }































  public class AccessibilityNodeInfo implements android.os.Parcelable {

































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



+38
−21




























Original line number
Diff line number
Diff line








@@ -23,6 +23,7 @@ import android.accessibilityservice.AccessibilityService;













import android.accessibilityservice.AccessibilityServiceInfo;















import android.accessibilityservice.AccessibilityServiceInfo.FeedbackType;















import android.accessibilityservice.AccessibilityShortcutInfo;













import android.annotation.CallbackExecutor;















import android.annotation.ColorInt;















import android.annotation.IntDef;















import android.annotation.NonNull;









@@ -46,6 +47,7 @@ import android.content.res.Resources;













import android.os.Binder;















import android.os.Build;















import android.os.Handler;













import android.os.HandlerExecutor;















import android.os.IBinder;















import android.os.Looper;















import android.os.Message;










@@ -73,6 +75,7 @@ import java.lang.annotation.RetentionPolicy;













import java.util.ArrayList;















import java.util.Collections;















import java.util.List;













import java.util.concurrent.Executor;































/**















 * System level service that serves as an event dispatch for {@link AccessibilityEvent}s,










@@ -263,7 +266,7 @@ public final class AccessibilityManager {













    private final ArrayMap<HighTextContrastChangeListener, Handler>















            mHighTextContrastStateChangeListeners = new ArrayMap<>();





























    private final ArrayMap<AccessibilityServicesStateChangeListener, Handler>













    private final ArrayMap<AccessibilityServicesStateChangeListener, Executor>















            mServicesStateChangeListeners = new ArrayMap<>();































    /**










@@ -303,13 +306,20 @@ public final class AccessibilityManager {













    }































    /**













     * Listener for changes to the state of accessibility services. Changes include services being













     * enabled or disabled, or changes to the {@link AccessibilityServiceInfo} of a running service.













     * {@see #addAccessibilityServicesStateChangeListener}.













     * Listener for changes to the state of accessibility services.













     *













     * <p>













     * This refers to changes to {@link AccessibilityServiceInfo}, including:













     * <ul>













     *     <li>Whenever a service is enabled or disabled, or its info has been set or removed.</li>













     *     <li>Whenever a metadata attribute of any running service's info changes.</li>













     * </ul>













     *













     * @see #getEnabledAccessibilityServiceList for a list of infos of the enabled accessibility













     * services.













     * @see #addAccessibilityServicesStateChangeListener















     *













     * @hide















     */













    @TestApi















    public interface AccessibilityServicesStateChangeListener {































        /**









@@ -317,7 +327,7 @@ public final class AccessibilityManager {













         *















         * @param manager The manager that is calling back















         */













        void onAccessibilityServicesStateChanged(AccessibilityManager manager);













        void onAccessibilityServicesStateChanged(@NonNull  AccessibilityManager manager);















    }































    /**










@@ -409,7 +419,7 @@ public final class AccessibilityManager {













        public void notifyServicesStateChanged(long updatedUiTimeout) {















            updateUiTimeout(updatedUiTimeout);





























            final ArrayMap<AccessibilityServicesStateChangeListener, Handler> listeners;













            final ArrayMap<AccessibilityServicesStateChangeListener, Executor> listeners;















            synchronized (mLock) {















                if (mServicesStateChangeListeners.isEmpty()) {















                    return;









@@ -421,7 +431,7 @@ public final class AccessibilityManager {













            for (int i = 0; i < numListeners; i++) {















                final AccessibilityServicesStateChangeListener listener =















                        mServicesStateChangeListeners.keyAt(i);













                mServicesStateChangeListeners.valueAt(i).post(() -> listener













                mServicesStateChangeListeners.valueAt(i).execute(() -> listener















                        .onAccessibilityServicesStateChanged(AccessibilityManager.this));















            }















        }










@@ -914,32 +924,39 @@ public final class AccessibilityManager {













    /**















     * Registers a {@link AccessibilityServicesStateChangeListener}.















     *













     * @param executor The executor.















     * @param listener The listener.













     * @param handler The handler on which the listener should be called back, or {@code null}













     *                for a callback on the process's main handler.













     * @hide















     */













    @TestApi















    public void addAccessibilityServicesStateChangeListener(













            @NonNull AccessibilityServicesStateChangeListener listener, @Nullable Handler handler) {













            @NonNull @CallbackExecutor Executor executor,













            @NonNull AccessibilityServicesStateChangeListener listener) {















        synchronized (mLock) {













            mServicesStateChangeListeners













                    .put(listener, (handler == null) ? mHandler : handler);













            mServicesStateChangeListeners.put(listener, executor);















        }















    }































    /**













     * Unregisters a {@link AccessibilityServicesStateChangeListener}.













     * Registers a {@link AccessibilityServicesStateChangeListener}. This will execute a callback on













     * the process's main handler.















     *















     * @param listener The listener.















     *













     * @hide















     */













    @TestApi













    public void removeAccessibilityServicesStateChangeListener(













    public void addAccessibilityServicesStateChangeListener(













            @NonNull AccessibilityServicesStateChangeListener listener) {













        addAccessibilityServicesStateChangeListener(new HandlerExecutor(mHandler), listener);













    }



























    /**













     * Unregisters a {@link AccessibilityServicesStateChangeListener}.













     *













     * @param listener The listener.













     * @return {@code true} if the listener was previously registered.













     */













    public boolean removeAccessibilityServicesStateChangeListener(















            @NonNull AccessibilityServicesStateChangeListener listener) {















        synchronized (mLock) {













            mServicesStateChangeListeners.remove(listener);













            return mServicesStateChangeListeners.remove(listener) != null;















        }















    }

















































packages/SystemUI/src/com/android/systemui/statusbar/policy/AccessibilityManagerWrapper.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -41,7 +41,7 @@ public class AccessibilityManagerWrapper implements





























    @Override















    public void addCallback(@NonNull AccessibilityServicesStateChangeListener listener) {













        mAccessibilityManager.addAccessibilityServicesStateChangeListener(listener, null);













        mAccessibilityManager.addAccessibilityServicesStateChangeListener(listener);















    }































    @Override

































services/core/java/com/android/server/audio/AudioService.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -8550,7 +8550,7 @@ public class AudioService extends IAudioService.Stub













        updateDefaultStreamOverrideDelay(accessibilityManager.isTouchExplorationEnabled());















        updateA11yVolumeAlias(accessibilityManager.isAccessibilityVolumeStreamActive());















        accessibilityManager.addTouchExplorationStateChangeListener(this, null);













        accessibilityManager.addAccessibilityServicesStateChangeListener(this, null);













        accessibilityManager.addAccessibilityServicesStateChangeListener(this);















    }































    //---------------------------------------------------------------------------------