Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6acf3501 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Fix Taskbar Education Tooltip Bottom Margin" into udc-dev

parents 9e0eee37 709242e8

quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayContext.java

+1 −11
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.launcher3.taskbar.BaseTaskbarContext; 
import com.android.launcher3.taskbar.TaskbarActivityContext;

import com.android.launcher3.taskbar.TaskbarControllers;

import com.android.launcher3.taskbar.TaskbarDragController;

import com.android.launcher3.taskbar.TaskbarStashController;

import com.android.launcher3.taskbar.TaskbarUIController;

import com.android.launcher3.taskbar.allapps.TaskbarAllAppsContainerView;

import com.android.launcher3.util.SplitConfigurationOptions.SplitSelectSource;
@@ -45,8 +44,6 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { 
    private final TaskbarDragController mDragController;

    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 TaskbarUIController mUiController;
@@ -60,18 +57,11 @@ public class TaskbarOverlayContext extends BaseTaskbarContext { 
        mDragController = new TaskbarDragController(this);

        mDragController.init(controllers);

        mDragLayer = new TaskbarOverlayDragLayer(this);



        TaskbarStashController taskbarStashController = controllers.taskbarStashController;

        mWillTaskbarBeVisuallyStashed = taskbarStashController.supportsVisualStashing();

        mStashedTaskbarHeight = taskbarStashController.getStashedHeight();

        mStashedTaskbarHeight = controllers.taskbarStashController.getStashedHeight();



        mUiController = controllers.uiController;

    }



    boolean willTaskbarBeVisuallyStashed() {

        return mWillTaskbarBeVisuallyStashed;

    }



    int getStashedTaskbarHeight() {

        return mStashedTaskbarHeight;

    }

quickstep/src/com/android/launcher3/taskbar/overlay/TaskbarOverlayDragLayer.java

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import androidx.annotation.NonNull; 
import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.shared.TestProtocol;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.TouchController;

import com.android.launcher3.views.BaseDragLayer;
@@ -185,7 +186,7 @@ public class TaskbarOverlayDragLayer extends 
     * 2) Sets tappableInsets bottom inset to 0.

     */

    private WindowInsets updateInsetsDueToStashing(WindowInsets oldInsets) {

        if (!mActivity.willTaskbarBeVisuallyStashed()) {

        if (!DisplayController.isTransientTaskbar(mActivity)) {

            return oldInsets;

        }

        WindowInsets.Builder updatedInsetsBuilder = new WindowInsets.Builder(oldInsets);