summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-08-30 23:30:18 (GMT)
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-30 23:30:18 (GMT)
commit750e73c4a4b04a5695540d3c982774662307b58e (patch)
tree26e99ce58f1a9b9872c33904724f45cd6927496c
parent8d2c6b830131a3d2e6ec7f2f8158b37506403dbd (diff)
parentde84c22cf14f8005002af473f19ff0244d520f6c (diff)
downloadandroid_packages_apps_Snap-750e73c4a4b04a5695540d3c982774662307b58e.zip
android_packages_apps_Snap-750e73c4a4b04a5695540d3c982774662307b58e.tar.gz
android_packages_apps_Snap-750e73c4a4b04a5695540d3c982774662307b58e.tar.bz2
Merge "Measure all children to ensure correct layout position" into gb-ub-photos-carlsbad
-rw-r--r--src/com/android/camera/ui/CameraControls.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java
index ed28139..d211f4e 100644
--- a/src/com/android/camera/ui/CameraControls.java
+++ b/src/com/android/camera/ui/CameraControls.java
@@ -37,10 +37,12 @@ public class CameraControls extends RotatableLayout {
public CameraControls(Context context, AttributeSet attrs) {
super(context, attrs);
+ setMeasureAllChildren(true);
}
public CameraControls(Context context) {
super(context);
+ setMeasureAllChildren(true);
}
@Override