summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-03-27 18:10:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-27 18:10:18 +0000
commitc6af786bdc2488c2c7a69846b81261f31ffdccb3 (patch)
tree366e58442d57b3cd92d958b4cf2a7c944f43efd0
parenta148e5b2139e6dad6c77f79e3440abb671db70b2 (diff)
parent1f69b697746b62c76c8a4892c62e20380151be69 (diff)
downloadandroid_packages_apps_Snap-c6af786bdc2488c2c7a69846b81261f31ffdccb3.tar.gz
android_packages_apps_Snap-c6af786bdc2488c2c7a69846b81261f31ffdccb3.tar.bz2
android_packages_apps_Snap-c6af786bdc2488c2c7a69846b81261f31ffdccb3.zip
Merge "Workaround for switcher popup being cut off on ICS" into gb-ub-photos-bryce
-rw-r--r--src/com/android/camera/ui/CameraSwitcher.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/CameraSwitcher.java b/src/com/android/camera/ui/CameraSwitcher.java
index e9551ada2..b046ff7ae 100644
--- a/src/com/android/camera/ui/CameraSwitcher.java
+++ b/src/com/android/camera/ui/CameraSwitcher.java
@@ -313,6 +313,8 @@ public class CameraSwitcher extends RotateImageView
// Verify that we weren't canceled
if (showsPopup()) {
setVisibility(View.INVISIBLE);
+ // request layout to make sure popup is laid out correctly on ICS
+ mPopup.requestLayout();
}
}
};