PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I838ef4de,I22e2948a into ub-launcher3-master

Browse Source 
* changes:
  Use onQuickStep call from SysUI
  Workaround for ensuring dummy task view has valid task
This commit is contained in:
Winson Chung
2018-03-28 23:42:37 +00:00
committed by Android (Google) Code Review
parent 457dedd1bf 19adf653bd
commit 873cd43326
5 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/MotionEventQueue.java
+10
View File
@@ -53,6 +53,8 @@ public class MotionEventQueue {
ACTION_VIRTUAL | (5 << ACTION_POINTER_INDEX_SHIFT);
private static final int ACTION_SHOW_OVERVIEW_FROM_ALT_TAB =
ACTION_VIRTUAL | (6 << ACTION_POINTER_INDEX_SHIFT);
private static final int ACTION_QUICK_STEP =
ACTION_VIRTUAL | (7 << ACTION_POINTER_INDEX_SHIFT);
private final EventArray mEmptyArray = new EventArray();
private final Object mExecutionLock = new Object();
@@ -160,6 +162,9 @@ public class MotionEventQueue {
mConsumer.onShowOverviewFromAltTab();
mConsumer.updateTouchTracking(INTERACTION_QUICK_SCRUB);
break;
case ACTION_QUICK_STEP:
mConsumer.onQuickStep(event.getX(), event.getY(), event.getEventTime());
break;
default:
Log.e(TAG, "Invalid virtual event: " + event.getAction());
}
@@ -204,6 +209,11 @@ public class MotionEventQueue {
queueVirtualAction(ACTION_QUICK_SCRUB_END, 0);
}
public void onQuickStep(MotionEvent event) {
event.setAction(ACTION_QUICK_STEP);
queueNoPreProcess(event);
}
public void reset() {
queueVirtualAction(ACTION_RESET, 0);
}
quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
+29 -22
View File
@@ -79,7 +79,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
private final PointF mDownPos = new PointF();
private final PointF mLastPos = new PointF();
private int mActivePointerId = INVALID_POINTER_ID;
private boolean mTouchThresholdCrossed;
private boolean mGestureStarted;
private int mTouchSlop;
private float mStartDisplacement;
private WindowTransformSwipeHandler mInteractionHandler;
@@ -122,7 +122,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
mDownPos.set(ev.getX(), ev.getY());
mLastPos.set(mDownPos);
mTouchSlop = ViewConfiguration.get(this).getScaledPagingTouchSlop();
mTouchThresholdCrossed = false;
mGestureStarted = false;
// Start the window animation on down to give more time for launcher to draw if the
// user didn't start the gesture over the back button
@@ -155,26 +155,10 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
}
mLastPos.set(ev.getX(pointerIndex), ev.getY(pointerIndex));
float displacement = ev.getY(pointerIndex) - mDownPos.y;
if (isNavBarOnRight()) {
displacement = ev.getX(pointerIndex) - mDownPos.x;
} else if (isNavBarOnLeft()) {
displacement = mDownPos.x - ev.getX(pointerIndex);
}
if (!mTouchThresholdCrossed) {
mTouchThresholdCrossed = Math.abs(displacement) >= mTouchSlop;
if (mTouchThresholdCrossed) {
mStartDisplacement = Math.signum(displacement) * mTouchSlop;
if (mIsDeferredDownTarget) {
// If we deferred starting the window animation on touch down, then
// start tracking now
startTouchTrackingForWindowAnimation(ev.getEventTime());
}
notifyGestureStarted();
}
} else if (mInteractionHandler != null) {
if (mGestureStarted && mInteractionHandler != null) {
// Move
float displacement = getDisplacement(ev.getX(pointerIndex),
ev.getY(pointerIndex));
mInteractionHandler.updateDisplacement(displacement - mStartDisplacement);
}
break;
@@ -195,6 +179,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
return;
}
// Notify the handler that the gesture has actually started
mGestureStarted = true;
mInteractionHandler.onGestureStarted();
}
@@ -276,7 +261,7 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
* the animation can still be running.
*/
private void finishTouchTracking() {
if (mTouchThresholdCrossed && mInteractionHandler != null) {
if (mGestureStarted && mInteractionHandler != null) {
mVelocityTracker.computeCurrentVelocity(1000,
ViewConfiguration.get(this).getScaledMaximumFlingVelocity());
@@ -336,6 +321,28 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC
}
}
@Override
public void onQuickStep(float eventX, float eventY, long eventTime) {
float displacement = getDisplacement(eventX, eventY);
mStartDisplacement = Math.signum(displacement) * mTouchSlop;
if (mIsDeferredDownTarget) {
// If we deferred starting the window animation on touch down, then
// start tracking now
startTouchTrackingForWindowAnimation(eventTime);
}
notifyGestureStarted();
}
private float getDisplacement(float eventX, float eventY) {
float displacement = eventY - mDownPos.y;
if (isNavBarOnRight()) {
displacement = eventX - mDownPos.x;
} else if (isNavBarOnLeft()) {
displacement = mDownPos.x - eventX;
}
return displacement;
}
public void switchToMainChoreographer() {
mEventQueue.setInterimChoreographer(null);
}
quickstep/src/com/android/quickstep/TouchConsumer.java
+2
View File
@@ -46,6 +46,8 @@ public interface TouchConsumer extends Consumer<MotionEvent> {
default void onQuickScrubProgress(float progress) { }
default void onQuickStep(float eventX, float eventY, long eventTime) { }
/**
* Called on the binder thread to allow the consumer to process the motion event before it is
* posted on a handler thread.
quickstep/src/com/android/quickstep/TouchInteractionService.java
+2
View File
@@ -153,6 +153,8 @@ public class TouchInteractionService extends Service {
@Override
public void onQuickStep(MotionEvent motionEvent) {
mEventQueue.onQuickStep(motionEvent);
TraceHelper.endSection("SysUiBinder", "onQuickStep");
}
};
quickstep/src/com/android/quickstep/views/RecentsView.java
+23 -12
View File
@@ -26,7 +26,10 @@ import android.animation.ObjectAnimator;
import android.animation.TimeInterpolator;
import android.animation.ValueAnimator;
import android.annotation.TargetApi;
import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.graphics.Canvas;
@@ -124,6 +127,7 @@ public abstract class RecentsView<T extends BaseActivity>
// Only valid until the launcher state changes to NORMAL
private int mRunningTaskId = -1;
private Task mTmpRunningTask;
private boolean mFirstTaskIconScaledDown = false;
@@ -472,6 +476,10 @@ public abstract class RecentsView<T extends BaseActivity>
Task task = taskView.getTask();
boolean visible = lower <= i && i <= upper;
if (visible) {
if (task == mTmpRunningTask) {
// Skip loading if this is the task that we are animating into
continue;
}
if (!mHasVisibleTaskData.get(task.key.id)) {
loader.loadTaskData(task);
loader.getHighResThumbnailLoader().onTaskVisible(task);
@@ -530,24 +538,27 @@ public abstract class RecentsView<T extends BaseActivity>
* Also scrolls the view to this task
*/
public void showTask(int runningTaskId) {
boolean needsReload = false;
if (getChildCount() == 0) {
needsReload = true;
// Add an empty view for now
// Add an empty view for now until the task plan is loaded and applied
final TaskView taskView = (TaskView) LayoutInflater.from(getContext())
.inflate(R.layout.task, this, false);
addView(taskView, 0);
addView(taskView);
// The temporary running task is only used for the duration between the start of the
// gesture and the task list is loaded and applied
mTmpRunningTask = new Task(new Task.TaskKey(runningTaskId, 0, new Intent(), 0, 0), null,
null, "", "", 0, 0, false, true, false, false,
new ActivityManager.TaskDescription(), 0, new ComponentName("", ""), false);
taskView.bind(mTmpRunningTask);
}
mRunningTaskId = runningTaskId;
setCurrentPage(0);
if (!needsReload) {
needsReload = !mModel.isLoadPlanValid(mLoadPlanId);
}
if (needsReload) {
mLoadPlanId = mModel.loadTasks(runningTaskId, this::applyLoadPlan);
} else {
loadVisibleTaskData();
}
// Load the tasks (if the loading is already
mLoadPlanId = mModel.loadTasks(runningTaskId, this::applyLoadPlan);
// Hide the task that we are animating into
getPageAt(mCurrentPage).setAlpha(0);
}