diff options
| author | Tenghui Zhu <ztenghui@google.com> | 2013-02-12 22:59:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-12 22:59:54 +0000 |
| commit | 882d3acccc98ec4a1bbe01d19a66d3e3a564a49b (patch) | |
| tree | b9bb94b97fee9d11f0491dd740da6f63bbe904e1 | |
| parent | a0d689f180db4c995d5be39a326b1fb5b21ff5c0 (diff) | |
| parent | 192a16ce9690f6710c0af4c64d1a2617aff0cae1 (diff) | |
| download | android_packages_apps_Gallery2-882d3acccc98ec4a1bbe01d19a66d3e3a564a49b.tar.gz android_packages_apps_Gallery2-882d3acccc98ec4a1bbe01d19a66d3e3a564a49b.tar.bz2 android_packages_apps_Gallery2-882d3acccc98ec4a1bbe01d19a66d3e3a564a49b.zip | |
Merge "DO NOT MERGE: Don't call requestLayout from onLayout" into gb-ub-photos-bryce
| -rw-r--r-- | src/com/android/gallery3d/app/CommonControllerOverlay.java | 4 |
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); |