Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updates the doc for FEATURE_WINDOW_MAGNIFICATION" into tm-dev

Browse Source
This commit is contained in:
Minche Li
2022-03-30 01:30:14 +00:00
committed by Android (Google) Code Review
parent d4dc4fbfad 76ee08efb5
commit 70a4c7685c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/accessibilityservice/MagnificationConfig.java
View File

@@ -42,9 +42,9 @@ import java.lang.annotation.RetentionPolicy;
* </p> * </p>
* *
* <p> * <p>
* When the magnification config uses {@link #MAGNIFICATION_MODE_WINDOW}. * When the magnification config uses {@link #MAGNIFICATION_MODE_WINDOW} and the platform
* {@link AccessibilityService} will be able to control the activated window magnifier * supports {@link android.content.pm.PackageManager#FEATURE_WINDOW_MAGNIFICATION} feature.
* on the display. * {@link AccessibilityService} will be able to control window magnifier on the display.
* </p> * </p>
* *
* <p> * <p>
@@ -57,9 +57,12 @@ public final class MagnificationConfig implements Parcelable {
/** The controlling magnification mode. It controls the activated magnifier. */ /** The controlling magnification mode. It controls the activated magnifier. */
public static final int MAGNIFICATION_MODE_DEFAULT = 0; public static final int MAGNIFICATION_MODE_DEFAULT = 0;
/** The controlling magnification mode. It controls fullscreen magnifier. */ /** The controlling magnification mode. It controls full-screen magnifier. */
public static final int MAGNIFICATION_MODE_FULLSCREEN = 1; public static final int MAGNIFICATION_MODE_FULLSCREEN = 1;
/** The controlling magnification mode. It controls window magnifier. */ /**
* The controlling magnification mode. It is valid if the platform supports
* {@link android.content.pm.PackageManager#FEATURE_WINDOW_MAGNIFICATION} feature.
*/
public static final int MAGNIFICATION_MODE_WINDOW = 2; public static final int MAGNIFICATION_MODE_WINDOW = 2;
/** @hide */ /** @hide */

2
core/java/android/content/pm/PackageManager.java
View File

@@ -4188,6 +4188,8 @@ public abstract class PackageManager {
/** /**
* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device
* supports window magnification. * supports window magnification.
*
* @see android.accessibilityservice.MagnificationConfig#MAGNIFICATION_MODE_WINDOW
*/ */
@SdkConstant(SdkConstantType.FEATURE) @SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_WINDOW_MAGNIFICATION = public static final String FEATURE_WINDOW_MAGNIFICATION =