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

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

Merge "Log when FLAG_STASHED_IN_APP_AUTO changes." into tm-qpr-dev am: 201a8f5e am: c9905fed 

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



Change-Id: I56f40e88f58630b919fc1231fc1b230074c186bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f4d53b0 c9905fed

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

+0 −1
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        return mTransientTaskbarBounds;

    }



    @VisibleForTesting

    @Override

    public StatsLogManager getStatsLogManager() {

        // Used to mock, can't mock a default interface method directly

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

+7 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import static com.android.launcher3.anim.Interpolators.LINEAR; 
import static com.android.launcher3.config.FeatureFlags.FORCE_PERSISTENT_TASKBAR;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_HIDE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TASKBAR_LONGPRESS_SHOW;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TRANSIENT_TASKBAR_HIDE;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_TRANSIENT_TASKBAR_SHOW;

import static com.android.launcher3.taskbar.Utilities.appendFlag;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_IME_SHOWING;
@@ -972,6 +974,11 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
                mActivity.getStatsLogManager().logger().log(LAUNCHER_TASKBAR_LONGPRESS_SHOW);

            }

        }

        if (hasAnyFlag(changedFlags, FLAG_STASHED_IN_APP_AUTO)) {

            mActivity.getStatsLogManager().logger().log(hasAnyFlag(FLAG_STASHED_IN_APP_AUTO)

                    ? LAUNCHER_TRANSIENT_TASKBAR_HIDE

                    : LAUNCHER_TRANSIENT_TASKBAR_SHOW);

        }

    }



    private void notifyStashChange(boolean visible, boolean stashed) {

src/com/android/launcher3/logging/StatsLogManager.java

+6 −0
Original line number Diff line number Diff line
@@ -636,6 +636,12 @@ public class StatsLogManager implements ResourceBasedOverride { 


        @UiEvent(doc = "User scrolled up on the search result page.")

        LAUNCHER_ALLAPPS_SEARCH_SCROLLED_UP(1286),



        @UiEvent(doc = "User or automatic timeout has hidden transient taskbar.")

        LAUNCHER_TRANSIENT_TASKBAR_HIDE(1330),



        @UiEvent(doc = "User has swiped upwards from the gesture handle to show transient taskbar.")

        LAUNCHER_TRANSIENT_TASKBAR_SHOW(1331),

        ;



        // ADD MORE