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

Commit f11604ee authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Correct signal for showing contextual buttons for taskbar 

Apparently isContextualButtonShowing is not the right signal. Checking on dp.isGestureMode instead

Fixes: 300849078
Test: manual
Change-Id: Iac44bb4adbbdd5faf52100c88c2a4a6d95d58b98
parent 0dbcbfc0

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

+3 −3
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
    /**

     * @return {@code true} if A11y is showing in 3 button nav taskbar

     */

    private boolean isContextualButtonShowing() {

    private boolean isA11yButtonPersistent() {

        return mContext.isThreeButtonNav() && (mState & FLAG_A11Y_VISIBLE) != 0;

    }
@@ -742,7 +742,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
                            mA11yButton, res, isInKidsMode, isInSetup, isThreeButtonNav,

                            TaskbarManager.isPhoneMode(dp),

                            mWindowManagerProxy.getRotation(mContext));

            navButtonLayoutter.layoutButtons(dp, isContextualButtonShowing());

            navButtonLayoutter.layoutButtons(dp, isA11yButtonPersistent());

            updateNavButtonColor();

            return;

        }
@@ -838,7 +838,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
            int contextualWidth = mEndContextualContainer.getWidth();

            // If contextual buttons are showing, we check if the end margin is enough for the

            // contextual button to be showing - if not, move the nav buttons over a smidge

            if (isContextualButtonShowing() && navMarginEnd < contextualWidth) {

            if (isA11yButtonPersistent() && navMarginEnd < contextualWidth) {

                // Additional spacing, eat up half of space between last icon and nav button

                navMarginEnd += res.getDimensionPixelSize(R.dimen.taskbar_hotseat_nav_spacing) / 2;

            }

quickstep/src/com/android/launcher3/taskbar/navbutton/KidsNavLayoutter.kt

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class KidsNavLayoutter( 
            a11yButton

    ) {



    override fun layoutButtons(dp: DeviceProfile, isContextualButtonShowing: Boolean) {

    override fun layoutButtons(dp: DeviceProfile, isA11yButtonPersistent: Boolean) {

        val iconSize: Int = resources.getDimensionPixelSize(DIMEN_TASKBAR_ICON_SIZE_KIDS)

        val buttonWidth: Int = resources.getDimensionPixelSize(DIMEN_TASKBAR_NAV_BUTTONS_WIDTH_KIDS)

        val buttonHeight: Int =

quickstep/src/com/android/launcher3/taskbar/navbutton/NavButtonLayoutFactory.kt

+1 −1
Original line number Diff line number Diff line
@@ -162,6 +162,6 @@ class NavButtonLayoutFactory { 


    /** Lays out and provides access to the home, recents, and back buttons for various mischief */

    interface NavButtonLayoutter {

        fun layoutButtons(dp: DeviceProfile, isContextualButtonShowing: Boolean)

        fun layoutButtons(dp: DeviceProfile, isA11yButtonPersistent: Boolean)

    }

}

quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneGestureLayoutter.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class PhoneGestureLayoutter( 
                a11yButton

        ) {



    override fun layoutButtons(dp: DeviceProfile, isContextualButtonShowing: Boolean) {

    override fun layoutButtons(dp: DeviceProfile, isA11yButtonPersistent: Boolean) {

        endContextualContainer.removeAllViews()

        startContextualContainer.removeAllViews()

    }

quickstep/src/com/android/launcher3/taskbar/navbutton/PhoneLandscapeNavLayoutter.kt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ open class PhoneLandscapeNavLayoutter( 
            a11yButton

    ) {



    override fun layoutButtons(dp: DeviceProfile, isContextualButtonShowing: Boolean) {

    override fun layoutButtons(dp: DeviceProfile, isA11yButtonPersistent: Boolean) {

        // TODO(b/230395757): Polish pending, this is just to make it usable

        val endStartMargins = resources.getDimensionPixelSize(R.dimen.taskbar_nav_buttons_size)

        val taskbarDimensions = DimensionUtils.getTaskbarPhoneDimensions(dp, resources,