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

Commit fc618777 authored by Antoan Angelov's avatar Antoan Angelov Committed by Automerger Merge Worker
Browse files

Merge "Setup button bar padding before empty state handling" into rvc-dev am:... 

Merge "Setup button bar padding before empty state handling" into rvc-dev am: 16fce9c6 am: 8b600257 am: 1e6c00c8 am: 286bfd4e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734105

Change-Id: Ice58dd460f1d67058d26e0baa228ba2fc7844b73
parents cee18868 286bfd4e

core/java/com/android/internal/app/ResolverActivity.java

+6 −6
Original line number Diff line number Diff line
@@ -1819,6 +1819,12 @@ public class ResolverActivity extends Activity implements 
        ResolverListAdapter activeListAdapter =

                mMultiProfilePagerAdapter.getActiveListAdapter();

        View buttonBarDivider = findViewById(R.id.resolver_button_bar_divider);

        if (!useLayoutWithDefault()) {

            int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0;

            buttonLayout.setPadding(buttonLayout.getPaddingLeft(), buttonLayout.getPaddingTop(),

                    buttonLayout.getPaddingRight(), getResources().getDimensionPixelSize(

                            R.dimen.resolver_button_bar_spacing) + inset);

        }

        if (activeListAdapter.isTabLoaded()

                && mMultiProfilePagerAdapter.shouldShowEmptyStateScreen(activeListAdapter)

                && !useLayoutWithDefault()) {
@@ -1835,12 +1841,6 @@ public class ResolverActivity extends Activity implements 
        buttonLayout.setVisibility(View.VISIBLE);

        setButtonBarIgnoreOffset(/* ignoreOffset */ true);



        if (!useLayoutWithDefault()) {

            int inset = mSystemWindowInsets != null ? mSystemWindowInsets.bottom : 0;

            buttonLayout.setPadding(buttonLayout.getPaddingLeft(), buttonLayout.getPaddingTop(),

                    buttonLayout.getPaddingRight(), getResources().getDimensionPixelSize(

                            R.dimen.resolver_button_bar_spacing) + inset);

        }

        mOnceButton = (Button) buttonLayout.findViewById(R.id.button_once);

        mAlwaysButton = (Button) buttonLayout.findViewById(R.id.button_always);