Add exposure indicator on screen.

bug:5141528
Change-Id: Ib63c24b52c4b4bc67e88c1ec6a8ac41b9e4c09e5

4 files changed, 42 insertions, 32 deletions

diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index 7c92f1d..f6afd9a 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -28,25 +28,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:visibility="gone"/>
-        <com.android.camera.ui.FocusRectangle
-                android:id="@+id/focus_rectangle"
+        <com.android.camera.ui.FocusRectangle android:id="@+id/focus_rectangle"
                 android:layout_width="180dp"
                 android:layout_height="180dp"
                 android:layout_centerInParent="true"/>
-        <ImageView style="@style/OnScreenGpsIndicator"
-                android:id="@+id/onscreen_gps_indicator_no_signal"
-                android:src="@drawable/ic_viewfinder_gps_no_signal"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:layout_margin="15dp"
-                android:visibility="gone"/>
-        <ImageView style="@style/OnScreenGpsIndicator"
-                android:id="@+id/onscreen_gps_indicator_on"
-                android:src="@drawable/ic_viewfinder_gps_on"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"
-                android:layout_margin="15dp"
-                android:visibility="gone"/>
+        <include layout="@layout/priority_indicators"/>
         <include layout="@layout/review_control"/>
         <include layout="@layout/tap_to_focus_toast"/>
     </RelativeLayout>
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml
index 1bf621a..b7685bf 100644
--- a/res/layout/preview_frame.xml
+++ b/res/layout/preview_frame.xml
@@ -39,20 +39,7 @@
                 android:layout_width="120dp"
                 android:layout_height="120dp"
                 android:layout_centerInParent="true"/>
-        <ImageView style="@style/OnScreenGpsIndicator"
-                android:id="@+id/onscreen_gps_indicator_no_signal"
-                android:src="@drawable/ic_viewfinder_gps_no_signal"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                android:layout_margin="5dp"
-                android:visibility="gone"/>
-        <ImageView style="@style/OnScreenGpsIndicator"
-                android:id="@+id/onscreen_gps_indicator_on"
-                android:src="@drawable/ic_viewfinder_gps_on"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentBottom="true"
-                android:layout_margin="5dp"
-                android:visibility="gone"/>
+        <include layout="@layout/priority_indicators"/>
         <include layout="@layout/tap_to_focus_toast"/>
         <include layout="@layout/indicator_bar" />
     </RelativeLayout>
diff --git a/res/layout/priority_indicators.xml b/res/layout/priority_indicators.xml
new file mode 100644
index 0000000..4926484
--- /dev/null
+++ b/res/layout/priority_indicators.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="8dp">
+    <ImageView style="@style/OnScreenIndicator"
+            android:id="@+id/onscreen_gps_indicator_no_signal"
+            android:src="@drawable/ic_viewfinder_gps_no_signal"/>
+    <ImageView style="@style/OnScreenIndicator"
+            android:id="@+id/onscreen_gps_indicator_on"
+            android:src="@drawable/ic_viewfinder_gps_on"/>
+    <TextView style="@style/OnScreenIndicator"
+            android:id="@+id/onscreen_exposure_indicator"
+            android:gravity="center_vertical"
+            android:textSize="15dp"
+            android:textColor="@android:color/white"/>
+</LinearLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e299915..80d1a56 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -96,10 +96,13 @@
         <item name="android:paddingRight">8dp</item>
         <item name="android:background">@drawable/setting_picker</item>
     </style>
-    <style name="OnScreenGpsIndicator">
-        <item name="android:layout_height">wrap_content</item>
+    <style name="OnScreenIndicator">
+        <item name="android:layout_height">28dp</item>
         <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_gravity">center_vertical</item>
         <item name="android:focusable">false</item>
+        <item name="android:visibility">gone</item>
+        <item name="android:layout_marginRight">8dp</item>
     </style>
     <style name="OnViewfinderLabel">
         <item name="android:gravity">center</item>