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

Commit 33b0ac12 authored by Matt Pietal's avatar Matt Pietal
Browse files

Resolver - Fix bottom spacing issue with edge-to-edge 

When the button bar renders multiple times, as is the case when using
the back button from Settings, the bottom padding keeps getting
increased to make the list creep upwards. Set the padding to a fixed
number rather than keep adding to it.

Bug: 132114008
Test: Manual
Change-Id: Iab07fdbf7eb3373f354bb3825a3bd18df141f608
parent 731490a1

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

+2 −1
Original line number Diff line number Diff line
@@ -1319,7 +1319,8 @@ public class ResolverActivity extends Activity { 
            buttonLayout.setVisibility(View.VISIBLE);

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

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

                    buttonLayout.getPaddingRight(), buttonLayout.getPaddingBottom() + inset);

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

                        R.dimen.resolver_button_bar_spacing) + inset);



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

            mSettingsButton = (Button) buttonLayout.findViewById(R.id.button_app_settings);

core/res/res/layout/resolver_list.xml

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ 
        android:layoutDirection="locale"

        android:measureWithLargestChild="true"

        android:background="?attr/colorBackgroundFloating"

        android:paddingTop="8dp"

        android:paddingBottom="8dp"

        android:paddingTop="@dimen/resolver_button_bar_spacing"

        android:paddingBottom="@dimen/resolver_button_bar_spacing"

        android:paddingStart="12dp"

        android:paddingEnd="12dp"

        android:elevation="8dp">

core/res/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -742,6 +742,7 @@ 
    <dimen name="chooser_preview_image_border">1dp</dimen>

    <dimen name="chooser_preview_width">-1px</dimen>

    <dimen name="resolver_icon_size">42dp</dimen>

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

    <dimen name="resolver_badge_size">18dp</dimen>

    <dimen name="chooser_target_width">90dp</dimen>

    <dimen name="chooser_header_scroll_elevation">4dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3775,6 +3775,7 @@ 
  <java-symbol type="drawable" name="iconfactory_adaptive_icon_drawable_wrapper"/>

  <java-symbol type="dimen" name="resolver_icon_size"/>

  <java-symbol type="dimen" name="resolver_badge_size"/>

  <java-symbol type="dimen" name="resolver_button_bar_spacing"/>



  <!-- For DropBox -->

  <java-symbol type="integer" name="config_dropboxLowPriorityBroadcastRateLimitPeriod" />