Add the new ZoomController UI and also the exposure compensation settings.

Fix the bug that some MotionEvent of some actions should always pass to the
component who accept the DOWN event.

Also fix a bug that nine patch image will be drawn incorrectly after rotation.

Change-Id: I8ab36fb6f958c1967afa11eed5f167842b59cada

14 files changed, 5 insertions, 0 deletions

diff --git a/res/drawable-hdpi/zoom_background.9.png b/res/drawable-hdpi/zoom_background.9.png
new file mode 100644
index 0000000..40f6fc0
--- /dev/null
+++ b/res/drawable-hdpi/zoom_background.9.png
diff --git a/res/drawable-hdpi/zoom_finetickmark.png b/res/drawable-hdpi/zoom_finetickmark.png
new file mode 100644
index 0000000..e36841a
--- /dev/null
+++ b/res/drawable-hdpi/zoom_finetickmark.png
diff --git a/res/drawable-hdpi/zoom_shape.png b/res/drawable-hdpi/zoom_shape.png
deleted file mode 100644
index c12ce6b..0000000
--- a/res/drawable-hdpi/zoom_shape.png
+++ /dev/null
diff --git a/res/drawable-hdpi/zoom_tickmark.png b/res/drawable-hdpi/zoom_tickmark.png
new file mode 100644
index 0000000..2c6a7be
--- /dev/null
+++ b/res/drawable-hdpi/zoom_tickmark.png
diff --git a/res/drawable-hdpi/zoom_tickmarks.png b/res/drawable-hdpi/zoom_tickmarks.png
deleted file mode 100644
index a4191d7..0000000
--- a/res/drawable-hdpi/zoom_tickmarks.png
+++ /dev/null
diff --git a/res/drawable-mdpi/menu_popup.9.png b/res/drawable-mdpi/menu_popup.9.png
index 3e197a1..a655a03 100644
--- a/res/drawable-mdpi/menu_popup.9.png
+++ b/res/drawable-mdpi/menu_popup.9.png
diff --git a/res/drawable-mdpi/menu_popup_triangle.png b/res/drawable-mdpi/menu_popup_triangle.png
index 4262398..91b6523 100644
--- a/res/drawable-mdpi/menu_popup_triangle.png
+++ b/res/drawable-mdpi/menu_popup_triangle.png
diff --git a/res/drawable-mdpi/zoom_background.9.png b/res/drawable-mdpi/zoom_background.9.png
new file mode 100644
index 0000000..5cae3e5
--- /dev/null
+++ b/res/drawable-mdpi/zoom_background.9.png
diff --git a/res/drawable-mdpi/zoom_finetickmark.png b/res/drawable-mdpi/zoom_finetickmark.png
new file mode 100644
index 0000000..1b70845
--- /dev/null
+++ b/res/drawable-mdpi/zoom_finetickmark.png
diff --git a/res/drawable-mdpi/zoom_shape.png b/res/drawable-mdpi/zoom_shape.png
deleted file mode 100644
index c3155f7..0000000
--- a/res/drawable-mdpi/zoom_shape.png
+++ /dev/null
diff --git a/res/drawable-mdpi/zoom_tickmark.png b/res/drawable-mdpi/zoom_tickmark.png
new file mode 100644
index 0000000..1b70845
--- /dev/null
+++ b/res/drawable-mdpi/zoom_tickmark.png
diff --git a/res/drawable-mdpi/zoom_tickmarks.png b/res/drawable-mdpi/zoom_tickmarks.png
deleted file mode 100644
index 32f207e..0000000
--- a/res/drawable-mdpi/zoom_tickmarks.png
+++ /dev/null
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1c14243..59b7ea3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -287,6 +287,7 @@
 
     <!-- Exposure settings in preference -->
     <string name="pref_exposure_title">Exposure</string>
+    <string name="pref_exposure_default" translatable="false">0</string>
 
     <!-- Framing grid settings in preference -->
     <string name="pref_framing_grid">Framing grid</string>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 37fc9ff..8b5b089 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -27,6 +27,10 @@
                 camera:entries="@array/pref_camera_flashmode_entries"
                 camera:entryValues="@array/pref_camera_flashmode_entryvalues" />
         <ListPreference
+                camera:key="pref_camera_exposure_key"
+                camera:defaultValue="@string/pref_exposure_default"
+                camera:title="@string/pref_exposure_title" />
+        <ListPreference
                 camera:key="pref_camera_scenemode_key"
                 camera:defaultValue="@string/pref_camera_scenemode_default"
                 camera:title="@string/pref_camera_scenemode_title"