Merge "Accessibility to toggle multiwindow mode" into nyc-dev (8ca583b2) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2666,6 +2666,7 @@ package android.accessibilityservice {
	field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6		field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6
	field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5		field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5
	field public static final int GLOBAL_ACTION_RECENTS = 3; // 0x3		field public static final int GLOBAL_ACTION_RECENTS = 3; // 0x3
			field public static final int GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN = 7; // 0x7
	field public static final java.lang.String SERVICE_INTERFACE = "android.accessibilityservice.AccessibilityService";		field public static final java.lang.String SERVICE_INTERFACE = "android.accessibilityservice.AccessibilityService";
	field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";		field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";
	}		}
	@@ -44085,6 +44086,7 @@ package android.view.accessibility {
	field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4		field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4
	field public static final int TYPE_APPLICATION = 1; // 0x1		field public static final int TYPE_APPLICATION = 1; // 0x1
	field public static final int TYPE_INPUT_METHOD = 2; // 0x2		field public static final int TYPE_INPUT_METHOD = 2; // 0x2
			field public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5; // 0x5
	field public static final int TYPE_SYSTEM = 3; // 0x3		field public static final int TYPE_SYSTEM = 3; // 0x3
	}		}

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2768,6 +2768,7 @@ package android.accessibilityservice {
	field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6		field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6
	field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5		field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5
	field public static final int GLOBAL_ACTION_RECENTS = 3; // 0x3		field public static final int GLOBAL_ACTION_RECENTS = 3; // 0x3
			field public static final int GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN = 7; // 0x7
	field public static final java.lang.String SERVICE_INTERFACE = "android.accessibilityservice.AccessibilityService";		field public static final java.lang.String SERVICE_INTERFACE = "android.accessibilityservice.AccessibilityService";
	field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";		field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";
	}		}
	@@ -46869,6 +46870,7 @@ package android.view.accessibility {
	field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4		field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4
	field public static final int TYPE_APPLICATION = 1; // 0x1		field public static final int TYPE_APPLICATION = 1; // 0x1
	field public static final int TYPE_INPUT_METHOD = 2; // 0x2		field public static final int TYPE_INPUT_METHOD = 2; // 0x2
			field public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5; // 0x5
	field public static final int TYPE_SYSTEM = 3; // 0x3		field public static final int TYPE_SYSTEM = 3; // 0x3
	}		}

api/test-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2666,6 +2666,7 @@ package android.accessibilityservice {
	field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6		field public static final int GLOBAL_ACTION_POWER_DIALOG = 6; // 0x6
	field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5		field public static final int GLOBAL_ACTION_QUICK_SETTINGS = 5; // 0x5
	field public static final int GLOBAL_ACTION_RECENTS = 3; // 0x3		field public static final int GLOBAL_ACTION_RECENTS = 3; // 0x3
			field public static final int GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN = 7; // 0x7
	field public static final java.lang.String SERVICE_INTERFACE = "android.accessibilityservice.AccessibilityService";		field public static final java.lang.String SERVICE_INTERFACE = "android.accessibilityservice.AccessibilityService";
	field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";		field public static final java.lang.String SERVICE_META_DATA = "android.accessibilityservice";
	}		}
	@@ -44102,6 +44103,7 @@ package android.view.accessibility {
	field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4		field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4
	field public static final int TYPE_APPLICATION = 1; // 0x1		field public static final int TYPE_APPLICATION = 1; // 0x1
	field public static final int TYPE_INPUT_METHOD = 2; // 0x2		field public static final int TYPE_INPUT_METHOD = 2; // 0x2
			field public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5; // 0x5
	field public static final int TYPE_SYSTEM = 3; // 0x3		field public static final int TYPE_SYSTEM = 3; // 0x3
	}		}

core/java/android/accessibilityservice/AccessibilityService.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -334,7 +334,7 @@ public abstract class AccessibilityService extends Service {
	public static final int GLOBAL_ACTION_HOME = 2;		public static final int GLOBAL_ACTION_HOME = 2;

	/**		/**
	* Action to open the recent apps.		* Action to toggle showing the overview of recent apps
	*/		*/
	public static final int GLOBAL_ACTION_RECENTS = 3;		public static final int GLOBAL_ACTION_RECENTS = 3;

	@@ -353,6 +353,11 @@ public abstract class AccessibilityService extends Service {
	*/		*/
	public static final int GLOBAL_ACTION_POWER_DIALOG = 6;		public static final int GLOBAL_ACTION_POWER_DIALOG = 6;

			/**
			* Action to toggle docking the current app's window
			*/
			public static final int GLOBAL_ACTION_TOGGLE_SPLIT_SCREEN = 7;

	private static final String LOG_TAG = "AccessibilityService";		private static final String LOG_TAG = "AccessibilityService";

	/**		/**

core/java/android/view/accessibility/AccessibilityWindowInfo.java

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,12 @@ public final class AccessibilityWindowInfo implements Parcelable {
	*/		*/
	public static final int TYPE_ACCESSIBILITY_OVERLAY = 4;		public static final int TYPE_ACCESSIBILITY_OVERLAY = 4;

			/**
			* Window type: A system window used to divide the screen in split-screen mode.
			* This type of window is present only in split-screen mode.
			*/
			public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5;

	private static final int UNDEFINED = -1;		private static final int UNDEFINED = -1;

	private static final int BOOLEAN_PROPERTY_ACTIVE = 1 << 0;		private static final int BOOLEAN_PROPERTY_ACTIVE = 1 << 0;
	@@ -551,6 +557,9 @@ public final class AccessibilityWindowInfo implements Parcelable {
	case TYPE_ACCESSIBILITY_OVERLAY: {		case TYPE_ACCESSIBILITY_OVERLAY: {
	return "TYPE_ACCESSIBILITY_OVERLAY";		return "TYPE_ACCESSIBILITY_OVERLAY";
	}		}
			case TYPE_SPLIT_SCREEN_DIVIDER: {
			return "TYPE_SPLIT_SCREEN_DIVIDER";
			}
	default:		default:
	return "<UNKNOWN>";		return "<UNKNOWN>";
	}		}