The first runnable version of the new UI.

Implement the new UI with OpenGL (GLSurfaceView).

Known issues:

  * Texture are never freed from GL
  * Do not consider the density of screen. Currently, the dimensions in mdpi
    devices are wrong.
  * It won't work on Sapphire, bug fired: Bug: 2473605
  * The action UP event may pass a wrong target. (It should pass to the same
    target who recive the DOWN action.
  * Animation is not smooth enough.
  * Should not allocate objects into heap during rendering path.
  * The scrollbar in GLListView doesn't match the design
  * We should calculate our own orientation instead of using the system one.
  * Regression: "restore to default settings" is removed

Change-Id: I93fa45831aa87787dd5ee9e43e270a9d786c5a2a

88 files changed, 40 insertions, 60 deletions

diff --git a/res/drawable-hdpi/ic_menuselect_flash_auto.png b/res/drawable-hdpi/ic_menuselect_flash_auto.png
new file mode 100644
index 0000000..e229c35
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_flash_auto.png
diff --git a/res/drawable-hdpi/ic_menuselect_flash_off.png b/res/drawable-hdpi/ic_menuselect_flash_off.png
new file mode 100644
index 0000000..cb00600
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_flash_off.png
diff --git a/res/drawable-hdpi/ic_menuselect_flash_on.png b/res/drawable-hdpi/ic_menuselect_flash_on.png
new file mode 100644
index 0000000..710e9b7
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_flash_on.png
diff --git a/res/drawable-hdpi/ic_menuselect_focus_auto.png b/res/drawable-hdpi/ic_menuselect_focus_auto.png
new file mode 100644
index 0000000..b99e9f5
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_focus_auto.png
diff --git a/res/drawable-hdpi/ic_menuselect_focus_infinity.png b/res/drawable-hdpi/ic_menuselect_focus_infinity.png
new file mode 100644
index 0000000..5136816
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_focus_infinity.png
diff --git a/res/drawable-hdpi/ic_menuselect_focus_macro.png b/res/drawable-hdpi/ic_menuselect_focus_macro.png
new file mode 100644
index 0000000..adbc25a
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_focus_macro.png
diff --git a/res/drawable-hdpi/ic_menuselect_gps_off.png b/res/drawable-hdpi/ic_menuselect_gps_off.png
new file mode 100644
index 0000000..a7af034
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_gps_off.png
diff --git a/res/drawable-hdpi/ic_menuselect_gps_on.png b/res/drawable-hdpi/ic_menuselect_gps_on.png
new file mode 100644
index 0000000..39d2c38
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_gps_on.png
diff --git a/res/drawable-hdpi/ic_menuselect_off.png b/res/drawable-hdpi/ic_menuselect_off.png
new file mode 100644
index 0000000..b883c8f
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_off.png
diff --git a/res/drawable-hdpi/ic_menuselect_on.png b/res/drawable-hdpi/ic_menuselect_on.png
new file mode 100644
index 0000000..24f5edf
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_on.png
diff --git a/res/drawable-hdpi/ic_menuselect_settings.png b/res/drawable-hdpi/ic_menuselect_settings.png
new file mode 100644
index 0000000..8f2d768
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_settings.png
diff --git a/res/drawable-hdpi/ic_menuselect_wb_auto.png b/res/drawable-hdpi/ic_menuselect_wb_auto.png
new file mode 100644
index 0000000..3b30e36
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_wb_auto.png
diff --git a/res/drawable-hdpi/ic_menuselect_wb_cloudy.png b/res/drawable-hdpi/ic_menuselect_wb_cloudy.png
new file mode 100644
index 0000000..ccd7948
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_wb_cloudy.png
diff --git a/res/drawable-hdpi/ic_menuselect_wb_daylight.png b/res/drawable-hdpi/ic_menuselect_wb_daylight.png
new file mode 100644
index 0000000..815280b
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_wb_daylight.png
diff --git a/res/drawable-hdpi/ic_menuselect_wb_fluorescent.png b/res/drawable-hdpi/ic_menuselect_wb_fluorescent.png
new file mode 100644
index 0000000..886af77
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_wb_fluorescent.png
diff --git a/res/drawable-hdpi/ic_menuselect_wb_incandescent.png b/res/drawable-hdpi/ic_menuselect_wb_incandescent.png
new file mode 100644
index 0000000..0b95bec
--- /dev/null
+++ b/res/drawable-hdpi/ic_menuselect_wb_incandescent.png
diff --git a/res/drawable-hdpi/ic_viewfinder_flash_auto.png b/res/drawable-hdpi/ic_viewfinder_flash_auto.png
index 27968e7..0bf7495 100755..100644
--- a/res/drawable-hdpi/ic_viewfinder_flash_auto.png
+++ b/res/drawable-hdpi/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-hdpi/ic_viewfinder_flash_off.png b/res/drawable-hdpi/ic_viewfinder_flash_off.png
index 4a8bb95..afcfbad 100644
--- a/res/drawable-hdpi/ic_viewfinder_flash_off.png
+++ b/res/drawable-hdpi/ic_viewfinder_flash_off.png
diff --git a/res/drawable-hdpi/ic_viewfinder_flash_on.png b/res/drawable-hdpi/ic_viewfinder_flash_on.png
index 71ee867..827c98f 100755..100644
--- a/res/drawable-hdpi/ic_viewfinder_flash_on.png
+++ b/res/drawable-hdpi/ic_viewfinder_flash_on.png
diff --git a/res/drawable-hdpi/ic_viewfinder_focus_auto.png b/res/drawable-hdpi/ic_viewfinder_focus_auto.png
new file mode 100644
index 0000000..0a669cb
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_focus_auto.png
diff --git a/res/drawable-hdpi/ic_viewfinder_focus_infinity.png b/res/drawable-hdpi/ic_viewfinder_focus_infinity.png
index 82112fc..99f8638 100644
--- a/res/drawable-hdpi/ic_viewfinder_focus_infinity.png
+++ b/res/drawable-hdpi/ic_viewfinder_focus_infinity.png
diff --git a/res/drawable-hdpi/ic_viewfinder_focus_macro.png b/res/drawable-hdpi/ic_viewfinder_focus_macro.png
index 85d4a55..adbc25a 100644
--- a/res/drawable-hdpi/ic_viewfinder_focus_macro.png
+++ b/res/drawable-hdpi/ic_viewfinder_focus_macro.png
diff --git a/res/drawable-hdpi/ic_viewfinder_gps_no_signal.png b/res/drawable-hdpi/ic_viewfinder_gps_no_signal.png
new file mode 100644
index 0000000..4a0d016
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_gps_no_signal.png
diff --git a/res/drawable-hdpi/ic_viewfinder_gps_off.png b/res/drawable-hdpi/ic_viewfinder_gps_off.png
new file mode 100644
index 0000000..64636b9
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_gps_off.png
diff --git a/res/drawable-hdpi/ic_viewfinder_gps_on.png b/res/drawable-hdpi/ic_viewfinder_gps_on.png
new file mode 100644
index 0000000..be84985
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_gps_on.png
diff --git a/res/drawable-hdpi/ic_viewfinder_iconbar.9.png b/res/drawable-hdpi/ic_viewfinder_iconbar.9.png
new file mode 100644
index 0000000..0cd4dfe
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_iconbar.9.png
diff --git a/res/drawable-hdpi/ic_viewfinder_iconbar_highlight.9.png b/res/drawable-hdpi/ic_viewfinder_iconbar_highlight.9.png
new file mode 100644
index 0000000..1b08fdf
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_iconbar_highlight.9.png
diff --git a/res/drawable-hdpi/ic_viewfinder_settings.png b/res/drawable-hdpi/ic_viewfinder_settings.png
new file mode 100644
index 0000000..1a53019
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_settings.png
diff --git a/res/drawable-hdpi/ic_viewfinder_wb_auto.png b/res/drawable-hdpi/ic_viewfinder_wb_auto.png
new file mode 100644
index 0000000..cf24be4
--- /dev/null
+++ b/res/drawable-hdpi/ic_viewfinder_wb_auto.png
diff --git a/res/drawable-hdpi/ic_viewfinder_wb_cloudy.png b/res/drawable-hdpi/ic_viewfinder_wb_cloudy.png
index 9766f7b..fd6f2e1 100644
--- a/res/drawable-hdpi/ic_viewfinder_wb_cloudy.png
+++ b/res/drawable-hdpi/ic_viewfinder_wb_cloudy.png
diff --git a/res/drawable-hdpi/ic_viewfinder_wb_daylight.png b/res/drawable-hdpi/ic_viewfinder_wb_daylight.png
index 3ecebe6..e9706c3 100644
--- a/res/drawable-hdpi/ic_viewfinder_wb_daylight.png
+++ b/res/drawable-hdpi/ic_viewfinder_wb_daylight.png
diff --git a/res/drawable-hdpi/ic_viewfinder_wb_fluorescent.png b/res/drawable-hdpi/ic_viewfinder_wb_fluorescent.png
index 889f607..49b9ea6 100644
--- a/res/drawable-hdpi/ic_viewfinder_wb_fluorescent.png
+++ b/res/drawable-hdpi/ic_viewfinder_wb_fluorescent.png
diff --git a/res/drawable-hdpi/ic_viewfinder_wb_incandescent.png b/res/drawable-hdpi/ic_viewfinder_wb_incandescent.png
index 0fce7ce..026bf14 100644
--- a/res/drawable-hdpi/ic_viewfinder_wb_incandescent.png
+++ b/res/drawable-hdpi/ic_viewfinder_wb_incandescent.png
diff --git a/res/drawable-hdpi/menu_popup.9.png b/res/drawable-hdpi/menu_popup.9.png
new file mode 100644
index 0000000..534d3cf
--- /dev/null
+++ b/res/drawable-hdpi/menu_popup.9.png
diff --git a/res/drawable-hdpi/menu_popup_triangle.png b/res/drawable-hdpi/menu_popup_triangle.png
new file mode 100644
index 0000000..59e2f99
--- /dev/null
+++ b/res/drawable-hdpi/menu_popup_triangle.png
diff --git a/res/drawable-hdpi/optionheader_background.9.png b/res/drawable-hdpi/optionheader_background.9.png
new file mode 100644
index 0000000..22991e7
--- /dev/null
+++ b/res/drawable-hdpi/optionheader_background.9.png
diff --git a/res/drawable-hdpi/optionitem_highlight.9.png b/res/drawable-hdpi/optionitem_highlight.9.png
new file mode 100644
index 0000000..3a17a86
--- /dev/null
+++ b/res/drawable-hdpi/optionitem_highlight.9.png
diff --git a/res/drawable-hdpi/scrollbar_handle_vertical.9.png b/res/drawable-hdpi/scrollbar_handle_vertical.9.png
new file mode 100644
index 0000000..3ec0791
--- /dev/null
+++ b/res/drawable-hdpi/scrollbar_handle_vertical.9.png
diff --git a/res/drawable-hdpi/zoom_shape.png b/res/drawable-hdpi/zoom_shape.png
new file mode 100644
index 0000000..c12ce6b
--- /dev/null
+++ b/res/drawable-hdpi/zoom_shape.png
diff --git a/res/drawable-hdpi/zoom_slider.png b/res/drawable-hdpi/zoom_slider.png
new file mode 100644
index 0000000..6fcaecf
--- /dev/null
+++ b/res/drawable-hdpi/zoom_slider.png
diff --git a/res/drawable-hdpi/zoom_tickmarks.png b/res/drawable-hdpi/zoom_tickmarks.png
new file mode 100644
index 0000000..a4191d7
--- /dev/null
+++ b/res/drawable-hdpi/zoom_tickmarks.png
diff --git a/res/drawable-mdpi/ic_menuselect_flash_auto.png b/res/drawable-mdpi/ic_menuselect_flash_auto.png
new file mode 100644
index 0000000..39e1eed
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_flash_auto.png
diff --git a/res/drawable-mdpi/ic_menuselect_flash_off.png b/res/drawable-mdpi/ic_menuselect_flash_off.png
new file mode 100644
index 0000000..44b6e95
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_flash_off.png
diff --git a/res/drawable-mdpi/ic_menuselect_flash_on.png b/res/drawable-mdpi/ic_menuselect_flash_on.png
new file mode 100644
index 0000000..bb1343a
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_flash_on.png
diff --git a/res/drawable-mdpi/ic_menuselect_focus_auto.png b/res/drawable-mdpi/ic_menuselect_focus_auto.png
new file mode 100644
index 0000000..2eb28da
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_focus_auto.png
diff --git a/res/drawable-mdpi/ic_menuselect_focus_infinity.png b/res/drawable-mdpi/ic_menuselect_focus_infinity.png
new file mode 100644
index 0000000..c5f902e
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_focus_infinity.png
diff --git a/res/drawable-mdpi/ic_menuselect_focus_macro.png b/res/drawable-mdpi/ic_menuselect_focus_macro.png
new file mode 100644
index 0000000..dd3ecb3
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_focus_macro.png
diff --git a/res/drawable-mdpi/ic_menuselect_gps_off.png b/res/drawable-mdpi/ic_menuselect_gps_off.png
new file mode 100644
index 0000000..6f36907
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_gps_off.png
diff --git a/res/drawable-mdpi/ic_menuselect_gps_on.png b/res/drawable-mdpi/ic_menuselect_gps_on.png
new file mode 100644
index 0000000..19d4c85
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_gps_on.png
diff --git a/res/drawable-mdpi/ic_menuselect_off.png b/res/drawable-mdpi/ic_menuselect_off.png
new file mode 100644
index 0000000..80baf0e
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_off.png
diff --git a/res/drawable-mdpi/ic_menuselect_on.png b/res/drawable-mdpi/ic_menuselect_on.png
new file mode 100644
index 0000000..1f027fd
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_on.png
diff --git a/res/drawable-mdpi/ic_menuselect_settings.png b/res/drawable-mdpi/ic_menuselect_settings.png
new file mode 100644
index 0000000..495d854
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_settings.png
diff --git a/res/drawable-mdpi/ic_menuselect_wb_auto.png b/res/drawable-mdpi/ic_menuselect_wb_auto.png
new file mode 100644
index 0000000..65f5d18
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_wb_auto.png
diff --git a/res/drawable-mdpi/ic_menuselect_wb_cloudy.png b/res/drawable-mdpi/ic_menuselect_wb_cloudy.png
new file mode 100644
index 0000000..1867c9b
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_wb_cloudy.png
diff --git a/res/drawable-mdpi/ic_menuselect_wb_daylight.png b/res/drawable-mdpi/ic_menuselect_wb_daylight.png
new file mode 100644
index 0000000..d16a930
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_wb_daylight.png
diff --git a/res/drawable-mdpi/ic_menuselect_wb_fluorescent.png b/res/drawable-mdpi/ic_menuselect_wb_fluorescent.png
new file mode 100644
index 0000000..b788229
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_wb_fluorescent.png
diff --git a/res/drawable-mdpi/ic_menuselect_wb_incandescent.png b/res/drawable-mdpi/ic_menuselect_wb_incandescent.png
new file mode 100644
index 0000000..af78583
--- /dev/null
+++ b/res/drawable-mdpi/ic_menuselect_wb_incandescent.png
diff --git a/res/drawable-mdpi/ic_viewfinder_flash_auto.png b/res/drawable-mdpi/ic_viewfinder_flash_auto.png
index 79e36b7..4a86340 100755
--- a/res/drawable-mdpi/ic_viewfinder_flash_auto.png
+++ b/res/drawable-mdpi/ic_viewfinder_flash_auto.png
diff --git a/res/drawable-mdpi/ic_viewfinder_flash_off.png b/res/drawable-mdpi/ic_viewfinder_flash_off.png
index d076636..830fb23 100644
--- a/res/drawable-mdpi/ic_viewfinder_flash_off.png
+++ b/res/drawable-mdpi/ic_viewfinder_flash_off.png
diff --git a/res/drawable-mdpi/ic_viewfinder_flash_on.png b/res/drawable-mdpi/ic_viewfinder_flash_on.png
index 91dfe24..8f600e5 100755
--- a/res/drawable-mdpi/ic_viewfinder_flash_on.png
+++ b/res/drawable-mdpi/ic_viewfinder_flash_on.png
diff --git a/res/drawable-mdpi/ic_viewfinder_focus_auto.png b/res/drawable-mdpi/ic_viewfinder_focus_auto.png
new file mode 100644
index 0000000..076b434
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_focus_auto.png
diff --git a/res/drawable-mdpi/ic_viewfinder_focus_infinity.png b/res/drawable-mdpi/ic_viewfinder_focus_infinity.png
index afa0902..7eb90cb 100644
--- a/res/drawable-mdpi/ic_viewfinder_focus_infinity.png
+++ b/res/drawable-mdpi/ic_viewfinder_focus_infinity.png
diff --git a/res/drawable-mdpi/ic_viewfinder_focus_macro.png b/res/drawable-mdpi/ic_viewfinder_focus_macro.png
index e5c560f..dd3ecb3 100644
--- a/res/drawable-mdpi/ic_viewfinder_focus_macro.png
+++ b/res/drawable-mdpi/ic_viewfinder_focus_macro.png
diff --git a/res/drawable-mdpi/ic_viewfinder_gps_no_signal.png b/res/drawable-mdpi/ic_viewfinder_gps_no_signal.png
new file mode 100644
index 0000000..fbdea07
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_gps_no_signal.png
diff --git a/res/drawable-mdpi/ic_viewfinder_gps_off.png b/res/drawable-mdpi/ic_viewfinder_gps_off.png
new file mode 100644
index 0000000..918c914
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_gps_off.png
diff --git a/res/drawable-mdpi/ic_viewfinder_gps_on.png b/res/drawable-mdpi/ic_viewfinder_gps_on.png
new file mode 100644
index 0000000..4bbb47b
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_gps_on.png
diff --git a/res/drawable-mdpi/ic_viewfinder_iconbar.9.png b/res/drawable-mdpi/ic_viewfinder_iconbar.9.png
new file mode 100644
index 0000000..0cd4dfe
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_iconbar.9.png
diff --git a/res/drawable-mdpi/ic_viewfinder_iconbar_highlight.9.png b/res/drawable-mdpi/ic_viewfinder_iconbar_highlight.9.png
new file mode 100644
index 0000000..1b08fdf
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_iconbar_highlight.9.png
diff --git a/res/drawable-mdpi/ic_viewfinder_settings.png b/res/drawable-mdpi/ic_viewfinder_settings.png
new file mode 100644
index 0000000..8687eec
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_settings.png
diff --git a/res/drawable-mdpi/ic_viewfinder_wb_auto.png b/res/drawable-mdpi/ic_viewfinder_wb_auto.png
new file mode 100644
index 0000000..0f18ca5
--- /dev/null
+++ b/res/drawable-mdpi/ic_viewfinder_wb_auto.png
diff --git a/res/drawable-mdpi/ic_viewfinder_wb_cloudy.png b/res/drawable-mdpi/ic_viewfinder_wb_cloudy.png
index 2d02af3..8a45c53 100644
--- a/res/drawable-mdpi/ic_viewfinder_wb_cloudy.png
+++ b/res/drawable-mdpi/ic_viewfinder_wb_cloudy.png
diff --git a/res/drawable-mdpi/ic_viewfinder_wb_daylight.png b/res/drawable-mdpi/ic_viewfinder_wb_daylight.png
index 77e4a6e..35268a0 100644
--- a/res/drawable-mdpi/ic_viewfinder_wb_daylight.png
+++ b/res/drawable-mdpi/ic_viewfinder_wb_daylight.png
diff --git a/res/drawable-mdpi/ic_viewfinder_wb_fluorescent.png b/res/drawable-mdpi/ic_viewfinder_wb_fluorescent.png
index 3a5f6ef..acfd9a7 100644
--- a/res/drawable-mdpi/ic_viewfinder_wb_fluorescent.png
+++ b/res/drawable-mdpi/ic_viewfinder_wb_fluorescent.png
diff --git a/res/drawable-mdpi/ic_viewfinder_wb_incandescent.png b/res/drawable-mdpi/ic_viewfinder_wb_incandescent.png
index cddb4a1..fe5a60f 100644
--- a/res/drawable-mdpi/ic_viewfinder_wb_incandescent.png
+++ b/res/drawable-mdpi/ic_viewfinder_wb_incandescent.png
diff --git a/res/drawable-mdpi/menu_popup.9.png b/res/drawable-mdpi/menu_popup.9.png
new file mode 100644
index 0000000..534d3cf
--- /dev/null
+++ 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
new file mode 100644
index 0000000..59e2f99
--- /dev/null
+++ b/res/drawable-mdpi/menu_popup_triangle.png
diff --git a/res/drawable-mdpi/on_screen_hint_frame.9.png b/res/drawable-mdpi/on_screen_hint_frame.9.png
index 08c4f86..8b78d67 100644
--- a/res/drawable-mdpi/on_screen_hint_frame.9.png
+++ b/res/drawable-mdpi/on_screen_hint_frame.9.png
diff --git a/res/drawable-mdpi/optionheader_background.9.png b/res/drawable-mdpi/optionheader_background.9.png
new file mode 100644
index 0000000..22991e7
--- /dev/null
+++ b/res/drawable-mdpi/optionheader_background.9.png
diff --git a/res/drawable-mdpi/optionitem_highlight.9.png b/res/drawable-mdpi/optionitem_highlight.9.png
new file mode 100644
index 0000000..3a17a86
--- /dev/null
+++ b/res/drawable-mdpi/optionitem_highlight.9.png
diff --git a/res/drawable-mdpi/scrollbar_handle_vertical.9.png b/res/drawable-mdpi/scrollbar_handle_vertical.9.png
new file mode 100644
index 0000000..3ec0791
--- /dev/null
+++ b/res/drawable-mdpi/scrollbar_handle_vertical.9.png
diff --git a/res/drawable-mdpi/zoom_shape.png b/res/drawable-mdpi/zoom_shape.png
new file mode 100644
index 0000000..c3155f7
--- /dev/null
+++ b/res/drawable-mdpi/zoom_shape.png
diff --git a/res/drawable-mdpi/zoom_slider.png b/res/drawable-mdpi/zoom_slider.png
new file mode 100644
index 0000000..c9f7c5b
--- /dev/null
+++ b/res/drawable-mdpi/zoom_slider.png
diff --git a/res/drawable-mdpi/zoom_tickmarks.png b/res/drawable-mdpi/zoom_tickmarks.png
new file mode 100644
index 0000000..32f207e
--- /dev/null
+++ b/res/drawable-mdpi/zoom_tickmarks.png
diff --git a/res/layout/camera.xml b/res/layout/camera.xml
index d1c1336..1a451f4 100644
--- a/res/layout/camera.xml
+++ b/res/layout/camera.xml
@@ -25,10 +25,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1">
-        <ImageView android:id="@+id/btn_gripper"
-                android:background="@drawable/btn_gripper"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
         <FrameLayout android:id="@+id/frame"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -40,43 +36,10 @@
                     android:id="@+id/focus_rectangle"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"/>
-            <LinearLayout android:id="@+id/indicator_bar"
-                    android:orientation="vertical"
-                    android:visibility="visible"
-                    android:gravity="center"
-                    android:layout_gravity="left|top"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginLeft="10dp"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-                <!-- Thsee icons should be in the same order as the
-                        on-screen menu items -->
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
-                        android:id="@+id/gps_icon"
-                        camera:modes="@array/gps_modes"
-                        camera:icons="@array/gps_icons"/>
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
-                        android:id="@+id/flash_icon"
-                        camera:modes="@array/flash_modes"
-                        camera:icons="@array/flash_icons"/>
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
-                        android:id="@+id/scenemode_icon"
-                        camera:modes="@array/scenemode_modes"
-                        camera:icons="@array/scenemode_icons"/>
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
-                        android:id="@+id/whitebalance_icon"
-                        camera:modes="@array/pref_camera_whitebalance_entryvalues"
-                        camera:icons="@array/whitebalance_icons"/>
-                <com.android.camera.IconIndicator
-                        style="@style/IconIndicator"
-                        android:id="@+id/focus_icon"
-                        camera:modes="@array/pref_camera_focusmode_entryvalues"
-                        camera:icons="@array/focusmode_icons"/>
-            </LinearLayout>
+            <com.android.camera.ui.GLRootView
+                    android:id="@+id/settings_ui"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
         </FrameLayout>
     </com.android.camera.PreviewFrameLayout>
 </LinearLayout>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 33768b2..42b80f4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -96,13 +96,13 @@
     </string-array>
 
     <array name="pref_camera_focusmode_icons" translatable="false">
-        <item>@drawable/ic_viewfinder_empty</item>
-        <item>@drawable/ic_viewfinder_focus_infinity</item>
-        <item>@drawable/ic_viewfinder_focus_macro</item>
+        <item>@drawable/ic_menuselect_focus_auto</item>
+        <item>@drawable/ic_menuselect_focus_infinity</item>
+        <item>@drawable/ic_menuselect_focus_macro</item>
     </array>
 
     <array name="focusmode_icons">
-        <item>@drawable/ic_viewfinder_empty</item>
+        <item>@drawable/ic_viewfinder_focus_auto</item>
         <item>@drawable/ic_viewfinder_focus_infinity</item>
         <item>@drawable/ic_viewfinder_focus_macro</item>
     </array>
@@ -121,6 +121,12 @@
     </string-array>
 
     <array name="pref_camera_flashmode_icons">
+        <item>@drawable/ic_menuselect_flash_auto</item>
+        <item>@drawable/ic_menuselect_flash_on</item>
+        <item>@drawable/ic_menuselect_flash_off</item>
+    </array>
+
+    <array name="flashmode_icons">
         <item>@drawable/ic_viewfinder_flash_auto</item>
         <item>@drawable/ic_viewfinder_flash_on</item>
         <item>@drawable/ic_viewfinder_flash_off</item>
@@ -138,8 +144,8 @@
     </string-array>
 
     <array name="pref_camera_video_flashmode_icons">
-        <item>@drawable/ic_viewfinder_flash_on</item>
-        <item>@drawable/ic_viewfinder_flash_off</item>
+        <item>@drawable/ic_menuselect_flash_on</item>
+        <item>@drawable/ic_menuselect_flash_off</item>
     </array>
 
     <string-array name="pref_camera_recordlocation_entryvalues" translatable="false">
@@ -152,6 +158,16 @@
         <item>@string/pref_camera_recordlocation_entry_on</item>
     </array>
 
+    <array name="pref_camera_recordlocation_icons" translatable="false">
+        <item>@drawable/ic_menuselect_gps_off</item>
+        <item>@drawable/ic_menuselect_gps_on</item>
+    </array>
+
+    <array name="recordlocation_icons">
+        <item>@drawable/ic_viewfinder_gps_off</item>
+        <item>@drawable/ic_viewfinder_gps_on</item>
+    </array>
+
     <string-array name="flash_modes" translatable="false">
         <item>auto</item>
         <item>on</item>
@@ -173,11 +189,6 @@
         <item>on</item>
     </string-array>
 
-    <array name="gps_icons">
-        <item>@drawable/ic_viewfinder_empty</item>
-        <item>@drawable/ic_camera_sym_gps</item>
-    </array>
-
     <!-- Camera Preferences White Balance dialog box entries -->
     <string-array name="pref_camera_whitebalance_entries" translatable="false">
         <item>@string/pref_camera_whitebalance_entry_auto</item>
@@ -196,15 +207,15 @@
     </string-array>
 
     <array name="pref_camera_whitebalance_icons">
-        <item>@drawable/ic_viewfinder_empty</item>
-        <item>@drawable/ic_viewfinder_wb_incandescent</item>
-        <item>@drawable/ic_viewfinder_wb_daylight</item>
-        <item>@drawable/ic_viewfinder_wb_fluorescent</item>
-        <item>@drawable/ic_viewfinder_wb_cloudy</item>
+        <item>@drawable/ic_menuselect_wb_auto</item>
+        <item>@drawable/ic_menuselect_wb_incandescent</item>
+        <item>@drawable/ic_menuselect_wb_daylight</item>
+        <item>@drawable/ic_menuselect_wb_fluorescent</item>
+        <item>@drawable/ic_menuselect_wb_cloudy</item>
     </array>
 
     <array name="whitebalance_icons">
-        <item>@drawable/ic_viewfinder_empty</item>
+        <item>@drawable/ic_viewfinder_wb_auto</item>
         <item>@drawable/ic_viewfinder_wb_incandescent</item>
         <item>@drawable/ic_viewfinder_wb_daylight</item>
         <item>@drawable/ic_viewfinder_wb_fluorescent</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7a4f19d..74a6091 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -29,6 +29,7 @@
     </declare-styleable>
     <declare-styleable name="IconListPreference">
         <attr name="icons" />
+        <attr name="largeIcons" format="reference" />
     </declare-styleable>
     <declare-styleable name="EvenlySpacedLayout">
         <attr name="orientation">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7193b7c..a70d319 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,4 +20,6 @@
 <resources>
     <color name="recording_time_elapsed_text">#FFFFFFFF</color>
     <color name="recording_time_remaining_text">#FFFF0033</color>
+    <color name="indicator_pressed">#992B2B2B</color>
+    <color name="indicator_default">#00FFFFFF</color>
 </resources>
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml
index 0eec3ab..7bbab46 100644
--- a/res/xml/camera_preferences.xml
+++ b/res/xml/camera_preferences.xml
@@ -23,6 +23,7 @@
                 camera:defaultValue="@string/pref_camera_flashmode_default"
                 camera:title="@string/pref_camera_flashmode_title"
                 camera:icons="@array/pref_camera_flashmode_icons"
+                camera:largeIcons="@array/flashmode_icons"
                 camera:entries="@array/pref_camera_flashmode_entries"
                 camera:entryValues="@array/pref_camera_flashmode_entryvalues" />
         <ListPreference
@@ -36,6 +37,7 @@
                 camera:defaultValue="@string/pref_camera_whitebalance_default"
                 camera:title="@string/pref_camera_whitebalance_title"
                 camera:icons="@array/pref_camera_whitebalance_icons"
+                camera:largeIcons="@array/whitebalance_icons"
                 camera:entries="@array/pref_camera_whitebalance_entries"
                 camera:entryValues="@array/pref_camera_whitebalance_entryvalues" />
         <ListPreference
@@ -48,6 +50,8 @@
                 camera:key="pref_camera_recordlocation_key"
                 camera:defaultValue="@string/pref_camera_recordlocation_default"
                 camera:title="@string/pref_camera_recordlocation_title"
+                camera:icons="@array/pref_camera_recordlocation_icons"
+                camera:largeIcons="@array/recordlocation_icons"
                 camera:entries="@array/pref_camera_recordlocation_entries"
                 camera:entryValues="@array/pref_camera_recordlocation_entryvalues" />
         <ListPreference
@@ -61,11 +65,10 @@
                 camera:title="@string/pref_camera_jpegquality_title"
                 camera:entries="@array/pref_camera_jpegquality_entries"
                 camera:entryValues="@array/pref_camera_jpegquality_entryvalues" />
-        <IconListPreference
+        <ListPreference
                 camera:key="pref_camera_focusmode_key"
                 camera:defaultValue="@string/pref_camera_focusmode_default"
                 camera:title="@string/pref_camera_focusmode_title"
-                camera:icons="@array/pref_camera_focusmode_icons"
                 camera:entries="@array/pref_camera_focusmode_entries"
                 camera:entryValues="@array/pref_camera_focusmode_entryvalues" />
         <ListPreference