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

Merge "Fix Taskbar Education Tooltip Bottom Margin" into udc-dev am: 6acf350107

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

Change-Id: I86907522c3a827b5ab748f40deb86e4c1d80a128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jagrut Desai
2023-05-22 17:56:34 +00:00
committed by Automerger Merge Worker
parent ff46ba6280 6acf350107
commit c07fcf6633
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java
+1 -11
View File
@@ -27,7 +27,6 @@ import com.android.launcher3.taskbar.BaseTaskbarContext;
import com.android.launcher3.taskbar.TaskbarActivityContext; import com.android.launcher3.taskbar.TaskbarActivityContext;
import com.android.launcher3.taskbar.TaskbarControllers; import com.android.launcher3.taskbar.TaskbarControllers;
import com.android.launcher3.taskbar.TaskbarDragController; import com.android.launcher3.taskbar.TaskbarDragController;
import com.android.launcher3.taskbar.TaskbarStashController;
import com.android.launcher3.taskbar.TaskbarUIController; import com.android.launcher3.taskbar.TaskbarUIController;
import com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView; import com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView;
import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource; import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource;
@@ -45,8 +44,6 @@ public class TaskbarOverlayContext extends BaseTaskbarContext {
private final TaskbarDragController mDragController; private final TaskbarDragController mDragController;
private final TaskbarOverlayDragLayer mDragLayer; private final TaskbarOverlayDragLayer mDragLayer;
// We automatically stash taskbar when All Apps is opened in gesture navigation mode.
private final boolean mWillTaskbarBeVisuallyStashed;
private final int mStashedTaskbarHeight; private final int mStashedTaskbarHeight;
private final TaskbarUIController mUiController; private final TaskbarUIController mUiController;
@@ -60,18 +57,11 @@ public class TaskbarOverlayContext extends BaseTaskbarContext {
mDragController = new TaskbarDragController(this); mDragController = new TaskbarDragController(this);
mDragController.init(controllers); mDragController.init(controllers);
mDragLayer = new TaskbarOverlayDragLayer(this); mDragLayer = new TaskbarOverlayDragLayer(this);
mStashedTaskbarHeight = controllers.taskbarStashController.getStashedHeight();
TaskbarStashController taskbarStashController = controllers.taskbarStashController;
mWillTaskbarBeVisuallyStashed = taskbarStashController.supportsVisualStashing();
mStashedTaskbarHeight = taskbarStashController.getStashedHeight();
mUiController = controllers.uiController; mUiController = controllers.uiController;
} }
boolean willTaskbarBeVisuallyStashed() {
return mWillTaskbarBeVisuallyStashed;
}
int getStashedTaskbarHeight() { int getStashedTaskbarHeight() {
return mStashedTaskbarHeight; return mStashedTaskbarHeight;
} }
quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java
+2 -1
View File
@@ -32,6 +32,7 @@ import androidx.annotation.NonNull;
import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.testing.TestLogging; import com.android.launcher3.testing.TestLogging;
import com.android.launcher3.testing.shared.TestProtocol; import com.android.launcher3.testing.shared.TestProtocol;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.TouchController; import com.android.launcher3.util.TouchController;
import com.android.launcher3.views.BaseDragLayer; import com.android.launcher3.views.BaseDragLayer;
@@ -185,7 +186,7 @@ public class TaskbarOverlayDragLayer extends
* 2) Sets tappableInsets bottom inset to 0. * 2) Sets tappableInsets bottom inset to 0.
*/ */
private WindowInsets updateInsetsDueToStashing(WindowInsets oldInsets) { private WindowInsets updateInsetsDueToStashing(WindowInsets oldInsets) {
if (!mActivity.willTaskbarBeVisuallyStashed()) { if (!DisplayController.isTransientTaskbar(mActivity)) {
return oldInsets; return oldInsets;
} }
WindowInsets.Builder updatedInsetsBuilder = new WindowInsets.Builder(oldInsets); WindowInsets.Builder updatedInsetsBuilder = new WindowInsets.Builder(oldInsets);