SnapdragonCamera: Added checkbox stats visualizer

1) Added checkbox in stats visualizer
2) Added AWB information for display

Change-Id: Id51d29b798a5d1f849463d28e03b695384fd3aa4

5 files changed, 73 insertions, 16 deletions

diff --git a/res/layout/capture_module.xml b/res/layout/capture_module.xml
index 1c012c5c7..afc199547 100755
--- a/res/layout/capture_module.xml
+++ b/res/layout/capture_module.xml
@@ -72,36 +72,87 @@
             android:visibility="gone"
             android:layout_width="100dip"
             android:layout_height="100dip"
-            android:layout_marginTop="70dip"
+            android:layout_marginTop="520dip"
             android:layout_marginLeft="10dip" />
         <com.android.camera.Camera2GraphView
             android:id="@+id/graph_view_gb"
             android:visibility="gone"
             android:layout_width="100dip"
             android:layout_height="100dip"
-            android:layout_marginTop="70dip"
+            android:layout_marginTop="520dip"
             android:layout_marginLeft="120dip" />
         <com.android.camera.Camera2GraphView
             android:id="@+id/graph_view_b"
             android:visibility="gone"
             android:layout_width="100dip"
             android:layout_height="100dip"
-            android:layout_marginTop="70dip"
+            android:layout_marginTop="520dip"
             android:layout_marginLeft="230dip" />
+        <TextView
+            android:id="@+id/bg_stats_graph_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="68dip"
+            android:layout_marginLeft="16dip"
+            android:textSize="15sp"
+            android:visibility="gone"
+            android:text="@string/stats_visualizer_bg_label"/>
         <com.android.camera.Camera2BGBitMap
             android:id="@+id/bg_stats_graph"
             android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="68dip"
+            android:layout_marginTop="88dip"
             android:layout_marginLeft="16dip" />
+        <TextView
+            android:id="@+id/be_stats_graph_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="68dip"
+            android:layout_marginLeft="260dip"
+            android:textSize="15sp"
+            android:visibility="gone"
+            android:text="@string/stats_visualizer_be_label"/>
         <com.android.camera.Camera2BEBitMap
             android:id="@+id/be_stats_graph"
             android:visibility="gone"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="88dip"
+            android:layout_marginLeft="260dip" />
+        <LinearLayout
+            android:id="@+id/stats_awb_info"
             android:layout_marginTop="68dip"
-            android:layout_marginLeft="16dip" />
+            android:layout_marginLeft="150dip"
+            android:orientation="vertical"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/stats_awb_r_text"
+                android:textSize="15sp"
+                android:padding="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:id="@+id/stats_awb_g_text"
+                android:textSize="15sp"
+                android:padding="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:id="@+id/stats_awb_b_text"
+                android:textSize="15sp"
+                android:padding="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+            <TextView
+                android:id="@+id/stats_awb_cc_text"
+                android:textSize="15sp"
+                android:padding="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
         <com.android.camera.DrawAutoHDR2
             android:id="@+id/autohdr_view"
             android:layout_width="200dip"
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 2916736cf..6d03c50f5 100755
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -1190,17 +1190,17 @@ for time lapse recording -->
     </string-array>
 
     <string-array name="pref_camera2_stats_visualizer_entries" translatable="false">
-        <item>@string/pref_camera2_stats_visualizer_entry_disable</item>
         <item>@string/pref_camera2_stats_visualizer_entry_bg_stats</item>
         <item>@string/pref_camera2_stats_visualizer_entry_be_stats</item>
         <item>@string/pref_camera2_stats_visualizer_entry_hist_stats</item>
+        <item>@string/pref_camera2_stats_visualizer_entry_awb_info</item>
     </string-array>
 
     <string-array name="pref_camera2_stats_visualizer_entryvalues" translatable="false">
-        <item>@string/pref_camera2_stats_visualizer_entry_value_disable</item>
         <item>@string/pref_camera2_stats_visualizer_entry_value_enable_bg</item>
         <item>@string/pref_camera2_stats_visualizer_entry_value_enable_be</item>
         <item>@string/pref_camera2_stats_visualizer_entry_value_enable_hist</item>
+        <item>@string/pref_camera2_stats_visualizer_entry_value_enable_awb</item>
     </string-array>
 
     <string-array name="pref_camera2_capture_mfnr_entries" translatable="false">
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 379794ef8..abe18706d 100755
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -889,6 +889,10 @@
         <item>@string/pref_camera_bokeh_mpo_entry_value_disable</item>
     </string-array>
 
+    <string-array name="pref_camera2_stats_visualizer_default" translatable="false">
+        <item></item>
+    </string-array>
+
     <string-array name="pref_camera_bokeh_blur_degree_entries" translatable="true">
         <item>0</item>
         <item>10</item>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 7d7603288..403fc8b7b 100755
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -1268,15 +1268,17 @@
     <string name="pref_camera_scenemode_entry_deepportrait" translatable="false">Deepportrait</string>
 
     <string name="pref_camera2_stats_visualizer_title" translatable="true">Stats Visualizer</string>
-    <string name="pref_camera2_stats_visualizer_default" translatable="false">0</string>
-    <string name="pref_camera2_stats_visualizer_entry_disable" translatable="false">Disable All</string>
+    <string name="pref_camera2_stats_visualizer_default" translatable="false"></string>
     <string name="pref_camera2_stats_visualizer_entry_bg_stats" translatable="false">BG Stats</string>
     <string name="pref_camera2_stats_visualizer_entry_be_stats" translatable="false">BE Stats</string>
     <string name="pref_camera2_stats_visualizer_entry_hist_stats" translatable="false">Hist Stats</string>
-    <string name="pref_camera2_stats_visualizer_entry_value_disable" translatable="false">0</string>
-    <string name="pref_camera2_stats_visualizer_entry_value_enable_bg" translatable="false">1</string>
-    <string name="pref_camera2_stats_visualizer_entry_value_enable_be" translatable="false">2</string>
-    <string name="pref_camera2_stats_visualizer_entry_value_enable_hist" translatable="false">3</string>
+    <string name="pref_camera2_stats_visualizer_entry_awb_info" translatable="false">AWB Info</string>
+    <string name="pref_camera2_stats_visualizer_entry_value_enable_bg" translatable="false">0</string>
+    <string name="pref_camera2_stats_visualizer_entry_value_enable_be" translatable="false">1</string>
+    <string name="pref_camera2_stats_visualizer_entry_value_enable_hist" translatable="false">2</string>
+    <string name="pref_camera2_stats_visualizer_entry_value_enable_awb" translatable="false">3</string>
+    <string name="stats_visualizer_bg_label">BG GraphView</string>
+    <string name="stats_visualizer_be_label">BE GraphView</string>
 
     <string name="pref_camera2_capture_mfnr_title" translatable="true">Capture MFNR</string>
     <string name="pref_camera2_capture_mfnr_default" translatable="false">0</string>
diff --git a/res/xml/setting_menu_preferences.xml b/res/xml/setting_menu_preferences.xml
index 9daaf3178..c8d433a4b 100755
--- a/res/xml/setting_menu_preferences.xml
+++ b/res/xml/setting_menu_preferences.xml
@@ -465,14 +465,14 @@
             android:layout="@layout/preference"
             android:summary="%s"/>
 
-        <ListPreference
+        <MultiSelectListPreference
             android:key="pref_camera2_stats_visualizer_key"
-            android:defaultValue="@string/pref_camera2_stats_visualizer_default"
+            android:defaultValue="@array/pref_camera2_stats_visualizer_default"
             android:title="@string/pref_camera2_stats_visualizer_title"
             android:entries="@array/pref_camera2_stats_visualizer_entries"
             android:entryValues="@array/pref_camera2_stats_visualizer_entryvalues"
             android:layout="@layout/preference"
-            android:summary="%s"/>
+            android:summary="Choose stats to display"/>
 
         <ListPreference
             android:key="pref_camera2_capture_mfnr_key"