summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2009-09-17 17:55:37 +0800
committerOwen Lin <owenlin@google.com>2009-09-22 10:43:59 +0800
commit37acf79b1cc060f355c9cd1803c2bdd5e39deb27 (patch)
tree7d6cf70ae49f5e79ed889541a9018feb30d21aad /res/layout
parent8a89877f74cf08d7b5f6342721b020a31a144529 (diff)
downloadLegacyCamera-37acf79b1cc060f355c9cd1803c2bdd5e39deb27.zip
LegacyCamera-37acf79b1cc060f355c9cd1803c2bdd5e39deb27.tar.gz
LegacyCamera-37acf79b1cc060f355c9cd1803c2bdd5e39deb27.tar.bz2
Add a icon bar to show the current state.
Change-Id: Ic0c32abffed267fa97b6b449c4dd432af3e0e591
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/camera.xml32
1 files changed, 24 insertions, 8 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index 64ad273..a07b6c4 100644
--- a/res/layout/camera.xml
+++ b/res/layout/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:background="@drawable/camera_background"
android:id="@+id/camera"
android:orientation="horizontal"
@@ -48,15 +49,30 @@
android:id="@+id/focus_rectangle"
android:layout_width="384dp"
android:layout_height="288dp"/>
- <ImageView
- android:id="@+id/gps_indicator"
+ <com.android.camera.EvenlySpacedLayout
+ camera:orientation="vertical"
+ android:visibility="visible"
+ android:layout_gravity="left|fill_vertical"
+ android:id="@+id/action_icon_panel"
+ android:layout_marginTop="20dp"
+ android:layout_marginLeft="10dp"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="invisible"
- android:clickable="false"
- android:focusable="false"
- android:layout_marginLeft="5dp"
- android:layout_marginTop="5dp"/>
+ android:layout_height="288dp">
+ <com.android.camera.IconIndicator
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/gps_icon"
+ camera:modes="@array/gps_modes"
+ camera:icons="@array/gps_icons"
+ android:visibility="visible"/>
+ <com.android.camera.IconIndicator
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/flash_icon"
+ camera:modes="@array/pref_camera_flashmode_entryvalues"
+ camera:icons="@array/flash_icons"
+ android:visibility="visible"/>
+ </com.android.camera.EvenlySpacedLayout>
</FrameLayout>
</LinearLayout>
</RelativeLayout>