Add a icon bar to show the current state.

Change-Id: Ic0c32abffed267fa97b6b449c4dd432af3e0e591

7 files changed, 67 insertions, 8 deletions

diff --git a/res/drawable-hdpi/ic_viewfinder_flash_auto.png b/res/drawable-hdpi/ic_viewfinder_flash_auto.png
new file mode 100755
index 0000000..27968e7
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-hdpi/ic_viewfinder_flash_on.png b/res/drawable-hdpi/ic_viewfinder_flash_on.png
new file mode 100755
index 0000000..71ee867
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_flash_on.png
diff --git a/res/drawable-mdpi/ic_viewfinder_flash_auto.png b/res/drawable-mdpi/ic_viewfinder_flash_auto.png
new file mode 100755
index 0000000..79e36b7
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-mdpi/ic_viewfinder_flash_on.png b/res/drawable-mdpi/ic_viewfinder_flash_on.png
new file mode 100755
index 0000000..91dfe24
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_flash_on.png
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>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4687088..7498936 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -94,6 +94,22 @@
         <item>off</item>
     </string-array>
 
+    <array name="flash_icons">
+        <item>@drawable/ic_viewfinder_flash_auto</item>
+        <item>@drawable/ic_viewfinder_flash_on</item>
+        <item>0</item>
+    </array>
+
+    <string-array name="gps_modes" translatable="false">
+        <item>off</item>
+        <item>on</item>
+    </string-array>
+
+    <array name="gps_icons">
+        <item>0</item>
+        <item>@drawable/ic_camera_sym_gps</item>
+    </array>
+
     <!-- Camera Preferences White Balance dialog box entries -->
     <string-array name="pref_camera_whitebalance_entries" translatable="false">
         <item>@string/pref_camera_whitebalance_entry_auto</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
new file mode 100644
index 0000000..e66693a
--- /dev/null
+++ b/res/values/attrs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <declare-styleable name="IconIndicator">
+        <attr name="icons" format="reference" />
+        <attr name="modes" format="reference" />
+    </declare-styleable>
+    <declare-styleable name="EvenlySpacedLayout">
+        <attr name="orientation">
+            <enum name="horizontal" value="0" />
+            <enum name="vertical" value="1" />
+        </attr>
+    </declare-styleable>
+</resources>