diff options
| author | Marco Nelissen <marcone@google.com> | 2013-02-06 15:35:52 -0800 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2013-02-12 14:47:29 -0800 |
| commit | fc7f760667061a64e5acf09d80e08472fe148260 (patch) | |
| tree | 00c22c9753455cb13a3c1fee5f011498532501d9 /src | |
| parent | 3d3a66695f3d022a71e8b9c77326eb68cd15b31d (diff) | |
| download | android_packages_apps_Snap-fc7f760667061a64e5acf09d80e08472fe148260.tar.gz android_packages_apps_Snap-fc7f760667061a64e5acf09d80e08472fe148260.tar.bz2 android_packages_apps_Snap-fc7f760667061a64e5acf09d80e08472fe148260.zip | |
DO NOT MERGE: Don't call requestLayout from onLayout
Doing a layout within a layout can lead to various problems, so it should
be avoided. There's some logging that warns of this, which got triggered
by CommonControllerOverlay.
I don't know what problem this code was originally trying to solve, but it
doesn't seem to be necessary anymore. The line in question was originally
introduced in change 209a9163d4e8cee0bfe162ae598ef40e6051479c, in Oct 2011.
Note: This has been checked into master, this is just cherry picking into
Bryce branch.
Change-Id: I7651304491a90e8d130f4a0a3b3de8e29c4d0116
Diffstat (limited to 'src')
| -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); |