openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Inline TaskView#resetVisualProperties() into RecentsView" into ub-launcher3-rvc-dev am: f13a51c4b8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11917351

Change-Id: I6d7f8483d94e7fcd480dca0d1b3bd72f7865f884
This commit is contained in:
Tony Wickham 2020-06-19 05:52:44 +00:00 committed by Automerger Merge Worker
parent cc3e9f0614 f13a51c4b8
commit 1c5a3e082b
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
View File

@ -798,8 +798,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
for (int i = getTaskViewCount() - 1; i >= 0; i--) {
TaskView taskView = getTaskViewAt(i);
if (mIgnoreResetTaskId != taskView.getTask().key.id) {
taskView.resetVisualProperties();
taskView.resetViewTransforms();
taskView.setStableAlpha(mContentAlpha);
taskView.setFullscreenProgress(mFullscreenProgress);
taskView.setModalness(mTaskModalness);
}
}
if (mRunningTaskTileHidden) {

8
quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
View File

@ -545,7 +545,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
setIconAndDimTransitionProgress(iconScale, invert);
}
private void resetViewTransforms() {
protected void resetViewTransforms() {
setCurveScale(1);
setTranslationX(0f);
setTranslationY(0f);
@ -554,12 +554,6 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
setIconScaleAndDim(1);
}
public void resetVisualProperties() {
resetViewTransforms();
setFullscreenProgress(0);
setModalness(0);
}
public void setStableAlpha(float parentAlpha) {
mStableAlpha = parentAlpha;
setAlpha(mStableAlpha);