summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-11-28 19:59:51 -0800
committernicolasroard <nicolasroard@google.com>2012-11-28 19:59:51 -0800
commitcd84d67629075795d4c5c28d980f77ff8d75c593 (patch)
tree760a584ccc45945f4f5442a074860baa95928360
parent987bc8aaafa55c45451937b27d94c1d602de4d68 (diff)
downloadandroid_packages_apps_Gallery2-cd84d67629075795d4c5c28d980f77ff8d75c593.tar.gz
android_packages_apps_Gallery2-cd84d67629075795d4c5c28d980f77ff8d75c593.tar.bz2
android_packages_apps_Gallery2-cd84d67629075795d4c5c28d980f77ff8d75c593.zip
Fix history panel overlap
bug:7545507 Change-Id: I06236f3025191896c851af1d84dc48a4dde18b1d
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java4
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;