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

Merge "Originate split select animation from the original icon view instead of the split menu icon" into tm-dev am: 0c625f7472

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

Change-Id: I0279b8189b4016f97a23343de5ee04bcafe39e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tracy Zhou
2022-05-03 17:19:30 +00:00
committed by Automerger Merge Worker
parent 4d48c3d528 0c625f7472
commit 79304811ce
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/popup/QuickstepSystemShortcut.java
+2 -1
View File
@@ -70,7 +70,8 @@ public interface QuickstepSystemShortcut {
RecentsView recentsView = mTarget.getOverviewPanel(); RecentsView recentsView = mTarget.getOverviewPanel();
recentsView.initiateSplitSelect( recentsView.initiateSplitSelect(
new SplitSelectSource(view, new BitmapDrawable(bitmap), intent, mPosition)); new SplitSelectSource(mOriginalView, new BitmapDrawable(bitmap), intent,
mPosition));
} }
} }
quickstep/src/com/android/quickstep/views/FloatingTaskView.java
+7
View File
@@ -196,6 +196,13 @@ public class FloatingTaskView extends FrameLayout {
0, 1, ACCEL); 0, 1, ACCEL);
animation.addFloat(mThumbnailView, LauncherAnimUtils.VIEW_ALPHA, animation.addFloat(mThumbnailView, LauncherAnimUtils.VIEW_ALPHA,
1, 0, DEACCEL_3); 1, 0, DEACCEL_3);
} else if (isStagedTask) {
// Fade in the placeholder view when split is initiated from homescreen / all apps
// icons.
if (mSplitPlaceholderView.getAlpha() == 0) {
animation.addFloat(mSplitPlaceholderView, SplitPlaceholderView.ALPHA_FLOAT,
0.3f, 1, ACCEL);
}
} }
MultiValueUpdateListener listener = new MultiValueUpdateListener() { MultiValueUpdateListener listener = new MultiValueUpdateListener() {
quickstep/src/com/android/quickstep/views/RecentsView.java
+5 -6
View File
@@ -2757,16 +2757,15 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mSplitHiddenTaskView.getThumbnail().getThumbnail(), mSplitHiddenTaskView.getThumbnail().getThumbnail(),
mSplitHiddenTaskView.getIconView().getDrawable(), startingTaskRect); mSplitHiddenTaskView.getIconView().getDrawable(), startingTaskRect);
mFirstFloatingTaskView.setAlpha(1); mFirstFloatingTaskView.setAlpha(1);
mFirstFloatingTaskView.addAnimation(anim, startingTaskRect, mFirstFloatingTaskView.addAnimation(anim, startingTaskRect, mTempRect,
mTempRect, true /* fadeWithThumbnail */, true /* isStagedTask */); true /* fadeWithThumbnail */, true /* isStagedTask */);
} else { } else {
mSplitSelectSource.view.setVisibility(INVISIBLE);
mFirstFloatingTaskView = FloatingTaskView.getFloatingTaskView(mActivity, mFirstFloatingTaskView = FloatingTaskView.getFloatingTaskView(mActivity,
mSplitSelectSource.view, null, mSplitSelectSource.view, null /* thumbnail */,
mSplitSelectSource.drawable, startingTaskRect); mSplitSelectSource.drawable, startingTaskRect);
mFirstFloatingTaskView.setAlpha(1); mFirstFloatingTaskView.setAlpha(1);
mFirstFloatingTaskView.addAnimation(anim, startingTaskRect, mFirstFloatingTaskView.addAnimation(anim, startingTaskRect, mTempRect,
mTempRect, true /* fadeWithThumbnail */, true /* isStagedTask */); false /* fadeWithThumbnail */, true /* isStagedTask */);
} }
InteractionJankMonitorWrapper.begin(this, InteractionJankMonitorWrapper.begin(this,
InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER, "First tile selected"); InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER, "First tile selected");