Merge "Removing discovery bouncer from accessibility" into ub-launcher3-edmonton (1ab65646) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/AbstractFloatingView.java

+8 −3

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
	TYPE_WIDGET_RESIZE_FRAME,		TYPE_WIDGET_RESIZE_FRAME,
	TYPE_WIDGETS_FULL_SHEET,		TYPE_WIDGETS_FULL_SHEET,
	TYPE_ON_BOARD_POPUP,		TYPE_ON_BOARD_POPUP,
			TYPE_DISCOVERY_BOUNCE,

	TYPE_QUICKSTEP_PREVIEW,		TYPE_QUICKSTEP_PREVIEW,
	TYPE_TASK_MENU,		TYPE_TASK_MENU,
	@@ -64,6 +65,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch
	public static final int TYPE_WIDGET_RESIZE_FRAME = 1 << 3;		public static final int TYPE_WIDGET_RESIZE_FRAME = 1 << 3;
	public static final int TYPE_WIDGETS_FULL_SHEET = 1 << 4;		public static final int TYPE_WIDGETS_FULL_SHEET = 1 << 4;
	public static final int TYPE_ON_BOARD_POPUP = 1 << 5;		public static final int TYPE_ON_BOARD_POPUP = 1 << 5;
			public static final int TYPE_DISCOVERY_BOUNCE = 1 << 6;

	// Popups related to quickstep UI		// Popups related to quickstep UI
	public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 6;		public static final int TYPE_QUICKSTEP_PREVIEW = 1 << 6;
	@@ -72,14 +74,17 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch

	public static final int TYPE_ALL = TYPE_FOLDER \| TYPE_ACTION_POPUP		public static final int TYPE_ALL = TYPE_FOLDER \| TYPE_ACTION_POPUP
	\| TYPE_WIDGETS_BOTTOM_SHEET \| TYPE_WIDGET_RESIZE_FRAME \| TYPE_WIDGETS_FULL_SHEET		\| TYPE_WIDGETS_BOTTOM_SHEET \| TYPE_WIDGET_RESIZE_FRAME \| TYPE_WIDGETS_FULL_SHEET
	\| TYPE_QUICKSTEP_PREVIEW \| TYPE_ON_BOARD_POPUP \| TYPE_TASK_MENU \| TYPE_OPTIONS_POPUP;		\| TYPE_QUICKSTEP_PREVIEW \| TYPE_ON_BOARD_POPUP \| TYPE_DISCOVERY_BOUNCE \| TYPE_TASK_MENU
			\| TYPE_OPTIONS_POPUP;

	// Type of popups which should be kept open during launcher rebind		// Type of popups which should be kept open during launcher rebind
	public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET		public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET
	\| TYPE_QUICKSTEP_PREVIEW \| TYPE_ON_BOARD_POPUP;		\| TYPE_QUICKSTEP_PREVIEW \| TYPE_ON_BOARD_POPUP \| TYPE_DISCOVERY_BOUNCE;

	// Usually we show the back button when a floating view is open. Instead, hide for these types.		// Usually we show the back button when a floating view is open. Instead, hide for these types.
	public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP;		public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP \| TYPE_DISCOVERY_BOUNCE;

			public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE;

	protected boolean mIsOpen;		protected boolean mIsOpen;

src/com/android/launcher3/allapps/DiscoveryBounce.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,7 @@ public class DiscoveryBounce extends AbstractFloatingView {

	@Override		@Override
	protected boolean isOfType(int type) {		protected boolean isOfType(int type) {
	return (type & TYPE_ON_BOARD_POPUP) != 0;		return (type & TYPE_DISCOVERY_BOUNCE) != 0;
	}		}

	private void show(int containerType) {		private void show(int containerType) {

src/com/android/launcher3/dragndrop/DragLayer.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,8 @@ public class DragLayer extends BaseDragLayer<Launcher> {

	@Override		@Override
	public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) {		public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) {
	View topView = AbstractFloatingView.getTopOpenView(mActivity);		View topView = AbstractFloatingView.getTopOpenViewWithType(mActivity,
			AbstractFloatingView.TYPE_ACCESSIBLE);
	if (topView != null) {		if (topView != null) {
	addAccessibleChildToList(topView, childrenForAccessibility);		addAccessibleChildToList(topView, childrenForAccessibility);
	if (isInAccessibleDrag()) {		if (isInAccessibleDrag()) {

src/com/android/launcher3/views/BaseDragLayer.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@

	package com.android.launcher3.views;		package com.android.launcher3.views;

			import static com.android.launcher3.Utilities.SINGLE_FRAME_MS;

	import android.content.Context;		import android.content.Context;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	@@ -36,8 +38,6 @@ import com.android.launcher3.util.TouchController;

	import java.util.ArrayList;		import java.util.ArrayList;

	import static com.android.launcher3.Utilities.SINGLE_FRAME_MS;

	/**		/**
	* A viewgroup with utility methods for drag-n-drop and touch interception		* A viewgroup with utility methods for drag-n-drop and touch interception
	*/		*/
	@@ -100,7 +100,8 @@ public abstract class BaseDragLayer<T extends BaseDraggingActivity> extends Inse
	@Override		@Override
	public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {		public boolean onRequestSendAccessibilityEvent(View child, AccessibilityEvent event) {
	// Shortcuts can appear above folder		// Shortcuts can appear above folder
	View topView = AbstractFloatingView.getTopOpenView(mActivity);		View topView = AbstractFloatingView.getTopOpenViewWithType(mActivity,
			AbstractFloatingView.TYPE_ACCESSIBLE);
	if (topView != null) {		if (topView != null) {
	if (child == topView) {		if (child == topView) {
	return super.onRequestSendAccessibilityEvent(child, event);		return super.onRequestSendAccessibilityEvent(child, event);
	@@ -114,7 +115,8 @@ public abstract class BaseDragLayer<T extends BaseDraggingActivity> extends Inse

	@Override		@Override
	public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) {		public void addChildrenForAccessibility(ArrayList<View> childrenForAccessibility) {
	View topView = AbstractFloatingView.getTopOpenView(mActivity);		View topView = AbstractFloatingView.getTopOpenViewWithType(mActivity,
			AbstractFloatingView.TYPE_ACCESSIBLE);
	if (topView != null) {		if (topView != null) {
	// Only add the top view as a child for accessibility when it is open		// Only add the top view as a child for accessibility when it is open
	addAccessibleChildToList(topView, childrenForAccessibility);		addAccessibleChildToList(topView, childrenForAccessibility);