commit dfd84e8a4c2434fb0f2a7fdba1ada5b2bb5f3743
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 06 03:06:51 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 06 03:06:51 2019 +0000
tree 12b114b0e3e75825e52bddfbb67462233e30ffaa
parent 77c5450293e82576a1385bdac17ecc6c0baacf97
parent c534e3bd5b4658ee1757bc448c6e3a31a27ef131

Snap for 5782352 from c534e3bd5b4658ee1757bc448c6e3a31a27ef131 to qt-qpr1-release

Change-Id: I1f1f87799d8d44b27430d20a5ae46d08a6c98b1a

src/com/android/wallpaper/livepicker/widget/ConstraintViewPager.java

diff --git a/src/com/android/wallpaper/livepicker/widget/ConstraintViewPager.java b/src/com/android/wallpaper/livepicker/widget/ConstraintViewPager.java
index 985cad6..f59b0b9 100644
--- a/src/com/android/wallpaper/livepicker/widget/ConstraintViewPager.java
+++ b/src/com/android/wallpaper/livepicker/widget/ConstraintViewPager.java
@@ -50,6 +50,8 @@
      */
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
         int maxChildHeight = 0;
         int infoChildHeight = 0;
         int infoTopPadding = 0;
@@ -81,9 +83,6 @@
             }
         }
 
-        if (maxChildHeight != 0) {
-            heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxChildHeight, MeasureSpec.EXACTLY);
-        }
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), maxChildHeight);
     }
 }