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

Commit d66d1149 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Make enableTaskbarNoRecreate() depend on ENABLE_TASKBAR_PINNING and... 

Merge "Make enableTaskbarNoRecreate() depend on ENABLE_TASKBAR_PINNING and ENABLE_TASKBAR_NAVBAR_UNIFICATION" into main
parents b2cb1f87 f2d7be1c

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; 
import static com.android.launcher3.LauncherAnimUtils.ROTATION_DRAWABLE_PERCENT;

import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_X;

import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncestor;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;

import static com.android.launcher3.taskbar.LauncherTaskbarUIController.SYSUI_SURFACE_PROGRESS_INDEX;

import static com.android.launcher3.taskbar.TaskbarManager.isPhoneButtonNavMode;

import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_A11Y;
@@ -734,7 +735,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
        // TODO(b/244231596) we're getting the incorrect kidsMode value in small-screen

        boolean isInKidsMode = mContext.isNavBarKidsModeActive();



        if (TaskbarManager.ENABLE_TASKBAR_NAVBAR_UNIFICATION) {

        if (ENABLE_TASKBAR_NAVBAR_UNIFICATION) {

            NavButtonLayoutter navButtonLayoutter =

                    NavButtonLayoutFactory.Companion.getUiLayoutter(

                            dp, mNavButtonsView, mImeSwitcherButton,

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

+1 −1
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_TASKBAR_OVERLAY_PR 
import static com.android.launcher3.Flags.enableCursorHoverStates;

import static com.android.launcher3.Utilities.calculateTextHeight;

import static com.android.launcher3.Utilities.isRunningInTestHarness;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_PINNING;

import static com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate;

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

import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING;

import static com.android.launcher3.taskbar.TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_FULLSCREEN;

import static com.android.launcher3.taskbar.TaskbarManager.ENABLE_TASKBAR_NAVBAR_UNIFICATION;

import static com.android.launcher3.testing.shared.ResourceUtils.getBoolByName;

import static com.android.launcher3.util.VibratorWrapper.EFFECT_CLICK;

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

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

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.launcher3.taskbar; 
import static android.view.KeyEvent.ACTION_UP;

import static android.view.KeyEvent.KEYCODE_BACK;



import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;



import android.content.Context;

import android.graphics.Canvas;

import android.graphics.RectF;
@@ -126,7 +128,7 @@ public class TaskbarDragLayer extends BaseDragLayer<TaskbarActivityContext> { 
    }



    protected void onDestroy() {

        onDestroy(!TaskbarManager.ENABLE_TASKBAR_NAVBAR_UNIFICATION);

        onDestroy(!ENABLE_TASKBAR_NAVBAR_UNIFICATION);

    }



    @Override

quickstep/src/com/android/launcher3/taskbar/TaskbarInsetsController.kt

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.internal.policy.GestureNavigationSettingsObserver 
import com.android.launcher3.DeviceProfile

import com.android.launcher3.R

import com.android.launcher3.anim.AlphaUpdateListener

import com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION

import com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate

import com.android.launcher3.taskbar.TaskbarControllers.LoggableTaskbarController

import com.android.launcher3.util.DisplayController
@@ -253,7 +254,7 @@ class TaskbarInsetsController(val context: TaskbarActivityContext) : LoggableTas 
                                visInsetsSizeForTappableElement

                        ),

                )

        if ((context.isGestureNav || TaskbarManager.ENABLE_TASKBAR_NAVBAR_UNIFICATION)

        if ((context.isGestureNav || ENABLE_TASKBAR_NAVBAR_UNIFICATION)

                && provider.type == tappableElement()) {

            provider.insetsSizeOverrides = insetsSizeOverrideForTappableElement

        } else if (provider.type != systemGestures()) {

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

+2 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL; 


import static com.android.launcher3.BaseActivity.EVENT_DESTROYED;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.config.FeatureFlags.ENABLE_TASKBAR_NAVBAR_UNIFICATION;

import static com.android.launcher3.config.FeatureFlags.enableTaskbarNoRecreate;

import static com.android.launcher3.util.DisplayController.TASKBAR_NOT_DESTROYED_TAG;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;
@@ -98,9 +99,6 @@ public class TaskbarManager { 
            | ActivityInfo.CONFIG_SCREEN_LAYOUT

            | ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE;



    public static final boolean ENABLE_TASKBAR_NAVBAR_UNIFICATION =

            Flags.enableTaskbarNavbarUnification();



    private static final Uri USER_SETUP_COMPLETE_URI = Settings.Secure.getUriFor(

            Settings.Secure.USER_SETUP_COMPLETE);
@@ -494,7 +492,7 @@ public class TaskbarManager { 
     *                      and we are using a single window for taskbar and navbar.

     */

    public static boolean isPhoneMode(DeviceProfile deviceProfile) {

        return TaskbarManager.ENABLE_TASKBAR_NAVBAR_UNIFICATION && deviceProfile.isPhone;

        return ENABLE_TASKBAR_NAVBAR_UNIFICATION && deviceProfile.isPhone;

    }



    /**