From 33b0ac12fe3eba777206020e89aa9eec4fa757c6 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Fri, 24 May 2019 13:47:18 -0400
Subject: [PATCH] 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
---
 core/java/com/android/internal/app/ResolverActivity.java | 3 ++-
 core/res/res/layout/resolver_list.xml                    | 4 ++--
 core/res/res/values/dimens.xml                           | 1 +
 core/res/res/values/symbols.xml                          | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index a5daa0ae81e6e..538c81d541296 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -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);
diff --git a/core/res/res/layout/resolver_list.xml b/core/res/res/layout/resolver_list.xml
index 0697b0e3ea9e6..aeaccfded38a8 100644
--- a/core/res/res/layout/resolver_list.xml
+++ b/core/res/res/layout/resolver_list.xml
@@ -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">
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 6f11432bc5aad..e0ab6c871700f 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -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>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 3a348f05de48b..6cdb3d67192c6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -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" />