diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 20:54:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 20:54:47 -0800 |
| commit | a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b (patch) | |
| tree | d908b355561e894cc9f9bab003aefc9f7b44aef5 | |
| parent | e4b3e7a8240ac284e33d04eac00800d3e6e96cc8 (diff) | |
| parent | cd84d67629075795d4c5c28d980f77ff8d75c593 (diff) | |
| download | android_packages_apps_Gallery2-a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b.tar.gz android_packages_apps_Gallery2-a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b.tar.bz2 android_packages_apps_Gallery2-a12b35427a2b6e9d63d8c7eb8dcc04d91f47ba0b.zip | |
am cd84d676: Fix history panel overlap
* commit 'cd84d67629075795d4c5c28d980f77ff8d75c593':
Fix history panel overlap
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index e02a75100..ae07b0674 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -465,6 +465,10 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, if (mainPanelWidth == 0) { mainPanelWidth = mainViewWidth; } + int filtersPanelWidth = findViewById(R.id.filtersPanel).getWidth(); + if (mainPanelWidth < filtersPanelWidth) { + mainPanelWidth = filtersPanelWidth; + } int leftOver = mainViewWidth - mainPanelWidth - accessoryPanelWidth; if (leftOver < 0) { return -accessoryPanelWidth; |