Merge "Call setCanAffectSystemUiFlags(false) only for PiP" into tm-qpr-dev am: bf8528c21b

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

Change-Id: I8683c0aba058961f0afbfa372110f4a4da7b9fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2022-06-10 22:05:35 +00:00
committed by Automerger Merge Worker
3 changed files with 7 additions and 2 deletions

View File

@@ -1799,6 +1799,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
new PictureInPictureSurfaceTransaction.Builder()
.setAlpha(0f)
.build();
tx.setShouldDisableCanAffectSystemUiFlags(false);
int[] taskIds = TopTaskTracker.INSTANCE.get(mContext).getRunningSplitTaskIds();
for (int taskId : taskIds) {
mRecentsAnimationController.setFinishTaskTransaction(taskId,

View File

@@ -279,7 +279,10 @@ public class SwipePipToHomeAnimator extends RectFSpringAnim {
// get the final leash operations but do not apply to the leash.
final SurfaceControl.Transaction tx =
PipSurfaceTransactionHelper.newSurfaceControlTransaction();
return onAnimationUpdate(tx, new RectF(mDestinationBounds), END_PROGRESS);
final PictureInPictureSurfaceTransaction pipTx =
onAnimationUpdate(tx, new RectF(mDestinationBounds), END_PROGRESS);
pipTx.setShouldDisableCanAffectSystemUiFlags(true);
return pipTx;
}
private RotatedPosition getRotatedPosition(float progress) {

View File

@@ -141,8 +141,8 @@ import com.android.launcher3.util.IntSet;
import com.android.launcher3.util.MultiValueAlpha;
import com.android.launcher3.util.ResourceBasedOverride.Overrides;
import com.android.launcher3.util.RunnableList;
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
import com.android.launcher3.util.SplitConfigurationOptions.SplitBounds;
import com.android.launcher3.util.SplitConfigurationOptions.StagePosition;
import com.android.launcher3.util.Themes;
import com.android.launcher3.util.TranslateEdgeEffect;
import com.android.launcher3.util.ViewPool;
@@ -4562,6 +4562,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
new PictureInPictureSurfaceTransaction.Builder()
.setAlpha(0f)
.build();
tx.setShouldDisableCanAffectSystemUiFlags(false);
int[] taskIds = TopTaskTracker.INSTANCE.get(getContext()).getRunningSplitTaskIds();
for (int taskId : taskIds) {
mRecentsAnimationController.setFinishTaskTransaction(taskId,