summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorCheng-Ru Lin <owenlin@google.com>2009-11-12 11:48:46 +0800
committerCheng-Ru Lin <owenlin@google.com>2009-11-12 14:25:54 +0800
commitcc12a303ad51063cee73715849a951fb5f383188 (patch)
treed623cf3ac9d26f79a9582164357f6e97dd911fe4 /res/layout
parent9324f11afe9366cd5479828a214dc8de8696a5ab (diff)
downloadLegacyCamera-cc12a303ad51063cee73715849a951fb5f383188.zip
LegacyCamera-cc12a303ad51063cee73715849a951fb5f383188.tar.gz
LegacyCamera-cc12a303ad51063cee73715849a951fb5f383188.tar.bz2
Add icon-indicators to VideoCamera.
Change-Id: Ie5ace8cf1863636ffe94f89d70525483a95b3239 http://b/2247081
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/video_camera.xml20
1 files changed, 18 insertions, 2 deletions
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml
index b165d90..9ebdc03 100644
--- a/res/layout/video_camera.xml
+++ b/res/layout/video_camera.xml
@@ -15,6 +15,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"
android:id="@+id/video_camera"
android:background="@drawable/camera_background"
android:orientation="horizontal"
@@ -35,8 +36,7 @@
<SurfaceView android:id="@+id/camera_preview"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
- <ImageView
- android:id="@+id/video_frame"
+ <ImageView android:id="@+id/video_frame"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:visibility="gone" />
@@ -61,6 +61,22 @@
android:textSize="23dp"
android:textStyle="bold"
android:visibility="gone"/>
+ <LinearLayout android:id="@+id/indicator_bar"
+ android:orientation="vertical"
+ android:visibility="visible"
+ android:gravity="center"
+ android:layout_gravity="left|bottom"
+ android:layout_marginBottom="60dp"
+ android:layout_marginLeft="13dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+ <com.android.camera.IconIndicator
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/whitebalance_icon"
+ camera:modes="@array/pref_camera_whitebalance_entryvalues"
+ camera:icons="@array/whitebalance_icons"/>
+ </LinearLayout>
</FrameLayout>
</com.android.camera.PreviewFrameLayout>
</LinearLayout>