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

Commit f3186a08 authored by Brian Isganitis's avatar Brian Isganitis Committed by Automerger Merge Worker
Browse files

Merge changes If4669756,Ide702745 into udc-dev am: 77a40999 

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



Change-Id: I1e74fc022373dfe46959023b9f5e0bea1be51fab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c68e363 77a40999

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

+6 −0
Original line number Diff line number Diff line
@@ -551,6 +551,12 @@ public class TaskbarLauncherStateController { 
            // updateValue ensures onIconAlignmentRatioChanged will be called if there is an actual

            // change in value

            mIconAlignment.updateValue(toAlignment);



            // Make sure FLAG_IN_APP is set when launching applications from keyguard.

            if (!isInLauncher) {

                mControllers.taskbarStashController.updateStateForFlag(FLAG_IN_APP, true);

                mControllers.taskbarStashController.applyState(0);

            }

        } else if (mIconAlignment.isAnimatingToValue(toAlignment)

                || mIconAlignment.isSettledOnValue(toAlignment)) {

            // Already at desired value, but make sure we run the callback at the end.

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

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
    // Currently any flag that causes us to stash in an app is included, except for IME or All Apps

    // since those cover the underlying app anyway and thus the app shouldn't change insets.

    private static final int FLAGS_REPORT_STASHED_INSETS_TO_APP = FLAGS_STASHED_IN_APP

            & ~FLAG_STASHED_IN_APP_IME & ~FLAG_STASHED_IN_TASKBAR_ALL_APPS;

            & ~FLAG_STASHED_IN_APP_IME & ~FLAG_STASHED_IN_TASKBAR_ALL_APPS

            & ~FLAG_STASHED_IN_APP_SYSUI;



    // If any of these flags are enabled, the taskbar must be stashed.

    private static final int FLAGS_FORCE_STASHED = FLAG_STASHED_SYSUI | FLAG_STASHED_DEVICE_LOCKED