Merge "Allowing multiple preferred drag regions for tablets." (3f669082) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java

+33 −4

Original line number	Original line	Diff line number	Diff line
	@@ -16,11 +16,13 @@

	package com.android.systemui.recents.model;		package com.android.systemui.recents.model;

			import android.animation.ObjectAnimator;
	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.content.Context;		import android.content.Context;
	import android.graphics.Color;		import android.graphics.Color;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.graphics.RectF;		import android.graphics.RectF;
			import android.graphics.drawable.ColorDrawable;
	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.recents.Constants;		import com.android.systemui.recents.Constants;
	import com.android.systemui.recents.misc.NamedCounter;		import com.android.systemui.recents.misc.NamedCounter;
	@@ -193,10 +195,37 @@ public class TaskStack {
	BOTTOM(DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT, 192,		BOTTOM(DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT, 192,
	new RectF(0, 0.7f, 1, 1), new RectF(0, 0.7f, 1, 1), new RectF(0, 0, 1, 0.3f));		new RectF(0, 0.7f, 1, 1), new RectF(0, 0.7f, 1, 1), new RectF(0, 0, 1, 0.3f));

	public final int createMode;		// Represents the view state of this dock state
			public class ViewState {
	public final int dockAreaAlpha;		public final int dockAreaAlpha;
	private final RectF touchArea;		public final ColorDrawable dockAreaOverlay;
			private ObjectAnimator dockAreaOverlayAnimator;

			private ViewState(int alpha) {
			dockAreaAlpha = alpha;
			dockAreaOverlay = new ColorDrawable(0xFFffffff);
			dockAreaOverlay.setAlpha(0);
			}

			/**
			* Creates a new alpha animation.
			*/
			public void startAlphaAnimation(int alpha, int duration) {
			if (dockAreaOverlay.getAlpha() != alpha) {
			if (dockAreaOverlayAnimator != null) {
			dockAreaOverlayAnimator.cancel();
			}
			dockAreaOverlayAnimator = ObjectAnimator.ofInt(dockAreaOverlay, "alpha", alpha);
			dockAreaOverlayAnimator.setDuration(duration);
			dockAreaOverlayAnimator.start();
			}
			}
			}

			public final int createMode;
			public final ViewState viewState;
	private final RectF dockArea;		private final RectF dockArea;
			private final RectF touchArea;
	private final RectF stackArea;		private final RectF stackArea;

	/**		/**
	@@ -207,9 +236,9 @@ public class TaskStack {
	DockState(int createMode, int dockAreaAlpha, RectF touchArea, RectF dockArea,		DockState(int createMode, int dockAreaAlpha, RectF touchArea, RectF dockArea,
	RectF stackArea) {		RectF stackArea) {
	this.createMode = createMode;		this.createMode = createMode;
	this.dockAreaAlpha = dockAreaAlpha;		this.viewState = new ViewState(dockAreaAlpha);
	this.touchArea = touchArea;
	this.dockArea = dockArea;		this.dockArea = dockArea;
			this.touchArea = touchArea;
	this.stackArea = stackArea;		this.stackArea = stackArea;
	}		}

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+48 −34

Original line number	Original line	Diff line number	Diff line
	@@ -16,19 +16,17 @@

	package com.android.systemui.recents.views;		package com.android.systemui.recents.views;

	import android.animation.ObjectAnimator;
	import android.animation.ValueAnimator;
	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.app.ActivityOptions;		import android.app.ActivityOptions;
	import android.content.Context;		import android.content.Context;
	import android.graphics.Bitmap;		import android.graphics.Bitmap;
	import android.graphics.Canvas;		import android.graphics.Canvas;
	import android.graphics.Rect;		import android.graphics.Rect;
	import android.graphics.drawable.ColorDrawable;
	import android.graphics.drawable.Drawable;		import android.graphics.drawable.Drawable;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.IRemoteCallback;		import android.os.IRemoteCallback;
	import android.os.RemoteException;		import android.os.RemoteException;
			import android.util.ArraySet;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.util.Log;		import android.util.Log;
	import android.util.SparseArray;		import android.util.SparseArray;
	@@ -38,7 +36,6 @@ import android.view.MotionEvent;
	import android.view.View;		import android.view.View;
	import android.view.WindowInsets;		import android.view.WindowInsets;
	import android.view.WindowManagerGlobal;		import android.view.WindowManagerGlobal;
	import android.view.animation.AccelerateInterpolator;
	import android.view.animation.AnimationUtils;		import android.view.animation.AnimationUtils;
	import android.view.animation.Interpolator;		import android.view.animation.Interpolator;
	import android.widget.FrameLayout;		import android.widget.FrameLayout;
	@@ -91,8 +88,12 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV

	RecentsViewTouchHandler mTouchHandler;		RecentsViewTouchHandler mTouchHandler;
	DragView mDragView;		DragView mDragView;
	ColorDrawable mDockRegionOverlay;		TaskStack.DockState[] mVisibleDockStates = {
	ObjectAnimator mDockRegionOverlayAnimator;		TaskStack.DockState.LEFT,
			TaskStack.DockState.TOP,
			TaskStack.DockState.RIGHT,
			TaskStack.DockState.BOTTOM,
			};

	Interpolator mFastOutSlowInInterpolator;		Interpolator mFastOutSlowInInterpolator;

	@@ -118,9 +119,6 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
	mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,		mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
	com.android.internal.R.interpolator.fast_out_slow_in);		com.android.internal.R.interpolator.fast_out_slow_in);
	mTouchHandler = new RecentsViewTouchHandler(this);		mTouchHandler = new RecentsViewTouchHandler(this);
	mDockRegionOverlay = new ColorDrawable(0xFFffffff);
	mDockRegionOverlay.setAlpha(0);
	mDockRegionOverlay.setCallback(this);
	}		}

	/** Sets the callbacks */		/** Sets the callbacks */
	@@ -383,14 +381,23 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
	@Override		@Override
	protected void dispatchDraw(Canvas canvas) {		protected void dispatchDraw(Canvas canvas) {
	super.dispatchDraw(canvas);		super.dispatchDraw(canvas);
	if (mDockRegionOverlay.getAlpha() > 0) {		for (int i = mVisibleDockStates.length - 1; i >= 0; i--) {
	mDockRegionOverlay.draw(canvas);		Drawable d = mVisibleDockStates[i].viewState.dockAreaOverlay;
			if (d.getAlpha() > 0) {
			d.draw(canvas);
			}
	}		}
	}		}

	@Override		@Override
	protected boolean verifyDrawable(Drawable who) {		protected boolean verifyDrawable(Drawable who) {
	return super.verifyDrawable(who) \|\| who == mDockRegionOverlay;		for (int i = mVisibleDockStates.length - 1; i >= 0; i--) {
			Drawable d = mVisibleDockStates[i].viewState.dockAreaOverlay;
			if (d == who) {
			return true;
			}
			}
			return super.verifyDrawable(who);
	}		}

	/** Notifies each task view of the user interaction. */		/** Notifies each task view of the user interaction. */
	@@ -775,11 +782,17 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
	mDragView = event.dragView;		mDragView = event.dragView;
	addView(mDragView);		addView(mDragView);

	updateDockRegion(TaskStack.DockState.NONE);		updateVisibleDockRegions(mTouchHandler.getDockStatesForCurrentOrientation(),
			TaskStack.DockState.NONE.viewState.dockAreaAlpha);
	}		}

	public final void onBusEvent(DragDockStateChangedEvent event) {		public final void onBusEvent(DragDockStateChangedEvent event) {
	updateDockRegion(event.dockState);		if (event.dockState == TaskStack.DockState.NONE) {
			updateVisibleDockRegions(mTouchHandler.getDockStatesForCurrentOrientation(),
			TaskStack.DockState.NONE.viewState.dockAreaAlpha);
			} else {
			updateVisibleDockRegions(new TaskStack.DockState[] {event.dockState}, -1);
			}
	}		}

	public final void onBusEvent(final DragEndEvent event) {		public final void onBusEvent(final DragEndEvent event) {
	@@ -790,8 +803,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
	// Remove the drag view		// Remove the drag view
	removeView(mDragView);		removeView(mDragView);
	mDragView = null;		mDragView = null;
	mDockRegionOverlay.setAlpha(0);		updateVisibleDockRegions(null, -1);
	invalidate();

	// Dock the new task if we are hovering over a valid dock state		// Dock the new task if we are hovering over a valid dock state
	if (event.dockState != TaskStack.DockState.NONE) {		if (event.dockState != TaskStack.DockState.NONE) {
	@@ -818,7 +830,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
	.start();		.start();

	// Animate the overlay alpha back to 0		// Animate the overlay alpha back to 0
	updateDockRegionAlpha(0);		updateVisibleDockRegions(null, -1);
	} else {		} else {
	event.postAnimationTrigger.decrement();		event.postAnimationTrigger.decrement();
	}		}
	@@ -827,24 +839,26 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
	/**		/**
	* Updates the dock region to match the specified dock state.		* Updates the dock region to match the specified dock state.
	*/		*/
	private void updateDockRegion(TaskStack.DockState dockState) {		private void updateVisibleDockRegions(TaskStack.DockState[] newDockStates, int overrideAlpha) {
	TaskStack.DockState boundsDockState = dockState;		ArraySet<TaskStack.DockState> newDockStatesSet = new ArraySet<>();
	if (dockState == TaskStack.DockState.NONE) {		if (newDockStates != null) {
	// If the dock state is null, then use the bounds of the preferred dock state for this		for (TaskStack.DockState dockState : newDockStates) {
	// orientation		newDockStatesSet.add(dockState);
	boundsDockState = mTouchHandler.getPreferredDockStateForCurrentOrientation();		}
	}		}
	mDockRegionOverlay.setBounds(		for (TaskStack.DockState dockState : mVisibleDockStates) {
	boundsDockState.getDockedBounds(getMeasuredWidth(), getMeasuredHeight()));		TaskStack.DockState.ViewState viewState = dockState.viewState;
	updateDockRegionAlpha(dockState.dockAreaAlpha);		if (newDockStates == null \|\| !newDockStatesSet.contains(dockState)) {
			// This is no longer visible, so hide it
			viewState.startAlphaAnimation(0, 150);
			} else {
			// This state is now visible, update the bounds and show it
			int alpha = (overrideAlpha != -1 ? overrideAlpha : viewState.dockAreaAlpha);
			viewState.dockAreaOverlay.setBounds(
			dockState.getDockedBounds(getMeasuredWidth(), getMeasuredHeight()));
			viewState.dockAreaOverlay.setCallback(this);
			viewState.startAlphaAnimation(alpha, 150);
	}		}

	private void updateDockRegionAlpha(int alpha) {
	if (mDockRegionOverlayAnimator != null) {
	mDockRegionOverlayAnimator.cancel();
	}		}
	mDockRegionOverlayAnimator = ObjectAnimator.ofInt(mDockRegionOverlay, "alpha", alpha);
	mDockRegionOverlayAnimator.setDuration(150);
	mDockRegionOverlayAnimator.start();
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java

+17 −8

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ package com.android.systemui.recents.views;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	import android.graphics.Point;		import android.graphics.Point;
	import android.view.MotionEvent;		import android.view.MotionEvent;
			import com.android.systemui.recents.RecentsConfiguration;
	import com.android.systemui.recents.events.EventBus;		import com.android.systemui.recents.events.EventBus;
	import com.android.systemui.recents.events.ui.dragndrop.DragDockStateChangedEvent;		import com.android.systemui.recents.events.ui.dragndrop.DragDockStateChangedEvent;
	import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent;		import com.android.systemui.recents.events.ui.dragndrop.DragEndEvent;
	@@ -32,13 +33,17 @@ import com.android.systemui.recents.model.TaskStack;
	* Represents the dock regions for each orientation.		* Represents the dock regions for each orientation.
	*/		*/
	class DockRegion {		class DockRegion {
	public static TaskStack.DockState[] LANDSCAPE = {		public static TaskStack.DockState[] PHONE_LANDSCAPE = {
	TaskStack.DockState.LEFT, TaskStack.DockState.RIGHT		TaskStack.DockState.LEFT, TaskStack.DockState.RIGHT
	};		};
	public static TaskStack.DockState[] PORTRAIT = {		public static TaskStack.DockState[] PHONE_PORTRAIT = {
	// We only allow docking to the top for now		// We only allow docking to the top for now
	TaskStack.DockState.TOP		TaskStack.DockState.TOP
	};		};
			public static TaskStack.DockState[] TABLET_LANDSCAPE = {
			TaskStack.DockState.LEFT, TaskStack.DockState.RIGHT
			};
			public static TaskStack.DockState[] TABLET_PORTRAIT = PHONE_PORTRAIT;
	}		}

	/**		/**
	@@ -60,12 +65,17 @@ class RecentsViewTouchHandler {
	mRv = rv;		mRv = rv;
	}		}

	public TaskStack.DockState getPreferredDockStateForCurrentOrientation() {		/**
			* Returns the preferred dock states for the current orientation.
			*/
			public TaskStack.DockState[] getDockStatesForCurrentOrientation() {
	boolean isLandscape = mRv.getResources().getConfiguration().orientation ==		boolean isLandscape = mRv.getResources().getConfiguration().orientation ==
	Configuration.ORIENTATION_LANDSCAPE;		Configuration.ORIENTATION_LANDSCAPE;
			RecentsConfiguration config = RecentsConfiguration.getInstance();
	TaskStack.DockState[] dockStates = isLandscape ?		TaskStack.DockState[] dockStates = isLandscape ?
	DockRegion.LANDSCAPE : DockRegion.PORTRAIT;		(config.isLargeScreen ? DockRegion.TABLET_LANDSCAPE : DockRegion.PHONE_LANDSCAPE) :
	return dockStates[0];		(config.isLargeScreen ? DockRegion.TABLET_PORTRAIT : DockRegion.PHONE_PORTRAIT);
			return dockStates;
	}		}

	/** Touch preprocessing for handling below */		/** Touch preprocessing for handling below */
	@@ -125,10 +135,9 @@ class RecentsViewTouchHandler {
	float y = evY - mDragView.getTopLeftOffset().y;		float y = evY - mDragView.getTopLeftOffset().y;

	// Update the dock state		// Update the dock state
	TaskStack.DockState[] dockStates = isLandscape ?		TaskStack.DockState[] dockStates = getDockStatesForCurrentOrientation();
	DockRegion.LANDSCAPE : DockRegion.PORTRAIT;
	TaskStack.DockState foundDockState = TaskStack.DockState.NONE;		TaskStack.DockState foundDockState = TaskStack.DockState.NONE;
	for (int i = 0; i < dockStates.length; i++) {		for (int i = dockStates.length - 1; i >= 0; i--) {
	TaskStack.DockState state = dockStates[i];		TaskStack.DockState state = dockStates[i];
	if (state.touchAreaContainsPoint(width, height, evX, evY)) {		if (state.touchAreaContainsPoint(width, height, evX, evY)) {
	foundDockState = state;		foundDockState = state;