From a997ca437a104ce4702bf3b2a2ac7cb6d8eeb65a Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Wed, 18 Aug 2021 18:44:55 +0000 Subject: [PATCH] Revert "Draw rounded corners above the taskbar" This reverts commit 157d3b950d66118c0a76785edf815741ca532ef3. Reason for revert: b/197129604 Bug: 197129604 Change-Id: Idf2267528fade23291aedea9787d98601495537c --- .../taskbar/TaskbarActivityContext.java | 28 +------------ .../launcher3/taskbar/TaskbarDragLayer.java | 42 +------------------ .../taskbar/TaskbarDragLayerController.java | 6 +-- .../taskbar/TaskbarViewController.java | 5 +-- 4 files changed, 8 insertions(+), 73 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index a90f17d227..ec0355b133 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -36,7 +36,6 @@ import android.view.ContextThemeWrapper; import android.view.Display; import android.view.Gravity; import android.view.LayoutInflater; -import android.view.RoundedCorner; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; @@ -84,7 +83,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ private final TaskbarControllers mControllers; private final WindowManager mWindowManager; - private final RoundedCorner mLeftCorner, mRightCorner; private WindowManager.LayoutParams mWindowLayoutParams; private boolean mIsFullscreen; // The size we should return to when we call setTaskbarWindowFullscreen(false) @@ -138,12 +136,10 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ ? windowContext.getApplicationContext() : windowContext.getApplicationContext().createDisplayContext(display); mWindowManager = c.getSystemService(WindowManager.class); - mLeftCorner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_LEFT); - mRightCorner = display.getRoundedCorner(RoundedCorner.POSITION_BOTTOM_RIGHT); } public void init() { - mLastRequestedNonFullscreenHeight = getDefaultTaskbarWindowHeight(); + mLastRequestedNonFullscreenHeight = mDeviceProfile.taskbarSize; mWindowLayoutParams = new WindowManager.LayoutParams( MATCH_PARENT, mLastRequestedNonFullscreenHeight, @@ -173,14 +169,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ return mNavMode == Mode.THREE_BUTTONS; } - public RoundedCorner getLeftCorner() { - return mLeftCorner; - } - - public RoundedCorner getRightCorner() { - return mRightCorner; - } - @Override public LayoutInflater getLayoutInflater() { return mLayoutInflater; @@ -262,12 +250,8 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ setTaskbarWindowHeight(fullscreen ? MATCH_PARENT : mLastRequestedNonFullscreenHeight); } - public boolean isTaskbarWindowFullscreen() { - return mIsFullscreen; - } - /** - * Updates the TaskbarContainer height (pass {@link #getDefaultTaskbarWindowHeight()} to reset). + * Updates the TaskbarContainer height (pass deviceProfile.taskbarSize to reset). */ public void setTaskbarWindowHeight(int height) { if (mWindowLayoutParams.height == height || mIsDestroyed) { @@ -287,14 +271,6 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams); } - /** - * Returns the default height of the window, including the static corner radii above taskbar. - */ - public int getDefaultTaskbarWindowHeight() { - return mDeviceProfile.taskbarSize - + Math.max(mLeftCorner.getRadius(), mRightCorner.getRadius()); - } - protected void onTaskbarIconClicked(View view) { Object tag = view.getTag(); if (tag instanceof Task) { diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java index 0848c35bf2..cd1baf726d 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayer.java @@ -18,7 +18,6 @@ package com.android.launcher3.taskbar; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; -import android.graphics.Path; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -41,12 +40,9 @@ import com.android.systemui.shared.system.ViewTreeObserverWrapper.OnComputeInset public class TaskbarDragLayer extends BaseDragLayer { private final Paint mTaskbarBackgroundPaint; - private final Path mInvertedLeftCornerPath, mInvertedRightCornerPath; private final OnComputeInsetsListener mTaskbarInsetsComputer = this::onComputeTaskbarInsets; - // Initialized in init. private TaskbarDragLayerController.TaskbarDragLayerCallbacks mControllerCallbacks; - private float mLeftCornerRadius, mRightCornerRadius; private float mTaskbarBackgroundOffset; @@ -69,32 +65,10 @@ public class TaskbarDragLayer extends BaseDragLayer { mTaskbarBackgroundPaint = new Paint(); mTaskbarBackgroundPaint.setColor(getResources().getColor(R.color.taskbar_background)); mTaskbarBackgroundPaint.setAlpha(0); - mTaskbarBackgroundPaint.setFlags(Paint.ANTI_ALIAS_FLAG); - mTaskbarBackgroundPaint.setStyle(Paint.Style.FILL); - - // Will be set in init(), but this ensures they are always non-null. - mInvertedLeftCornerPath = new Path(); - mInvertedRightCornerPath = new Path(); } public void init(TaskbarDragLayerController.TaskbarDragLayerCallbacks callbacks) { mControllerCallbacks = callbacks; - - // Create the paths for the inverted rounded corners above the taskbar. Start with a filled - // square, and then subtracting out a circle from the appropriate corner. - mLeftCornerRadius = mActivity.getLeftCorner().getRadius(); - mRightCornerRadius = mActivity.getRightCorner().getRadius(); - Path square = new Path(); - square.addRect(0, 0, mLeftCornerRadius, mLeftCornerRadius, Path.Direction.CW); - Path circle = new Path(); - circle.addCircle(mLeftCornerRadius, 0, mLeftCornerRadius, Path.Direction.CW); - mInvertedLeftCornerPath.op(square, circle, Path.Op.DIFFERENCE); - square.reset(); - square.addRect(0, 0, mRightCornerRadius, mRightCornerRadius, Path.Direction.CW); - circle.reset(); - circle.addCircle(0, 0, mRightCornerRadius, Path.Direction.CW); - mInvertedRightCornerPath.op(square, circle, Path.Op.DIFFERENCE); - recreateControllers(); } @@ -147,20 +121,8 @@ public class TaskbarDragLayer extends BaseDragLayer { protected void dispatchDraw(Canvas canvas) { float backgroundHeight = mControllerCallbacks.getTaskbarBackgroundHeight() * (1f - mTaskbarBackgroundOffset); - canvas.save(); - canvas.translate(0, canvas.getHeight() - backgroundHeight); - - // Draw the background behind taskbar content. - canvas.drawRect(0, 0, canvas.getWidth(), backgroundHeight, mTaskbarBackgroundPaint); - - // Draw the inverted rounded corners above the taskbar. - canvas.translate(0, -mLeftCornerRadius); - canvas.drawPath(mInvertedLeftCornerPath, mTaskbarBackgroundPaint); - canvas.translate(0, mLeftCornerRadius); - canvas.translate(canvas.getWidth() - mRightCornerRadius, -mRightCornerRadius); - canvas.drawPath(mInvertedRightCornerPath, mTaskbarBackgroundPaint); - - canvas.restore(); + canvas.drawRect(0, canvas.getHeight() - backgroundHeight, canvas.getWidth(), + canvas.getHeight(), mTaskbarBackgroundPaint); super.dispatchDraw(canvas); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java index 0afa480667..14150b9e25 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragLayerController.java @@ -16,7 +16,6 @@ package com.android.launcher3.taskbar; import static com.android.launcher3.AbstractFloatingView.TYPE_ALL; -import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_CONTENT; import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_FRAME; import static com.android.systemui.shared.system.ViewTreeObserverWrapper.InsetsInfo.TOUCHABLE_INSETS_REGION; @@ -133,14 +132,13 @@ public class TaskbarDragLayerController { // Let touches pass through us. insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); } else if (mControllers.navbarButtonsViewController.isImeVisible()) { - insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_CONTENT); + insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME); } else if (!mControllers.uiController.isTaskbarTouchable()) { // Let touches pass through us. insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); } else if (mControllers.taskbarViewController.areIconsVisible()) { // Buttons are visible, take over the full taskbar area - insetsInfo.setTouchableInsets(mActivity.isTaskbarWindowFullscreen() - ? TOUCHABLE_INSETS_FRAME : TOUCHABLE_INSETS_CONTENT); + insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_FRAME); } else { insetsInfo.setTouchableInsets(TOUCHABLE_INSETS_REGION); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 1882762a67..6b95f08090 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -165,9 +165,8 @@ public class TaskbarViewController { int offsetY = launcherDp.getTaskbarOffsetY(); setter.setFloat(mTaskbarIconTranslationYForHome, VALUE, -offsetY, LINEAR); - int collapsedHeight = mActivity.getDefaultTaskbarWindowHeight(); - int expandedHeight = Math.max(collapsedHeight, - mActivity.getDeviceProfile().taskbarSize + offsetY); + int collapsedHeight = mActivity.getDeviceProfile().taskbarSize; + int expandedHeight = collapsedHeight + offsetY; setter.addOnFrameListener(anim -> mActivity.setTaskbarWindowHeight( anim.getAnimatedFraction() > 0 ? expandedHeight : collapsedHeight));