summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-08-21 00:45:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-21 00:45:37 +0000
commit304a6360c3b710a4a5781788b887ca479646c86f (patch)
tree4b30de917b0a0c935339440a2f33608fe8e59b8c
parentb5ca24e7ce3aa1e3511f0bdf871fd7e41c247027 (diff)
parent513f1c1e8b7b4249c599a734307e348355439b67 (diff)
downloadandroid_packages_apps_Snap-304a6360c3b710a4a5781788b887ca479646c86f.tar.gz
android_packages_apps_Snap-304a6360c3b710a4a5781788b887ca479646c86f.tar.bz2
android_packages_apps_Snap-304a6360c3b710a4a5781788b887ca479646c86f.zip
Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
-rw-r--r--src/com/android/camera/ui/FilmStripView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 7b5505769..c7920c35d 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -627,6 +627,8 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
// Set the position of the "View Photo Sphere" button.
FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) mBottomControls
.getLayoutParams();
+ params.leftMargin = insets.left;
+ params.rightMargin = insets.right;
params.bottomMargin = insets.bottom;
mBottomControls.setLayoutParams(params);
}