summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-14 13:42:04 -0800
committerSteve Kondik <steve@cyngn.com>2016-11-17 23:54:30 -0800
commit80b47c20e4f35545fce802b6acfd4496810e16dd (patch)
treed39d9424302ba3aa831ba4f4ee504619db50d8d5 /res/layout
parent605a3aaabb1120673a254a78cfc027772c79ca3e (diff)
downloadandroid_packages_apps_Snap-80b47c20e4f35545fce802b6acfd4496810e16dd.zip
android_packages_apps_Snap-80b47c20e4f35545fce802b6acfd4496810e16dd.tar.gz
android_packages_apps_Snap-80b47c20e4f35545fce802b6acfd4496810e16dd.tar.bz2
snap: Improve transitions
* Synchronize animation to filmstrip with input * More code cleanups, introduce BaseModule * Animations are hard Change-Id: Ie664bb2059a28b3a9f3957fb491ec28fede521e5
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/camera_controls.xml15
1 files changed, 6 insertions, 9 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 1f12514..2269a60 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -23,7 +23,7 @@
android:background="@drawable/camera_controls_bg_translucent"
android:layout_width="match_parent"
android:layout_height="@dimen/preview_top_margin"
- android:gravity="center_vertical"
+ android:gravity="top"
android:orientation="horizontal">
<com.android.camera.ui.RotateImageView
@@ -71,7 +71,7 @@
android:id="@+id/bottom_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/preview_bottom_margin"
- android:gravity="center_vertical"
+ android:gravity="bottom"
android:background="@drawable/camera_controls_bg_translucent"
android:orientation="horizontal">
@@ -83,7 +83,6 @@
android:layout_gravity="center"
android:background="@android:color/transparent"
android:contentDescription="@string/switch_photo_filmstrip"
- android:elevation="1dp"
android:scaleType="fitCenter" />
<com.android.camera.ShutterButton
@@ -96,7 +95,6 @@
android:contentDescription="@string/accessibility_shutter_button"
android:focusable="true"
android:scaleType="fitCenter"
- android:elevation="1dp"
android:src="@drawable/btn_new_shutter" />
<ImageView
@@ -110,7 +108,6 @@
android:contentDescription="@string/accessibility_shutter_button"
android:focusable="true"
android:scaleType="fitCenter"
- android:elevation="1dp"
android:src="@drawable/btn_new_shutter_video" />
<com.android.camera.ui.ModuleSwitcher
@@ -121,7 +118,6 @@
android:scaleType="center"
android:layout_weight="1"
android:layout_gravity="center"
- android:elevation="1dp"
android:contentDescription="@string/accessibility_mode_picker" />
</LinearLayout>
@@ -159,9 +155,10 @@
<com.android.camera.ui.HistogramView
android:id="@+id/histogram"
- android:layout_width="200dip"
- android:layout_height="200dip"
- android:layout_marginTop="20dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:background="@color/camera_controls_bg_translucent"
android:visibility="gone" />
<TextView