summaryrefslogtreecommitdiffstats
path: root/res/layout-land/camera_controls.xml
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-01-16 17:04:29 -0800
committerByunghun Jeon <bjeon@codeaurora.org>2015-01-20 11:35:12 -0800
commit5ffb42bb05ccb667ef52017faf925a385c9bd7a1 (patch)
tree695e4ffbae30f9ed487fd86c2de96eed141e1105 /res/layout-land/camera_controls.xml
parent9badbd28c54a7110fcb3a42d06c908326866ec98 (diff)
downloadandroid_packages_apps_Snap-5ffb42bb05ccb667ef52017faf925a385c9bd7a1.tar.gz
android_packages_apps_Snap-5ffb42bb05ccb667ef52017faf925a385c9bd7a1.tar.bz2
android_packages_apps_Snap-5ffb42bb05ccb667ef52017faf925a385c9bd7a1.zip
SnapdragonCamera: New shutter Icons
Add new shutter icons for SnapdragonCamera Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb
Diffstat (limited to 'res/layout-land/camera_controls.xml')
-rw-r--r--res/layout-land/camera_controls.xml30
1 files changed, 22 insertions, 8 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index eecc13f2e..f10ae9271 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -54,14 +54,14 @@
<com.android.camera.ShutterButton
android:id="@+id/shutter_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/shutter_size"
+ android:layout_height="@dimen/shutter_size"
android:layout_gravity="right|center_vertical"
android:layout_marginRight="@dimen/shutter_offset"
android:clickable="true"
android:contentDescription="@string/accessibility_shutter_button"
android:focusable="true"
- android:scaleType="center"
+ android:scaleType="fitCenter"
android:src="@drawable/btn_new_shutter" />
<com.android.camera.ui.RotateImageView
@@ -109,12 +109,26 @@
android:layout_gravity="center" />
</com.android.camera.ui.RotatableLayout>
- <TextView
+ <LinearLayout
android:id="@+id/remaining_photos"
- android:background="@android:color/transparent"
- android:textColor="@android:color/white"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:visibility="gone" />
+ android:background="@android:color/transparent"
+ android:orientation="horizontal"
+ android:visibility="gone" >
+
+ <TextView
+ android:id="@+id/remaining_photos_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent"
+ android:textColor="@android:color/white" />
+
+ <ImageView
+ android:id="@+id/remaining_photos_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/remaining_sheets" />
+ </LinearLayout>
-</com.android.camera.ui.CameraControls>
+</com.android.camera.ui.CameraControls> \ No newline at end of file