Merge "Remove "enhance web scripts" from settings and make it requested by plug-ins." (ec695824) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@ package android {
		field public static final java.lang.String CALL_PHONE = "android.permission.CALL_PHONE";
		field public static final java.lang.String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";
		field public static final java.lang.String CAMERA = "android.permission.CAMERA";
		field public static final java.lang.String CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = "android.permission.CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY";
		field public static final java.lang.String CAN_REQUEST_TOUCH_EXPLORATION_MODE = "android.permission.CAN_REQUEST_TOUCH_EXPLORATION_MODE";
		field public static final java.lang.String CHANGE_COMPONENT_ENABLED_STATE = "android.permission.CHANGE_COMPONENT_ENABLED_STATE";
		field public static final java.lang.String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION";
		field public static final java.lang.String CHANGE_NETWORK_STATE = "android.permission.CHANGE_NETWORK_STATE";
		@@ -141,6 +143,7 @@ package android {

		public static final class Manifest.permission_group {
		ctor public Manifest.permission_group();
		field public static final java.lang.String ACCESSIBILITY_FEATURES = "android.permission-group.ACCESSIBILITY_FEATURES";
		field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
		field public static final java.lang.String AFFECTS_BATTERY = "android.permission-group.AFFECTS_BATTERY";
		field public static final java.lang.String APP_INFO = "android.permission-group.APP_INFO";
		@@ -2104,7 +2107,8 @@ package android.accessibilityservice {
		field public static final int FEEDBACK_SPOKEN = 1; // 0x1
		field public static final int FEEDBACK_VISUAL = 8; // 0x8
		field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2
		field public static final int FLAG_REPORT_VIEW_IDS = 8; // 0x8
		field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10
		field public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8
		field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4
		field public int eventTypes;
		field public int feedbackType;

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -152,6 +152,18 @@ public class AccessibilityServiceInfo implements Parcelable {
		*/
		public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE= 0x0000004;

		/**
		* This flag requests from the system to enable web accessibility enhancing
		* extensions. Such extensions aim to provide improved accessibility support
		* for content presented in a {@link android.webkit.WebView}. An example of such
		* an extension is injecting JavaScript from Google. The system will enable
		* enhanced web accessibility if there is at least one accessibility service
		* that has this flag set. Hence, clearing this flag does not guarantee that the
		* device will not have enhanced web accessibility enabled since there may be
		* another enabled service that requested it.
		*/
		public static final int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 0x00000008;

		/**
		* This flag requests that the {@link AccessibilityNodeInfo}s obtained
		* by an {@link AccessibilityService} contain the id of the source view.
		@@ -159,7 +171,7 @@ public class AccessibilityServiceInfo implements Parcelable {
		* form "package:id/name", for example "foo.bar:id/my_list", and it is
		* useful for UI test automation. This flag is not set by default.
		*/
		public static final int FLAG_REPORT_VIEW_IDS = 0x00000008;
		public static final int FLAG_REPORT_VIEW_IDS = 0x00000010;

		/**
		* The event types an {@link AccessibilityService} is interested in.

core/java/android/provider/Settings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3351,6 +3351,7 @@ public final class Settings {
		*
		* @hide
		*/
		@Deprecated
		public static final String TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES =
		"touch_exploration_granted_accessibility_services";

core/res/AndroidManifest.xml

+26 −1

Original line number	Diff line number	Diff line
		@@ -532,6 +532,31 @@
		android:label="@string/permlab_addVoicemail"
		android:description="@string/permdesc_addVoicemail" />

		<!-- =============================================== -->
		<!-- Permissions for enabling accessibility features -->
		<!-- =============================================== -->

		<!-- Used for permissions that allow requesting certain accessibility features. -->
		<permission-group android:name="android.permission-group.ACCESSIBILITY_FEATURES"
		android:label="@string/permgrouplab_accessibilityFeatures"
		android:icon="@drawable/perm_group_accessibility_features"
		android:description="@string/permgroupdesc_accessibilityFeatures"
		android:priority="380" />

		<!-- Allows an accessibility service to request touch exploration mode. -->
		<permission android:name="android.permission.CAN_REQUEST_TOUCH_EXPLORATION_MODE"
		android:permissionGroup="android.permission-group.ACCESSIBILITY_FEATURES"
		android:label="@string/permlab_canRequestTouchExplorationMode"
		android:description="@string/permdesc_canRequestTouchExplorationMode"
		android:protectionLevel="dangerous" />

		<!-- Allows an accessibility service to request enhanced web accessibility. -->
		<permission android:name="android.permission.CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY"
		android:permissionGroup="android.permission-group.ACCESSIBILITY_FEATURES"
		android:label="@string/permlab_canRequestEnahncedWebAccessibility"
		android:description="@string/permdesc_canRequestEnahncedWebAccessibility"
		android:protectionLevel="dangerous" />

		<!-- ======================================= -->
		<!-- Permissions for accessing location info -->
		<!-- ======================================= -->

core/res/res/drawable-hdpi/perm_group_accessibility_features.png

0 → 100755

+1.19 KiB

Loading image diff...