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

Commit c7295ee3 authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Add margin to SUW back button 

* navButtonsLayoutParams marginEnd was removed, and
SUW was relying on that value to add margins to
SUW back button, but was returning 0.

Fixes: 242999939
Test: Visually observed in SUW test activity
adb shell am start -n com.google.android.setupwizard/.SetupWizardTestActivity

Change-Id: I5ffc421e9b731b0d9c7b7c48eab807d4419721b1
parent f733a716

quickstep/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ 
    <dimen name="taskbar_contextual_button_padding">16dp</dimen>

    <dimen name="taskbar_contextual_padding_top">8dp</dimen>

    <dimen name="taskbar_nav_buttons_size">44dp</dimen>

    <dimen name="taskbar_contextual_button_margin">47dp</dimen>

    <dimen name="taskbar_contextual_button_margin">48dp</dimen>

    <dimen name="taskbar_hotseat_nav_spacing">24dp</dimen>

    <dimen name="taskbar_contextual_buttons_size">35dp</dimen>

    <dimen name="taskbar_stashed_size">24dp</dimen>

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

+2 −1
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT 
                // end-aligned, so start-align instead.

                FrameLayout.LayoutParams navButtonsLayoutParams = (FrameLayout.LayoutParams)

                        mNavButtonContainer.getLayoutParams();

                navButtonsLayoutParams.setMarginStart(navButtonsLayoutParams.getMarginEnd());

                navButtonsLayoutParams.setMarginStart(

                        resources.getDimensionPixelSize(R.dimen.taskbar_contextual_button_margin));

                navButtonsLayoutParams.setMarginEnd(0);

                navButtonsLayoutParams.gravity = Gravity.START;

                mNavButtonContainer.requestLayout();