From f5d5b6f00fcf64dc7d4a0df5dad683ba8d8921f6 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 11 May 2018 06:50:21 +0000 Subject: [PATCH] Revert "Update sysui flags on swipe, skip task backgrounds on opaque apps" This reverts commit 5dd46d51eda6e26830c994e9a0581d57316beb51. Reason for revert: Temporary revert until ag/4040557 goes in Change-Id: Iab2c747a99e1fb1cc5a91787dbf185df77f791b4 --- quickstep/libs/sysui_shared.jar | Bin 128394 -> 128480 bytes .../android/quickstep/views/RecentsView.java | 12 ----- .../quickstep/views/TaskThumbnailView.java | 45 +++++------------- src/com/android/launcher3/BaseActivity.java | 7 --- .../launcher3/util/SystemUiController.java | 3 +- 5 files changed, 14 insertions(+), 53 deletions(-) diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar index b343cc2058e876e79f468a5d285e154acfe726f0..f16e4d0df05b31257fab463f21a067ed91e9764a 100644 GIT binary patch delta 14834 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 Bi1+{i delta 14708 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 extends PagedView impl }; public static final boolean FLIP_RECENTS = true; private static final int DISMISS_TASK_DURATION = 300; - // The threshold at which we update the SystemUI flags when animating from the task into the app - private static final float UPDATE_SYSUI_FLAGS_THRESHOLD = 0.6f; private static final float[] sTempFloatArray = new float[3]; @@ -1155,21 +1152,12 @@ public abstract class RecentsView extends PagedView impl } tv.setVisibility(INVISIBLE); - int targetSysUiFlags = tv.getThumbnail().getSysUiStatusNavFlags(); TaskViewDrawable drawable = new TaskViewDrawable(tv, this); getOverlay().add(drawable); ObjectAnimator drawableAnim = ObjectAnimator.ofFloat(drawable, TaskViewDrawable.PROGRESS, 1, 0); drawableAnim.setInterpolator(LINEAR); - drawableAnim.addUpdateListener((animator) -> { - // Once we pass a certain threshold, update the sysui flags to match the target tasks' - // flags - mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, - animator.getAnimatedFraction() > UPDATE_SYSUI_FLAGS_THRESHOLD - ? targetSysUiFlags - : 0); - }); AnimatorSet anim = createAdjacentPageAnimForTaskLaunch(tv, drawable.getClipAnimationHelper()); diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java index af7a735f55..c724930841 100644 --- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java @@ -16,7 +16,6 @@ package com.android.quickstep.views; -import static android.view.View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; import static com.android.systemui.shared.system.WindowManagerWrapper.WINDOWING_MODE_FULLSCREEN; import android.content.Context; @@ -39,7 +38,6 @@ import com.android.launcher3.BaseActivity; import com.android.launcher3.DeviceProfile; import com.android.launcher3.R; import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.util.SystemUiController; import com.android.quickstep.TaskOverlayFactory; import com.android.quickstep.TaskOverlayFactory.TaskOverlay; import com.android.systemui.shared.recents.model.Task; @@ -145,20 +143,6 @@ public class TaskThumbnailView extends View { return new Rect(); } - public int getSysUiStatusNavFlags() { - if (mThumbnailData != null) { - int flags = 0; - flags |= (mThumbnailData.systemUiVisibility & SYSTEM_UI_FLAG_LIGHT_STATUS_BAR) != 0 - ? SystemUiController.FLAG_LIGHT_STATUS - : SystemUiController.FLAG_DARK_STATUS; - flags |= (mThumbnailData.systemUiVisibility & SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) != 0 - ? SystemUiController.FLAG_LIGHT_NAV - : SystemUiController.FLAG_DARK_NAV; - return flags; - } - return 0; - } - @Override protected void onDraw(Canvas canvas) { drawOnCanvas(canvas, 0, 0, getMeasuredWidth(), getMeasuredHeight(), mCornerRadius); @@ -170,23 +154,20 @@ public class TaskThumbnailView extends View { public void drawOnCanvas(Canvas canvas, float x, float y, float width, float height, float cornerRadius) { - // Draw the background in all cases, except when the thumbnail data is opaque - final boolean drawBackgroundOnly = mTask == null || mTask.isLocked || mBitmapShader == null - || mThumbnailData == null; - if (drawBackgroundOnly || mClipBottom > 0 || mThumbnailData.isTranslucent) { - canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mBackgroundPaint); - if (drawBackgroundOnly) { - return; - } + // Always draw the background since the snapshots may be translucent + canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mBackgroundPaint); + if (mTask == null) { + return; } - - if (mClipBottom > 0) { - canvas.save(); - canvas.clipRect(x, y, width, mClipBottom); - canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mPaint); - canvas.restore(); - } else { - canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mPaint); + if (!mTask.isLocked) { + if (mClipBottom > 0) { + canvas.save(); + canvas.clipRect(x, y, width, mClipBottom); + canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mPaint); + canvas.restore(); + } else { + canvas.drawRoundRect(x, y, width, height, cornerRadius, cornerRadius, mPaint); + } } } diff --git a/src/com/android/launcher3/BaseActivity.java b/src/com/android/launcher3/BaseActivity.java index 1f70cfaa10..bd38bf00d2 100644 --- a/src/com/android/launcher3/BaseActivity.java +++ b/src/com/android/launcher3/BaseActivity.java @@ -16,7 +16,6 @@ package com.android.launcher3; -import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW; import static java.lang.annotation.RetentionPolicy.SOURCE; import android.app.Activity; @@ -154,12 +153,6 @@ public abstract class BaseActivity extends Activity { protected void onPause() { mActivityFlags &= ~ACTIVITY_STATE_RESUMED; super.onPause(); - - // Reset the overridden sysui flags used for the task-swipe launch animation, we do this - // here instead of at the end of the animation because the start of the new activity does - // not happen immediately, which would cause us to reset to launcher's sysui flags and then - // back to the new app (causing a flash) - getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0); } public boolean isStarted() { diff --git a/src/com/android/launcher3/util/SystemUiController.java b/src/com/android/launcher3/util/SystemUiController.java index 7ef53a97d7..edbf05a7cf 100644 --- a/src/com/android/launcher3/util/SystemUiController.java +++ b/src/com/android/launcher3/util/SystemUiController.java @@ -31,7 +31,6 @@ public class SystemUiController { public static final int UI_STATE_ALL_APPS = 1; public static final int UI_STATE_WIDGET_BOTTOM_SHEET = 2; public static final int UI_STATE_ROOT_VIEW = 3; - public static final int UI_STATE_OVERVIEW = 4; public static final int FLAG_LIGHT_NAV = 1 << 0; public static final int FLAG_DARK_NAV = 1 << 1; @@ -39,7 +38,7 @@ public class SystemUiController { public static final int FLAG_DARK_STATUS = 1 << 3; private final Window mWindow; - private final int[] mStates = new int[5]; + private final int[] mStates = new int[4]; public SystemUiController(Window window) { mWindow = window;