From 96078b10521676bd60ffff60f14619c1dcdaead6 Mon Sep 17 00:00:00 2001
From: arangelov <arangelov@google.com>
Date: Wed, 8 Jul 2020 15:53:26 +0100
Subject: [PATCH] Add bottom offset to the intial padding rather than
 accumulating it.

This prevents the padding from growing on screen rotations.

Fixes: 160005616
Test: manual
Test: atest ChooserActivityTest
Change-Id: I87fcfede3cf9cfad63adeb07b67ed68df403453f
---
 .../android/internal/app/ChooserMultiProfilePagerAdapter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
index ffa6041721c6f..3a65a324f9d6c 100644
--- a/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
+++ b/core/java/com/android/internal/app/ChooserMultiProfilePagerAdapter.java
@@ -252,8 +252,10 @@ public class ChooserMultiProfilePagerAdapter extends AbstractMultiProfilePagerAd
 
     @Override
     protected void setupContainerPadding(View container) {
+        int initialBottomPadding = getContext().getResources().getDimensionPixelSize(
+                R.dimen.resolver_empty_state_container_padding_bottom);
         container.setPadding(container.getPaddingLeft(), container.getPaddingTop(),
-                container.getPaddingRight(), container.getPaddingBottom() + mBottomOffset);
+                container.getPaddingRight(), initialBottomPadding + mBottomOffset);
     }
 
     class ChooserProfileDescriptor extends ProfileDescriptor {