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

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

Merge "[taskbar/navbar unification] Do not shift back button after unlocking... 

Merge "[taskbar/navbar unification] Do not shift back button after unlocking in phone mode" into main
parents 9e6f276d 7ce0d39c

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

+7 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.android.launcher3.Utilities.getDescendantCoordRelativeToAncest 
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.TaskbarManager.isPhoneMode;

import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_A11Y;

import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_BACK;

import static com.android.launcher3.taskbar.TaskbarNavButtonController.BUTTON_HOME;
@@ -380,10 +381,12 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
        int navButtonSize = mContext.getResources().getDimensionPixelSize(

                R.dimen.taskbar_nav_buttons_size);

        boolean isRtl = Utilities.isRtl(mContext.getResources());

        if (!isPhoneMode(mContext.getDeviceProfile())) {

            mPropertyHolders.add(new StatePropertyHolder(

                    mBackButton, flags -> (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0

                            || (flags & FLAG_KEYGUARD_VISIBLE) != 0,

                    VIEW_TRANSLATE_X, navButtonSize * (isRtl ? -2 : 2), 0));

        }



        // home button

        mHomeButton = addButton(R.drawable.ic_sysbar_home, BUTTON_HOME, navContainer,