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

Merge "Add transitions to DWB banner when app thumbnail progresses from Overview tile to fullscreen" into tm-qpr-dev am: 4972822c60

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

Change-Id: I00e7a4b85ff362573557c38517eac0eb919c6086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeremy Sim
2022-10-28 00:53:18 +00:00
committed by Automerger Merge Worker
parent b0e063eb4e 4972822c60
commit 11d815d752
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
quickstep/src/com/android/quickstep/views/DesktopTaskView.java
View File

@@ -437,7 +437,7 @@ public class DesktopTaskView extends TaskView {
}
@Override
protected void setIconAndDimTransitionProgress(float progress, boolean invert) {
protected void setIconsAndBannersTransitionProgress(float progress, boolean invert) {
// no-op
}

4
quickstep/src/com/android/quickstep/views/GroupedTaskView.java
View File

@@ -316,8 +316,8 @@ public class GroupedTaskView extends TaskView {
}
@Override
protected void setIconAndDimTransitionProgress(float progress, boolean invert) {
super.setIconAndDimTransitionProgress(progress, invert);
protected void setIconsAndBannersTransitionProgress(float progress, boolean invert) {
super.setIconsAndBannersTransitionProgress(progress, invert);
// Value set by super call
float scale = mIconView.getAlpha();
mIconView2.setAlpha(scale);

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

@@ -19,6 +19,7 @@ package com.android.quickstep.views;
import static android.view.Display.DEFAULT_DISPLAY;
import static android.widget.Toast.LENGTH_SHORT;
import static com.android.launcher3.LauncherState.BACKGROUND_APP;
import static com.android.launcher3.Utilities.comp;
import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
@@ -172,7 +173,7 @@ public class TaskView extends FrameLayout implements Reusable {
new FloatProperty<TaskView>("focusTransition") {
@Override
public void setValue(TaskView taskView, float v) {
taskView.setIconAndDimTransitionProgress(v, false /* invert */);
taskView.setIconsAndBannersTransitionProgress(v, false /* invert */);
}
@Override
@@ -954,7 +955,11 @@ public class TaskView extends FrameLayout implements Reusable {
return deviceProfile.isTablet && !isFocusedTask();
}
protected void setIconAndDimTransitionProgress(float progress, boolean invert) {
/**
* Called to animate a smooth transition when going directly from an app into Overview (and
* vice versa). Icons fade in, and DWB banners slide in with a "shift up" animation.
*/
protected void setIconsAndBannersTransitionProgress(float progress, boolean invert) {
if (invert) {
progress = 1 - progress;
}
@@ -998,7 +1003,7 @@ public class TaskView extends FrameLayout implements Reusable {
if (mIconAndDimAnimator != null) {
mIconAndDimAnimator.cancel();
}
setIconAndDimTransitionProgress(iconScale, invert);
setIconsAndBannersTransitionProgress(iconScale, invert);
}
protected void resetPersistentViewTransforms() {
@@ -1418,6 +1423,12 @@ public class TaskView extends FrameLayout implements Reusable {
mIconView.setVisibility(progress < 1 ? VISIBLE : INVISIBLE);
mSnapshotView.getTaskOverlay().setFullscreenProgress(progress);
// Animate icons and DWB banners in/out, except in QuickSwitch state, when tiles are
// oversized and banner would look disproportionately large.
if (mActivity.getStateManager().getState() != BACKGROUND_APP) {
setIconsAndBannersTransitionProgress(progress, true);
}
updateSnapshotRadius();
}