diff options
author | Owen Lin <owenlin@google.com> | 2010-01-28 16:10:19 -0800 |
---|---|---|
committer | Owen Lin <owenlin@google.com> | 2010-02-26 20:26:48 +0800 |
commit | 4de149ceb47f2c251f646419907424bfb67d2b64 (patch) | |
tree | 6f48682fe065902039bad89d1f3ca90720eca819 /res/values | |
parent | 02627adfa3d240d817e34af69be8d07e9c66c136 (diff) | |
download | LegacyCamera-4de149ceb47f2c251f646419907424bfb67d2b64.zip LegacyCamera-4de149ceb47f2c251f646419907424bfb67d2b64.tar.gz LegacyCamera-4de149ceb47f2c251f646419907424bfb67d2b64.tar.bz2 |
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
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/arrays.xml | 45 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/colors.xml | 2 |
3 files changed, 31 insertions, 17 deletions
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> |