summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-08-22 16:07:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-22 16:07:25 -0700
commitde07dbb65fb35fd36c6e27c417b8fc0c8e4f690f (patch)
tree5c997a93292b27c3b687cb5a745c8471c9e71fe8
parentfd791ba47fdca3f2c625293088c5869b221bfb1c (diff)
parent304a6360c3b710a4a5781788b887ca479646c86f (diff)
downloadandroid_packages_apps_Snap-de07dbb65fb35fd36c6e27c417b8fc0c8e4f690f.tar.gz
android_packages_apps_Snap-de07dbb65fb35fd36c6e27c417b8fc0c8e4f690f.tar.bz2
android_packages_apps_Snap-de07dbb65fb35fd36c6e27c417b8fc0c8e4f690f.zip
am 304a6360: Merge "Fix nav bar overlapping camera bottom UI controls" into gb-ub-photos-carlsbad
* commit '304a6360c3b710a4a5781788b887ca479646c86f': Fix nav bar overlapping camera bottom UI controls
-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);
}