diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-03 14:06:32 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 14:06:32 -0700 |
commit | 88b31b0940459f79204086d567a8aaad0a842f89 (patch) | |
tree | 6330776d2a9a21d0c9deda525e6a19f771ffd310 | |
parent | 6b879500209fb3f187141ece2bed39537a697aa1 (diff) | |
parent | 77dd14930b24816369560a73cfb0610c1f745d05 (diff) | |
download | android_packages_apps_Snap-88b31b0940459f79204086d567a8aaad0a842f89.tar.gz android_packages_apps_Snap-88b31b0940459f79204086d567a8aaad0a842f89.tar.bz2 android_packages_apps_Snap-88b31b0940459f79204086d567a8aaad0a842f89.zip |
am 77dd1493: Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbad
* commit '77dd14930b24816369560a73cfb0610c1f745d05':
Make space for photosphere rendering text
-rw-r--r-- | res/layout/camera_filmstrip.xml | 1 | ||||
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 2 |
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 93707a1d5..26e6bbea8 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; |