summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErin Dahlgren <edahlgren@google.com>2013-10-03 11:49:30 -0700
committerErin Dahlgren <edahlgren@google.com>2013-10-03 11:49:30 -0700
commit88641ad117189fe1a3440dc82e57312507879bab (patch)
tree08aac3c7713e4533824991474401c5c69857e15e
parent6416ba8a428025c669782a2d3226f06ad5a86921 (diff)
downloadandroid_packages_apps_Snap-88641ad117189fe1a3440dc82e57312507879bab.tar.gz
android_packages_apps_Snap-88641ad117189fe1a3440dc82e57312507879bab.tar.bz2
android_packages_apps_Snap-88641ad117189fe1a3440dc82e57312507879bab.zip
Make space for photosphere rendering text
Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
-rw-r--r--res/layout/camera_filmstrip.xml1
-rw-r--r--src/com/android/camera/ui/FilmStripView.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml
index 89fd8ccbf..00bbcdb7f 100644
--- a/res/layout/camera_filmstrip.xml
+++ b/res/layout/camera_filmstrip.xml
@@ -56,7 +56,6 @@
android:shadowRadius="2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingBottom="8dp"
android:visibility="visible"
android:layout_gravity="right"/>
diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java
index 75886df05..967758056 100644
--- a/src/com/android/camera/ui/FilmStripView.java
+++ b/src/com/android/camera/ui/FilmStripView.java
@@ -53,7 +53,7 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener {
private static final int SNAP_IN_CENTER_TIME_MS = 600;
private static final int ZOOM_ANIMATION_DURATION_MS = 200;
private static final int CAMERA_PREVIEW_SWIPE_THRESHOLD = 300;
- private static final float FILM_STRIP_SCALE = 0.6f;
+ private static final float FILM_STRIP_SCALE = 0.5f;
private static final float FULL_SCREEN_SCALE = 1f;
private static final float TOLERANCE = 0.1f;