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

Commit 214fb687 authored by Alan Viverette's avatar Alan Viverette
Browse files

APIs for querying and controlling display magnification 

Also separates magnification state and touch event handling. Moves
callbacks for window manager changes and display state changes into
the magnification controller.

Bug: 22718911
Change-Id: I3a8ba060a07d8f1f51856855a5f85601766fd45d
parent 0283d44c

api/current.txt

+20 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ package android { 
    field public static final int calendarTextColor = 16843931; // 0x101049b

    field public static final int calendarViewShown = 16843596; // 0x101034c

    field public static final int calendarViewStyle = 16843613; // 0x101035d

    field public static final int canControlMagnification = 16844040; // 0x1010508

    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8

    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7
@@ -2619,6 +2620,7 @@ package android.accessibilityservice { 
  public abstract class AccessibilityService extends android.app.Service {

    ctor public AccessibilityService();

    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

    method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();

    method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();

    method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();

    method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
@@ -2656,6 +2658,23 @@ package android.accessibilityservice { 
    field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";

  }













  public static final class AccessibilityService.MagnificationController {













    method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);













    method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener, android.os.Handler);













    method public float getCenterX();













    method public float getCenterY();













    method public android.graphics.Region getMagnifiedRegion();













    method public float getScale();













    method public boolean removeListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);













    method public boolean reset(boolean);













    method public boolean setCenter(float, float, boolean);













    method public boolean setScale(float, boolean);













  }

























  public static abstract interface AccessibilityService.MagnificationController.OnMagnificationChangedListener {













    method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);













  }



























  public class AccessibilityServiceInfo implements android.os.Parcelable {















    ctor public AccessibilityServiceInfo();















    method public static java.lang.String capabilityToString(int);









@@ -2670,6 +2689,7 @@ package android.accessibilityservice {













    method public java.lang.String getSettingsActivityName();















    method public java.lang.String loadDescription(android.content.pm.PackageManager);















    method public void writeToParcel(android.os.Parcel, int);













    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10















    field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4















    field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8















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

























api/system-current.txt



+20
−0




























Original line number
Diff line number
Diff line








@@ -424,6 +424,7 @@ package android {













    field public static final int calendarTextColor = 16843931; // 0x101049b















    field public static final int calendarViewShown = 16843596; // 0x101034c















    field public static final int calendarViewStyle = 16843613; // 0x101035d













    field public static final int canControlMagnification = 16844040; // 0x1010508















    field public static final int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8















    field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9















    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7










@@ -2718,6 +2719,7 @@ package android.accessibilityservice {













  public abstract class AccessibilityService extends android.app.Service {















    ctor public AccessibilityService();















    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);













    method public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();















    method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();















    method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();















    method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();










@@ -2755,6 +2757,23 @@ package android.accessibilityservice {













    field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";















  }



























  public static final class AccessibilityService.MagnificationController {













    method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);













    method public void addListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener, android.os.Handler);













    method public float getCenterX();













    method public float getCenterY();













    method public android.graphics.Region getMagnifiedRegion();













    method public float getScale();













    method public boolean removeListener(android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);













    method public boolean reset(boolean);













    method public boolean setCenter(float, float, boolean);













    method public boolean setScale(float, boolean);













  }

























  public static abstract interface AccessibilityService.MagnificationController.OnMagnificationChangedListener {













    method public abstract void onMagnificationChanged(android.accessibilityservice.AccessibilityService.MagnificationController, android.graphics.Region, float, float, float);













  }



























  public class AccessibilityServiceInfo implements android.os.Parcelable {















    ctor public AccessibilityServiceInfo();















    method public static java.lang.String capabilityToString(int);









@@ -2769,6 +2788,7 @@ package android.accessibilityservice {













    method public java.lang.String getSettingsActivityName();















    method public java.lang.String loadDescription(android.content.pm.PackageManager);















    method public void writeToParcel(android.os.Parcel, int);













    field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10















    field public static final int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4















    field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8















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

























core/java/android/accessibilityservice/AccessibilityService.java



+434
−1


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/accessibilityservice/AccessibilityServiceInfo.java



+16
−0




























Original line number
Diff line number
Diff line








@@ -104,6 +104,12 @@ public class AccessibilityServiceInfo implements Parcelable {













     */















    public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 0x00000008;





























    /**













     * Capability: This accessibility service can control display magnification.













     * @see android.R.styleable#AccessibilityService_canControlMagnification













     */













    public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 0x00000010;





























    private static final SparseArray<CapabilityInfo> sAvailableCapabilityInfos =















            new SparseArray<CapabilityInfo>();















    static {









@@ -123,6 +129,10 @@ public class AccessibilityServiceInfo implements Parcelable {













                new CapabilityInfo(CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS,















                        R.string.capability_title_canRequestFilterKeyEvents,















                        R.string.capability_desc_canRequestFilterKeyEvents));













        sAvailableCapabilityInfos.put(CAPABILITY_CAN_CONTROL_MAGNIFICATION,













                new CapabilityInfo(CAPABILITY_CAN_CONTROL_MAGNIFICATION,













                        R.string.capability_title_canControlMagnification,













                        R.string.capability_desc_canControlMagnification));















    }































    /**










@@ -502,6 +512,10 @@ public class AccessibilityServiceInfo implements Parcelable {













                    .AccessibilityService_canRequestFilterKeyEvents, false)) {















                mCapabilities |= CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS;















            }













            if (asAttributes.getBoolean(com.android.internal.R.styleable













                    .AccessibilityService_canControlMagnification, false)) {













                mCapabilities |= CAPABILITY_CAN_CONTROL_MAGNIFICATION;













            }















            TypedValue peekedValue = asAttributes.peekValue(















                    com.android.internal.R.styleable.AccessibilityService_description);















            if (peekedValue != null) {










@@ -917,6 +931,8 @@ public class AccessibilityServiceInfo implements Parcelable {













                return "CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY";















            case CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS:















                return "CAPABILITY_CAN_FILTER_KEY_EVENTS";













            case CAPABILITY_CAN_CONTROL_MAGNIFICATION:













                return "CAPABILITY_CAN_CONTROL_MAGNIFICATION";















            default:















                return "UNKNOWN";















        }

































core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl



+3
−0




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.accessibilityservice;































import android.accessibilityservice.IAccessibilityServiceConnection;













import android.graphics.Region;















import android.view.accessibility.AccessibilityEvent;















import android.view.accessibility.AccessibilityWindowInfo;















import android.view.KeyEvent;









@@ -39,4 +40,6 @@ import android.view.KeyEvent;













    void clearAccessibilityCache();































    void onKeyEvent(in KeyEvent event, int sequence);



























    void onMagnificationChanged(in Region region, float scale, float centerX, float centerY);















}