Merge "Fix shift in share sheet" into oc-mr1-dev

am: 3a31bdede5 Change-Id: I3e1b3f3acf77a9df31b3f38b942bcbc728efffeb
2017-09-06 18:04:40 +00:00
parent f2cd0f616e 3a31bdede5
commit 8ca3a3661b
1 changed files with 1 additions and 3 deletions
--- 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();
            }