summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKunhung Li <kunhungli@google.com>2019-07-16 09:34:20 +0800
committerKunhung Li <kunhungli@google.com>2019-07-30 03:03:42 +0000
commitc534e3bd5b4658ee1757bc448c6e3a31a27ef131 (patch)
tree12b114b0e3e75825e52bddfbb67462233e30ffaa
parentdbf9ada7d8c0241e1eac6b5a1541b7e7ee82cc07 (diff)
downloadandroid_packages_wallpapers_LivePicker-c534e3bd5b4658ee1757bc448c6e3a31a27ef131.tar.gz
android_packages_wallpapers_LivePicker-c534e3bd5b4658ee1757bc448c6e3a31a27ef131.tar.bz2
android_packages_wallpapers_LivePicker-c534e3bd5b4658ee1757bc448c6e3a31a27ef131.zip
Fix UI disordered when starting activity in background
ViewPager can't get its actual height when updating in background. Call super.onMeasure() at first to retrive child count and then call setMeasuredDimension(). Bug: 135406087 Test: Manual test Change-Id: I58430d01b324785d9d6f900d31791abf67ebceb2
-rw-r--r--src/com/android/wallpaper/livepicker/widget/ConstraintViewPager.java7
1 files changed, 3 insertions, 4 deletions
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 @@ public class ConstraintViewPager extends ViewPager {
*/
@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 @@ public class ConstraintViewPager extends ViewPager {
}
}
- if (maxChildHeight != 0) {
- heightMeasureSpec = MeasureSpec.makeMeasureSpec(maxChildHeight, MeasureSpec.EXACTLY);
- }
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), maxChildHeight);
}
}