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

Commit 496cd387 authored by Casey Burkhardt's avatar Casey Burkhardt Committed by Android (Google) Code Review
Browse files

Merge "Manually merge CL 2175149 to master for green build"

parents 294b0cc8 2233fb13

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -50527,6 +50527,7 @@ package android.view.accessibility { 
    method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getEnabledAccessibilityServiceList(int);

    method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getInstalledAccessibilityServiceList();

    method public void interrupt();

    method public static boolean isAccessibilityButtonSupported();

    method public boolean isEnabled();

    method public boolean isTouchExplorationEnabled();

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

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

+15 −0
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ import android.accessibilityservice.AccessibilityServiceInfo; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.ServiceInfo;

import android.content.res.Resources;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;
@@ -1113,6 +1115,19 @@ public final class AccessibilityManager { 
        }

    }



    /**

     * Determines if the accessibility button within the system navigation area is supported.

     *

     * @return {@code true} if the accessibility button is supported on this device,

     * {@code false} otherwise

     * @hide

     */

    @SystemApi

    public static boolean isAccessibilityButtonSupported() {

        final Resources res = Resources.getSystem();

        return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);

    }



    private final class MyCallback implements Handler.Callback {

        public static final int MSG_SET_STATE = 1;

packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityButtonHelper.java

+0 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settingslib.accessibility; 


import android.accessibilityservice.AccessibilityServiceInfo;

import android.content.Context;

import android.content.res.Resources;

import android.provider.Settings;

import android.view.accessibility.AccessibilityManager;
@@ -55,8 +54,4 @@ public class AccessibilityButtonHelper { 
    public static boolean isRequested(Context ctx) {

        return isRequestedByMagnification(ctx) || isRequestedByAccessibilityService(ctx);

    }



    public static boolean isDeviceSupported(Resources res) {

        return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);

    }

}