aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 09:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Insted of animating the icon of the first task, animating the running task icon

Browse Source 
Bug: 79236139
Change-Id: Ib85c22e3898c09a84d3a862c407c23d76a600d9d
This commit is contained in:
Sunny Goyal
2018-05-07 14:59:05 -07:00
parent c247a00e22
commit 28254eec60
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/src/com/android/quickstep/OverviewCommandHelper.java
View File

@@ -267,7 +267,7 @@ public class OverviewCommandHelper {
}
mActivity = activity;
mRecentsView = mActivity.getOverviewPanel();
mRecentsView.setFirstTaskIconScaledDown(true /* isScaledDown */, false /* animate */);
mRecentsView.setRunningTaskIconScaledDown(true /* isScaledDown */, false /* animate */);
return false;
}
@@ -280,7 +280,7 @@ public class OverviewCommandHelper {
@Override
public void onAnimationSuccess(Animator animator) {
if (mRecentsView != null) {
mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown */,
mRecentsView.setRunningTaskIconScaledDown(false /* isScaledDown */,
true /* animate */);
}
}

6
quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
View File

@@ -387,7 +387,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
mRecentsView.showTask(mRunningTaskId);
mRecentsView.setRunningTaskHidden(true);
mRecentsView.setFirstTaskIconScaledDown(true /* isScaledDown */, false /* animate */);
mRecentsView.setRunningTaskIconScaledDown(true /* isScaledDown */, false /* animate */);
mLayoutListener.open();
mStateCallback.setState(STATE_LAUNCHER_STARTED);
}
@@ -685,7 +685,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
mLayoutListener.finish();
mRecentsView.setRunningTaskHidden(false);
mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown */, false /* animate */);
mRecentsView.setRunningTaskIconScaledDown(false /* isScaledDown */, false /* animate */);
}
private void notifyTransitionCancelled() {
@@ -749,7 +749,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> {
mActivityControlHelper.onSwipeUpComplete(mActivity);
// Animate the first icon.
mRecentsView.setFirstTaskIconScaledDown(false /* isScaledDown */, true /* animate */);
mRecentsView.setRunningTaskIconScaledDown(false /* isScaledDown */, true /* animate */);
mRecentsView.setSwipeDownShouldLaunchApp(true);
RecentsModel.getInstance(mContext).onOverviewShown(false, TAG);

28
quickstep/src/com/android/quickstep/views/RecentsView.java
View File

@@ -170,7 +170,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
private boolean mRunningTaskTileHidden;
private Task mTmpRunningTask;
private boolean mFirstTaskIconScaledDown = false;
private boolean mRunningTaskIconScaledDown = false;
private boolean mOverviewStateEnabled;
private boolean mTaskStackListenerRegistered;
@@ -638,13 +638,15 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
* Similar to {@link #showTask(int)} but does not put any restrictions on the first tile.
*/
public void setCurrentTask(int runningTaskId) {
if (mRunningTaskTileHidden) {
setRunningTaskHidden(false);
mRunningTaskId = runningTaskId;
setRunningTaskHidden(true);
} else {
mRunningTaskId = runningTaskId;
}
boolean runningTaskTileHidden = mRunningTaskTileHidden;
boolean runningTaskIconScaledDown = mRunningTaskIconScaledDown;
setRunningTaskIconScaledDown(false, false);
setRunningTaskHidden(false);
mRunningTaskId = runningTaskId;
setRunningTaskIconScaledDown(runningTaskIconScaledDown, false);
setRunningTaskHidden(runningTaskTileHidden);
setCurrentPage(0);
// Load the tasks (if the loading is already
@@ -672,17 +674,17 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
return mQuickScrubController;
}
public void setFirstTaskIconScaledDown(boolean isScaledDown, boolean animate) {
if (mFirstTaskIconScaledDown == isScaledDown) {
public void setRunningTaskIconScaledDown(boolean isScaledDown, boolean animate) {
if (mRunningTaskIconScaledDown == isScaledDown) {
return;
}
mFirstTaskIconScaledDown = isScaledDown;
mRunningTaskIconScaledDown = isScaledDown;
applyIconScale(animate);
}
private void applyIconScale(boolean animate) {
float scale = mFirstTaskIconScaledDown ? 0 : 1;
TaskView firstTask = (TaskView) getChildAt(0);
float scale = mRunningTaskIconScaledDown ? 0 : 1;
TaskView firstTask = getTaskView(mRunningTaskId);
if (firstTask != null) {
if (animate) {
firstTask.animateIconToScaleAndDim(scale);

1
quickstep/src/com/android/quickstep/views/TaskView.java
View File

@@ -213,6 +213,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback
setTranslationY(0f);
setTranslationZ(0);
setAlpha(1f);
setIconScaleAndDim(1);
}
@Override