diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2014-06-16 17:42:26 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-17 17:49:35 -0800 |
commit | 41d18fed018678492323150c661f2b9f6c8931a8 (patch) | |
tree | 5154564878f6b61b1edc68ee8241cf0166ca210e /res/values | |
parent | 0231aab003276d2142fe745e50d6eb44e3f11c9c (diff) | |
download | android_packages_apps_Snap-41d18fed018678492323150c661f2b9f6c8931a8.tar.gz android_packages_apps_Snap-41d18fed018678492323150c661f2b9f6c8931a8.tar.bz2 android_packages_apps_Snap-41d18fed018678492323150c661f2b9f6c8931a8.zip |
SnapdragonCamera: Modify SnapdragonCamera UI
Modified SnapdragonCamera setting menus with new icons
Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/arrays.xml | 58 | ||||
-rw-r--r-- | res/values/attrs.xml | 1 | ||||
-rw-r--r-- | res/values/colors.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 6 | ||||
-rw-r--r-- | res/values/qcomarrays.xml | 18 | ||||
-rw-r--r-- | res/values/styles.xml | 35 |
6 files changed, 90 insertions, 31 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 71b4afccd..4ec1949da 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -403,27 +403,33 @@ <!-- Camera Preferences Scene Mode dialog box entries --> <string-array name="pref_camera_scenemode_entries" translatable="false"> - <item>@string/pref_camera_scenemode_entry_action</item> - <item>@string/pref_camera_scenemode_entry_night</item> <item>@string/pref_camera_scenemode_entry_auto</item> - <item>@string/pref_camera_scenemode_entry_sunset</item> - <item>@string/pref_camera_scenemode_entry_party</item> - <item>@string/pref_camera_scenemode_entry_asd</item> - <item>@string/pref_camera_scenemode_entry_portrait</item> + <!-- <item>@string/pref_camera_scenemode_entry_portrait</item> --> <item>@string/pref_camera_scenemode_entry_landscape</item> - <item>@string/pref_camera_scenemode_entry_night_portrait</item> - <item>@string/pref_camera_scenemode_entry_theatre</item> - <item>@string/pref_camera_scenemode_entry_beach</item> - <item>@string/pref_camera_scenemode_entry_snow</item> - <item>@string/pref_camera_scenemode_entry_steadyphoto</item> - <item>@string/pref_camera_scenemode_entry_fireworks</item> <item>@string/pref_camera_scenemode_entry_sports</item> - <item>@string/pref_camera_scenemode_entry_candlelight</item> - <item>@string/pref_camera_scenemode_entry_backlight</item> <item>@string/pref_camera_scenemode_entry_flowers</item> - <item>@string/pref_camera_scenemode_entry_ar</item> + <item>@string/pref_camera_scenemode_entry_backlight</item> + <item>@string/pref_camera_scenemode_entry_candlelight</item> + <item>@string/pref_camera_scenemode_entry_sunset</item> + <item>@string/pref_camera_scenemode_entry_night</item> + <item>@string/pref_camera_scenemode_entry_beach</item> + <item>@string/pref_camera_scenemode_entry_snow</item> </string-array> + <array name="scenemode_thumbnails" translatable="false"> + <item>@drawable/ic_scene_mode_auto</item> + <!-- <item>@drawable/ic_scene_mode_portrait</item> --> + <item>@drawable/ic_scene_mode_landscape</item> + <item>@drawable/ic_scene_mode_sports</item> + <item>@drawable/ic_scene_mode_flower</item> + <item>@drawable/ic_scene_mode_backlight</item> + <item>@drawable/ic_scene_mode_candlelight</item> + <item>@drawable/ic_scene_mode_sunset</item> + <item>@drawable/ic_scene_mode_night</item> + <item>@drawable/ic_scene_mode_beach</item> + <item>@drawable/ic_scene_mode_snow</item> + </array> + <string-array name="pref_camera_scenemode_labels"> <item>@string/pref_camera_scenemode_label_action</item> <item>@string/pref_camera_scenemode_label_night</item> @@ -441,25 +447,17 @@ </array> <string-array name="pref_camera_scenemode_entryvalues" translatable="false"> - <item>action</item> - <item>night</item> <item>auto</item> - <item>sunset</item> - <item>party</item> - <item>asd</item> - <item>portrait</item> + <!-- <item>portrait</item> --> <item>landscape</item> - <item>night-portrait</item> - <item>theatre</item> - <item>beach</item> - <item>snow</item> - <item>steadyphoto</item> - <item>fireworks</item> <item>sports</item> - <item>candlelight</item> - <item>backlight</item> <item>flowers</item> - <item>AR</item> + <item>backlight</item> + <item>candlelight</item> + <item>sunset</item> + <item>night</item> + <item>beach</item> + <item>snow</item> </string-array> <array name="camera_id_entries" translatable="false"> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 5a00a695a..b9c04f290 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -40,6 +40,7 @@ <attr name="singleIcon" format="reference" /> <attr name="icons" /> <attr name="largeIcons" format="reference" /> + <attr name="thumbnails" format="reference" /> <attr name="images" format="reference" /> </declare-styleable> diff --git a/res/values/colors.xml b/res/values/colors.xml index 4fe918094..cd7f5977d 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -70,4 +70,7 @@ <color name="face_detect_fail">#80d05060</color> <color name="gray">#FFAAAAAA</color> + <color name="setting_color">#ff10aadc</color> + <color name="setting_color_light">#ffade9fd</color> + <color name="list_divider_color">#d8ababab</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e2d4246df..f9a7ff047 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -92,9 +92,13 @@ <dimen name="focus_inner_stroke">2dp</dimen> <dimen name="zoom_ring_min">48dp</dimen> <dimen name="switcher_size">72dp</dimen> + <dimen name="menu_size">52dp</dimen> + <dimen name="menu_outer_size">80dp</dimen> + <dimen name="toggle_size">30dp</dimen> + <dimen name="toggle_outer_size">60dp</dimen> <dimen name="face_circle_stroke">2dip</dimen> <dimen name="zoom_font_size">14pt</dimen> - <dimen name="shutter_offset">-22dp</dimen> + <dimen name="shutter_offset">5dp</dimen> <dimen name="size_thumbnail">200dip</dimen> <dimen name="size_preview">400dip</dimen> <dimen name="navigation_bar_height">48dip</dimen> diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml index 0b1037e72..abe13a117 100644 --- a/res/values/qcomarrays.xml +++ b/res/values/qcomarrays.xml @@ -222,6 +222,24 @@ <item>@string/pref_camera_coloreffect_entry_greentint</item> </string-array> + <array name="coloreffect_thumbnails" translatable="false"> + <item>@drawable/thumb_filter_nofilter</item> + <item>@drawable/thumb_filter_monochrome</item> + <item>@drawable/thumb_filter_sepia</item> + <item>@drawable/thumb_filter_negative</item> + <item>@drawable/thumb_filter_solarize</item> + <item>@drawable/thumb_filter_posterize</item> + <item>@drawable/thumb_filter_aqua</item> + <item>@drawable/thumb_filter_emboss</item> + <item>@drawable/thumb_filter_sketch</item> + <item>@drawable/thumb_filter_neon</item> + <item>0</item> + <item>0</item> + <item>0</item> + <item>0</item> + <item>0</item> + </array> + <string-array name="pref_camera_coloreffect_entryvalues" translatable="false"> <item>none</item> <item>mono</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index ad32b0634..682337fe9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -80,6 +80,14 @@ <item name="android:layout_height">wrap_content</item> <item name="android:listSelector">@drawable/bg_pressed</item> </style> + <style name="CustomSettingItemTitle"> + <item name="android:textSize">14sp</item> + <item name="android:gravity">left|center_vertical</item> + <item name="android:singleLine">true</item> + <item name="android:layout_weight">1</item> + <item name="android:layout_width">0dp</item> + <item name="android:layout_height">match_parent</item> + </style> <style name="SettingItemTitle"> <item name="android:textSize">@dimen/setting_item_text_size</item> <item name="android:gravity">left|center_vertical</item> @@ -107,6 +115,15 @@ <item name="android:paddingRight">@dimen/setting_item_list_margin</item> <item name="android:background">@drawable/setting_picker</item> </style> + <style name="CustomSettingRow"> + <item name="android:gravity">center_vertical</item> + <item name="android:orientation">horizontal</item> + <item name="android:layout_width">3000dp</item> + <item name="android:layout_height">@dimen/setting_row_height</item> + <item name="android:paddingLeft">10dp</item> + <item name="android:paddingRight">@dimen/setting_item_list_margin</item> + <item name="android:background">@drawable/setting_picker</item> + </style> <style name="OnViewfinderLabel"> <item name="android:gravity">center</item> <item name="android:layout_width">wrap_content</item> @@ -230,6 +247,24 @@ <item name="android:layout_height">@dimen/switcher_size</item> <item name="android:background">@drawable/bg_pressed_exit_fading</item> </style> + <style name="MenuButton"> + <item name="android:layout_width">@dimen/menu_size</item> + <item name="android:layout_height">@dimen/menu_size</item> + </style> + <style name="MenuButtonOuter"> + <item name="android:layout_width">@dimen/menu_outer_size</item> + <item name="android:layout_height">@dimen/menu_outer_size</item> + <item name="android:background">@drawable/bg_pressed_exit_fading</item> + </style> + <style name="ToggleButton"> + <item name="android:layout_width">@dimen/toggle_size</item> + <item name="android:layout_height">@dimen/toggle_size</item> + </style> + <style name="ToggleButtonOuter"> + <item name="android:layout_width">@dimen/toggle_outer_size</item> + <item name="android:layout_height">@dimen/toggle_outer_size</item> + <item name="android:background">@drawable/bg_pressed_exit_fading</item> + </style> <style name="MenuIndicator"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> |