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

Commit a1e8f327 authored by Jagrut Desai's avatar Jagrut Desai Committed by Automerger Merge Worker
Browse files

Merge "Apply ForciblyShown WindowLayoutParam flags for Transient Taskbar" into... 

Merge "Apply ForciblyShown WindowLayoutParam flags for Transient Taskbar" into udc-qpr-dev am: 733d440a

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



Change-Id: I0066e91a986878debb75663fa68d4f5408af8898
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad147bbc 733d440a

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+20 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.view.Gravity; 
import android.view.RoundedCorner;

import android.view.Surface;

import android.view.View;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.widget.FrameLayout;

import android.widget.Toast;
@@ -852,6 +853,21 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        mWindowManager.updateViewLayout(mDragLayer, mWindowLayoutParams);

    }



    /**

     * Applies forcibly show flag to taskbar window iff transient taskbar is unstashed.

     */

    public void applyForciblyShownFlagWhileTransientTaskbarUnstashed(boolean shouldForceShow) {

        if (!DisplayController.isTransientTaskbar(this)) {

            return;

        }

        if (shouldForceShow) {

            mWindowLayoutParams.forciblyShownTypes |= WindowInsets.Type.navigationBars();

        } else {

            mWindowLayoutParams.forciblyShownTypes &= ~WindowInsets.Type.navigationBars();

        }

        notifyUpdateLayoutParams();

    }



    /**

     * Either adds or removes {@link WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE} on the taskbar

     * window. If we're now focusable, also move nav buttons to a separate window above IME.
@@ -1053,6 +1069,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 


    /**

     * Called when we detect a long press in the nav region before passing the gesture slop.

     *

     * @return Whether taskbar handled the long press, and thus should cancel the gesture.

     */

    public boolean onLongPressToUnstashTaskbar() {

quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java

+1 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,7 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
                    TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_TRANSIENT_TASKBAR,

                    !hasAnyFlag(FLAG_STASHED_IN_APP_AUTO));

        }

        mActivity.applyForciblyShownFlagWhileTransientTaskbarUnstashed(!isStashedInApp());

    }



    private void notifyStashChange(boolean visible, boolean stashed) {