From 204224ce0423e4a6a29fa015128131c71b9bb9d8 Mon Sep 17 00:00:00 2001
From: Chih-yu Huang <akahuang@google.com>
Date: Fri, 11 Nov 2011 19:41:34 +0800
Subject: Add indicators of settings on the viewfinder.

Add exposure, flash, scene, white balance, and focus indicators.

bug:5039279
Change-Id: I7ef87ee35855030dbc8fdc2d4c52fa5d8b6549ba
---
 res/layout/priority_indicators.xml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/priority_indicators.xml b/res/layout/priority_indicators.xml
index 794dfb8..a8318e0 100644
--- a/res/layout/priority_indicators.xml
+++ b/res/layout/priority_indicators.xml
@@ -20,19 +20,23 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:padding="8dp">
-    <ImageView style="@style/OnScreenIndicator"
-            android:padding="1dp"
-            android:id="@+id/onscreen_gps_indicator_no_signal"
-            android:src="@drawable/ic_viewfinder_gps_no_signal"/>
-    <ImageView style="@style/OnScreenIndicator"
-            android:padding="1dp"
-            android:id="@+id/onscreen_gps_indicator_on"
-            android:src="@drawable/ic_viewfinder_gps_on"/>
-    <TextView style="@style/OnScreenIndicator"
-            android:id="@+id/onscreen_exposure_indicator"
+    <ImageView android:id="@+id/onscreen_flash_indicator"
+            style="@style/OnScreenIndicator"
+            android:visibility="visible"/>
+    <ImageView android:id="@+id/onscreen_white_balance_indicator"
+            style="@style/OnScreenIndicator"/>
+    <TextView android:id="@+id/onscreen_exposure_indicator"
+            style="@style/OnScreenIndicator"
             android:layout_marginTop="6dp"
-            android:rotation="90.0"
+            android:layout_marginBottom="6dp"
             android:gravity="center_vertical"
             android:textSize="15dp"
             android:textColor="@android:color/white"/>
+    <ImageView android:id="@+id/onscreen_scene_indicator"
+            style="@style/OnScreenIndicator"
+            android:src="@drawable/ic_indicators_scn"/>
+    <ImageView android:id="@+id/onscreen_gps_indicator"
+            style="@style/OnScreenIndicator"/>
+    <ImageView android:id="@+id/onscreen_focus_indicator"
+            style="@style/OnScreenIndicator"/>
 </LinearLayout>
-- 
cgit v1.1