From: Jason Monk <jmonk@google.com>
Date: Thu, 31 Aug 2017 19:42:51 +0000 (-0400)
Subject: Fix shift in share sheet
X-Git-Tag: android-x86-8.1-r1~88^2~22^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a38fe85e75e4f278fae18bce6f780fcd817b6bca;p=android-x86%2Fframeworks-base.git

Fix shift in share sheet

Was counting the padding twice, its included in height already.

Test: visual
Change-Id: I012c6db585eb5fac0d5cee87971d94740c520f07
Fixes: 63647502
---

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 54afc9553b0f..2cab009f7354 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -1470,10 +1470,8 @@ public class ChooserActivity extends ResolverActivity {
             }
 
             final int oldHeight = holder.row.getLayoutParams().height;
-            int measuredRowHeight = holder.measuredRowHeight + holder.row.getPaddingTop()
-                    + holder.row.getPaddingBottom();
             holder.row.getLayoutParams().height = Math.max(1,
-                    (int) (measuredRowHeight * getRowScale(rowPosition)));
+                    (int) (holder.measuredRowHeight * getRowScale(rowPosition)));
             if (holder.row.getLayoutParams().height != oldHeight) {
                 holder.row.requestLayout();
             }