summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTenghui Zhu <ztenghui@google.com>2013-02-12 22:59:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-12 22:59:54 +0000
commite5349356383416c813db70544624cf2f3d72a65c (patch)
tree1cac0ebd8792415e3db57a7cccbf1b8152e76917 /src
parent0e1fd65c1b797dbed03570bf5e4f868600d680c3 (diff)
parentfc7f760667061a64e5acf09d80e08472fe148260 (diff)
downloadandroid_packages_apps_Snap-e5349356383416c813db70544624cf2f3d72a65c.tar.gz
android_packages_apps_Snap-e5349356383416c813db70544624cf2f3d72a65c.tar.bz2
android_packages_apps_Snap-e5349356383416c813db70544624cf2f3d72a65c.zip
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/app/CommonControllerOverlay.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/app/CommonControllerOverlay.java b/src/com/android/gallery3d/app/CommonControllerOverlay.java
index 089872fa5..a5aa805ef 100644
--- a/src/com/android/gallery3d/app/CommonControllerOverlay.java
+++ b/src/com/android/gallery3d/app/CommonControllerOverlay.java
@@ -274,10 +274,6 @@ public abstract class CommonControllerOverlay extends FrameLayout implements
mBackground.layout(0, y - mTimeBar.getBarHeight(), w, y);
mTimeBar.layout(pl, y - mTimeBar.getPreferredHeight(), w - pr, y);
- // Needed, otherwise the framework will not re-layout in case only the
- // padding is changed
- mTimeBar.requestLayout();
-
// Put the play/pause/next/ previous button in the center of the screen
layoutCenteredView(mPlayPauseReplayView, 0, 0, w, h);