exposure compensation control is back

bug: 13607051
Change-Id: Ib4920ba3f8f3a548651a2d07613ccfdc28ca1d6e

2 files changed, 99 insertions, 37 deletions

diff --git a/res/layout-port/indicators.xml b/res/layout-port/indicators.xml
index 10367b697..68e35fdce 100644
--- a/res/layout-port/indicators.xml
+++ b/res/layout-port/indicators.xml
@@ -26,6 +26,22 @@
       android:background="@drawable/bg_options_indicator"
       android:layout_gravity="bottom|right" >
     <ImageView
+        android:id="@+id/exposure_n2_indicator"
+        style="@style/IndicatorIcon"
+        android:src="@drawable/ic_exposure_n2_indicator" />
+    <ImageView
+        android:id="@+id/exposure_n1_indicator"
+        style="@style/IndicatorIcon"
+        android:src="@drawable/ic_exposure_n1_indicator" />
+    <ImageView
+        android:id="@+id/exposure_p1_indicator"
+        style="@style/IndicatorIcon"
+        android:src="@drawable/ic_exposure_p1_indicator" />
+    <ImageView
+        android:id="@+id/exposure_p2_indicator"
+        style="@style/IndicatorIcon"
+        android:src="@drawable/ic_exposure_p2_indicator" />
+    <ImageView
         android:id="@+id/pano_indicator"
         style="@style/IndicatorIcon" />
     <ImageView
diff --git a/res/layout-port/mode_options_overlay.xml b/res/layout-port/mode_options_overlay.xml
index c622157ae..acc9005bf 100644
--- a/res/layout-port/mode_options_overlay.xml
+++ b/res/layout-port/mode_options_overlay.xml
@@ -29,46 +29,92 @@
         android:layout_gravity="bottom"
         android:visibility="invisible"
         android:background="#00000000" >
-        <com.android.camera.ui.TopRightWeightedLayout
-            android:id="@+id/mode_options_buttons"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:gravity="center"
-            android:layout_gravity="right"
-            android:visibility="visible"
-            android:background="@null"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:alpha="0.0" >
-            <!-- pano image ids and descriptions are added at runtime -->
-            <com.android.camera.MultiToggleImageButton
-                android:id="@+id/pano_orientation_toggle_button"
-                style="@style/ModeOption" />
-            <com.android.camera.MultiToggleImageButton
-                android:id="@+id/grid_lines_toggle_button"
-                style="@style/ModeOption"
-                camera:imageIds="@array/grid_lines_icons"
-                camera:contentDescriptionIds="@array/grid_lines_descriptions" />
-            <com.android.camera.MultiToggleImageButton
-                android:id="@+id/hdr_plus_toggle_button"
-                style="@style/ModeOption"
-                camera:imageIds="@array/pref_camera_hdr_plus_icons"
-                camera:contentDescriptionIds="@array/hdr_plus_descriptions" />
-            <com.android.camera.MultiToggleImageButton
-                android:id="@+id/flash_toggle_button"
-                style="@style/ModeOption"
-                camera:imageIds="@array/camera_flashmode_icons"
-                camera:contentDescriptionIds="@array/camera_flash_descriptions" />
-            <com.android.camera.MultiToggleImageButton
-                android:id="@+id/camera_toggle_button"
-                style="@style/ModeOption"
-                camera:imageIds="@array/camera_id_icons"
-                camera:contentDescriptionIds="@array/camera_id_descriptions" />
-        </com.android.camera.ui.TopRightWeightedLayout>
+            android:layout_height="match_parent" >
+
+            <com.android.camera.ui.TopRightWeightedLayout
+                android:id="@+id/mode_options_exposure"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_gravity="right"
+                android:background="@null"
+                android:visibility="invisible" >
+
+                <ImageButton
+                    android:id="@+id/exposure_n2"
+                    style="@style/ModeOption"
+                    android:background="@null"
+                    android:src="@drawable/ic_exposure_n2" />
+                <ImageButton
+                    android:id="@+id/exposure_n1"
+                    style="@style/ModeOption"
+                    android:background="@null"
+                    android:src="@drawable/ic_exposure_n1" />
+                <ImageButton
+                    android:id="@+id/exposure_0"
+                    style="@style/ModeOption"
+                    android:background="@null"
+                    android:src="@drawable/ic_exposure_0" />
+                <ImageButton
+                    android:id="@+id/exposure_p1"
+                    style="@style/ModeOption"
+                    android:background="@null"
+                    android:src="@drawable/ic_exposure_p1" />
+                <ImageButton
+                    android:id="@+id/exposure_p2"
+                    style="@style/ModeOption"
+                    android:background="@null"
+                    android:src="@drawable/ic_exposure_p2" />
+            </com.android.camera.ui.TopRightWeightedLayout>
+
+            <com.android.camera.ui.TopRightWeightedLayout
+                android:id="@+id/mode_options_buttons"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:layout_gravity="right"
+                android:visibility="visible"
+                android:background="@null"
+                android:clipChildren="false"
+                android:clipToPadding="false"
+                android:alpha="0.0" >
+                <ImageButton
+                    android:id="@+id/exposure_button"
+                    style="@style/ModeOption"
+                    android:background="@null"
+                    android:src="@drawable/ic_exposure" />
+                <!-- pano image ids and descriptions are added at runtime -->
+                <com.android.camera.MultiToggleImageButton
+                    android:id="@+id/pano_orientation_toggle_button"
+                    style="@style/ModeOption" />
+                <com.android.camera.MultiToggleImageButton
+                    android:id="@+id/grid_lines_toggle_button"
+                    style="@style/ModeOption"
+                    camera:imageIds="@array/grid_lines_icons"
+                    camera:contentDescriptionIds="@array/grid_lines_descriptions" />
+                <com.android.camera.MultiToggleImageButton
+                    android:id="@+id/hdr_plus_toggle_button"
+                    style="@style/ModeOption"
+                    camera:imageIds="@array/pref_camera_hdr_plus_icons"
+                    camera:contentDescriptionIds="@array/hdr_plus_descriptions" />
+                <com.android.camera.MultiToggleImageButton
+                    android:id="@+id/flash_toggle_button"
+                    style="@style/ModeOption"
+                    camera:imageIds="@array/camera_flashmode_icons"
+                    camera:contentDescriptionIds="@array/camera_flash_descriptions" />
+                <com.android.camera.MultiToggleImageButton
+                    android:id="@+id/camera_toggle_button"
+                    style="@style/ModeOption"
+                    camera:imageIds="@array/camera_id_icons"
+                    camera:contentDescriptionIds="@array/camera_id_descriptions" />
+            </com.android.camera.ui.TopRightWeightedLayout>
+        </FrameLayout>
     </com.android.camera.widget.ModeOptions>
 
     <include layout="@layout/indicators" />
 
 </com.android.camera.widget.ModeOptionsOverlay>
-