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

[DO NOT MERGE] Disable live tile in split mode for S 

Recall link: https://recall.googleplex.com/projects/debb8388-5e38-42c5-99ab-20bdfb92d25e/sessions/655af962-b4bd-4dc4-93aa-178852c0d701

Bug: 193991436
Test: enter split screen and swipe up
Change-Id: I7adffcdefb12d225db207542716a436f29df0377
This commit is contained in:
Tracy Zhou 2021-07-20 15:58:19 -07:00
parent 4a17e66166
commit 145bd74749
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
quickstep/src/com/android/quickstep/util/TaskViewSimulator.java
View File

@ -56,6 +56,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
private final Context mContext; private final Context mContext;
private final BaseActivityInterface mSizeStrategy; private final BaseActivityInterface mSizeStrategy;
private final boolean mIsForLiveTile;
@NonNull @NonNull
private RecentsOrientedState mOrientationState; private RecentsOrientedState mOrientationState;
@ -93,8 +94,14 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
private int mOrientationStateId; private int mOrientationStateId;
public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) { public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy) {
this(context, sizeStrategy, false);
}
public TaskViewSimulator(Context context, BaseActivityInterface sizeStrategy,
boolean isForLiveTile) {
mContext = context; mContext = context;
mSizeStrategy = sizeStrategy; mSizeStrategy = sizeStrategy;
mIsForLiveTile = isForLiveTile;
// TODO(b/187074722): Don't create this per-TaskViewSimulator // TODO(b/187074722): Don't create this per-TaskViewSimulator
mOrientationState = TraceHelper.allowIpcs("", mOrientationState = TraceHelper.allowIpcs("",
@ -302,7 +309,8 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
.withWindowCrop(mTmpCropRect) .withWindowCrop(mTmpCropRect)
.withCornerRadius(getCurrentCornerRadius()); .withCornerRadius(getCurrentCornerRadius());
if (ENABLE_QUICKSTEP_LIVE_TILE.get() && params.getRecentsSurface() != null) { if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mIsForLiveTile
&& params.getRecentsSurface() != null) {
// When relativeLayer = 0, it reverts the surfaces back to the original order. // When relativeLayer = 0, it reverts the surfaces back to the original order.
builder.withRelativeLayerTo(params.getRecentsSurface(), builder.withRelativeLayerTo(params.getRecentsSurface(),
mDrawsBelowRecents ? Integer.MIN_VALUE : 0); mDrawsBelowRecents ? Integer.MIN_VALUE : 0);

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

@ -629,7 +629,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
// Initialize quickstep specific cache params here, as this is constructed only once // Initialize quickstep specific cache params here, as this is constructed only once
mActivity.getViewCache().setCacheSize(R.layout.digital_wellbeing_toast, 5); mActivity.getViewCache().setCacheSize(R.layout.digital_wellbeing_toast, 5);
mLiveTileTaskViewSimulator = new TaskViewSimulator(getContext(), getSizeStrategy()); mLiveTileTaskViewSimulator = new TaskViewSimulator(getContext(), getSizeStrategy(),
true /* isForLiveTile */);
mLiveTileTaskViewSimulator.recentsViewScale.value = 1; mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
mLiveTileTaskViewSimulator.setOrientationState(mOrientationState); mLiveTileTaskViewSimulator.setOrientationState(mOrientationState);
mLiveTileTaskViewSimulator.setDrawsBelowRecents(true); mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
@ -1791,6 +1792,12 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
} }
mCurrentGestureEndTarget = null; mCurrentGestureEndTarget = null;
if (ENABLE_QUICKSTEP_LIVE_TILE.get() && mActivity.getDeviceProfile().isMultiWindowMode) {
switchToScreenshot(
() -> finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
null));
}
} }
/** /**