From 41d18fed018678492323150c661f2b9f6c8931a8 Mon Sep 17 00:00:00 2001 From: Byunghun Jeon Date: Mon, 16 Jun 2014 17:42:26 -0700 Subject: SnapdragonCamera: Modify SnapdragonCamera UI Modified SnapdragonCamera setting menus with new icons Change-Id: I726296dfb100ac81ad6f1cd84420ae27c0ae1201 --- res/drawable/bg_pressed_exit_fading.xml | 1 + res/drawable/btn_new_shutter.xml | 4 +- res/drawable/btn_new_shutter_video.xml | 4 +- res/drawable/list_border.xml | 38 + res/drawable/list_selector.xml | 34 + res/drawable/scene_mode_view_border.xml | 36 + res/drawable/scene_mode_view_border_selected.xml | 36 + res/drawable/shutter_button_anim.xml | 73 ++ res/drawable/thumb_filter_aqua.png | Bin 0 -> 30363 bytes res/drawable/thumb_filter_emboss.png | Bin 0 -> 45718 bytes res/drawable/thumb_filter_monochrome.png | Bin 0 -> 17269 bytes res/drawable/thumb_filter_negative.png | Bin 0 -> 37390 bytes res/drawable/thumb_filter_neon.png | Bin 0 -> 45101 bytes res/drawable/thumb_filter_nofilter.png | Bin 0 -> 36334 bytes res/drawable/thumb_filter_posterize.png | Bin 0 -> 42378 bytes res/drawable/thumb_filter_sepia.png | Bin 0 -> 27422 bytes res/drawable/thumb_filter_sketch.png | Bin 0 -> 43786 bytes res/drawable/thumb_filter_solarize.png | Bin 0 -> 36841 bytes res/layout-land/camera_controls.xml | 146 ++- res/layout-port/camera_controls.xml | 146 ++- res/layout/filter_mode_view.xml | 57 ++ res/layout/horiz_grid.xml | 42 + res/layout/list_menu.xml | 36 + res/layout/list_menu_item.xml | 68 ++ res/layout/list_sub_menu.xml | 39 + res/layout/list_sub_menu_item.xml | 52 + res/layout/photo_module.xml | 1 + res/layout/scene_mode_view.xml | 67 ++ res/layout/vertical_grid.xml | 42 + res/values/arrays.xml | 58 +- res/values/attrs.xml | 1 + res/values/colors.xml | 3 + res/values/dimens.xml | 6 +- res/values/qcomarrays.xml | 18 + res/values/styles.xml | 35 + res/xml/camera_preferences.xml | 41 +- res/xml/video_preferences.xml | 18 +- src/com/android/camera/CameraActivity.java | 46 +- src/com/android/camera/CameraSettings.java | 2 +- .../android/camera/CountDownTimerPreference.java | 2 +- src/com/android/camera/CustomPhotoMenu.java | 1006 ++++++++++++++++++++ src/com/android/camera/CustomVideoMenu.java | 683 +++++++++++++ src/com/android/camera/IconListPreference.java | 14 + src/com/android/camera/MenuController.java | 134 +++ src/com/android/camera/OnScreenIndicators.java | 8 +- src/com/android/camera/PhotoModule.java | 4 + src/com/android/camera/PhotoUI.java | 187 +++- src/com/android/camera/PreviewGestures.java | 87 ++ src/com/android/camera/VideoModule.java | 7 +- src/com/android/camera/VideoUI.java | 190 +++- .../android/camera/WideAnglePanoramaModule.java | 4 + src/com/android/camera/WideAnglePanoramaUI.java | 10 +- src/com/android/camera/ui/CameraControls.java | 611 ++++++++++-- src/com/android/camera/ui/FilmStripView.java | 110 ++- src/com/android/camera/ui/ListMenu.java | 221 +++++ src/com/android/camera/ui/ListMenuItem.java | 162 ++++ src/com/android/camera/ui/ListSubMenu.java | 157 +++ src/com/android/camera/ui/ModuleSwitcher.java | 25 + src/com/android/camera/ui/PieRenderer.java | 3 + 59 files changed, 4488 insertions(+), 287 deletions(-) create mode 100644 res/drawable/list_border.xml create mode 100644 res/drawable/list_selector.xml create mode 100644 res/drawable/scene_mode_view_border.xml create mode 100644 res/drawable/scene_mode_view_border_selected.xml create mode 100644 res/drawable/shutter_button_anim.xml create mode 100644 res/drawable/thumb_filter_aqua.png create mode 100644 res/drawable/thumb_filter_emboss.png create mode 100644 res/drawable/thumb_filter_monochrome.png create mode 100644 res/drawable/thumb_filter_negative.png create mode 100644 res/drawable/thumb_filter_neon.png create mode 100644 res/drawable/thumb_filter_nofilter.png create mode 100644 res/drawable/thumb_filter_posterize.png create mode 100644 res/drawable/thumb_filter_sepia.png create mode 100644 res/drawable/thumb_filter_sketch.png create mode 100644 res/drawable/thumb_filter_solarize.png create mode 100644 res/layout/filter_mode_view.xml create mode 100644 res/layout/horiz_grid.xml create mode 100644 res/layout/list_menu.xml create mode 100644 res/layout/list_menu_item.xml create mode 100644 res/layout/list_sub_menu.xml create mode 100644 res/layout/list_sub_menu_item.xml create mode 100644 res/layout/scene_mode_view.xml create mode 100644 res/layout/vertical_grid.xml create mode 100644 src/com/android/camera/CustomPhotoMenu.java create mode 100644 src/com/android/camera/CustomVideoMenu.java create mode 100644 src/com/android/camera/MenuController.java mode change 100755 => 100644 src/com/android/camera/VideoModule.java create mode 100644 src/com/android/camera/ui/ListMenu.java create mode 100644 src/com/android/camera/ui/ListMenuItem.java create mode 100644 src/com/android/camera/ui/ListSubMenu.java diff --git a/res/drawable/bg_pressed_exit_fading.xml b/res/drawable/bg_pressed_exit_fading.xml index d317e8b5a..4661467bd 100644 --- a/res/drawable/bg_pressed_exit_fading.xml +++ b/res/drawable/bg_pressed_exit_fading.xml @@ -16,6 +16,7 @@ + diff --git a/res/drawable/btn_new_shutter.xml b/res/drawable/btn_new_shutter.xml index 7a3eb81a9..5b9d6f724 100644 --- a/res/drawable/btn_new_shutter.xml +++ b/res/drawable/btn_new_shutter.xml @@ -15,7 +15,7 @@ --> - - + + diff --git a/res/drawable/btn_new_shutter_video.xml b/res/drawable/btn_new_shutter_video.xml index e87b456f6..518b362d8 100644 --- a/res/drawable/btn_new_shutter_video.xml +++ b/res/drawable/btn_new_shutter_video.xml @@ -15,7 +15,7 @@ --> - - + + diff --git a/res/drawable/list_border.xml b/res/drawable/list_border.xml new file mode 100644 index 000000000..1ab11ddfe --- /dev/null +++ b/res/drawable/list_border.xml @@ -0,0 +1,38 @@ + + + + + + + + + diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml new file mode 100644 index 000000000..ada9b365a --- /dev/null +++ b/res/drawable/list_selector.xml @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/res/drawable/scene_mode_view_border.xml b/res/drawable/scene_mode_view_border.xml new file mode 100644 index 000000000..68431ece6 --- /dev/null +++ b/res/drawable/scene_mode_view_border.xml @@ -0,0 +1,36 @@ + + + + + + + diff --git a/res/drawable/scene_mode_view_border_selected.xml b/res/drawable/scene_mode_view_border_selected.xml new file mode 100644 index 000000000..535e2d168 --- /dev/null +++ b/res/drawable/scene_mode_view_border_selected.xml @@ -0,0 +1,36 @@ + + + + + + + diff --git a/res/drawable/shutter_button_anim.xml b/res/drawable/shutter_button_anim.xml new file mode 100644 index 000000000..914977244 --- /dev/null +++ b/res/drawable/shutter_button_anim.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/thumb_filter_aqua.png b/res/drawable/thumb_filter_aqua.png new file mode 100644 index 000000000..91fe52046 Binary files /dev/null and b/res/drawable/thumb_filter_aqua.png differ diff --git a/res/drawable/thumb_filter_emboss.png b/res/drawable/thumb_filter_emboss.png new file mode 100644 index 000000000..ebfc75325 Binary files /dev/null and b/res/drawable/thumb_filter_emboss.png differ diff --git a/res/drawable/thumb_filter_monochrome.png b/res/drawable/thumb_filter_monochrome.png new file mode 100644 index 000000000..9bfb2d540 Binary files /dev/null and b/res/drawable/thumb_filter_monochrome.png differ diff --git a/res/drawable/thumb_filter_negative.png b/res/drawable/thumb_filter_negative.png new file mode 100644 index 000000000..8520afe52 Binary files /dev/null and b/res/drawable/thumb_filter_negative.png differ diff --git a/res/drawable/thumb_filter_neon.png b/res/drawable/thumb_filter_neon.png new file mode 100644 index 000000000..27bb71b21 Binary files /dev/null and b/res/drawable/thumb_filter_neon.png differ diff --git a/res/drawable/thumb_filter_nofilter.png b/res/drawable/thumb_filter_nofilter.png new file mode 100644 index 000000000..fc790cd5f Binary files /dev/null and b/res/drawable/thumb_filter_nofilter.png differ diff --git a/res/drawable/thumb_filter_posterize.png b/res/drawable/thumb_filter_posterize.png new file mode 100644 index 000000000..fa8c34c80 Binary files /dev/null and b/res/drawable/thumb_filter_posterize.png differ diff --git a/res/drawable/thumb_filter_sepia.png b/res/drawable/thumb_filter_sepia.png new file mode 100644 index 000000000..5a77f8cbe Binary files /dev/null and b/res/drawable/thumb_filter_sepia.png differ diff --git a/res/drawable/thumb_filter_sketch.png b/res/drawable/thumb_filter_sketch.png new file mode 100644 index 000000000..baca1d4f0 Binary files /dev/null and b/res/drawable/thumb_filter_sketch.png differ diff --git a/res/drawable/thumb_filter_solarize.png b/res/drawable/thumb_filter_solarize.png new file mode 100644 index 000000000..96ab7ac13 Binary files /dev/null and b/res/drawable/thumb_filter_solarize.png differ diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index cf27af192..1d911badc 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -13,59 +13,109 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - + + + + + + style="@style/MenuButton" + android:layout_gravity="center" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index a98ddff25..130efc748 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -13,59 +13,109 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - + + + + + + style="@style/MenuButton" + android:layout_gravity="center" + android:contentDescription="@string/accessibility_menu_button" + android:src="@drawable/ic_settings" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/filter_mode_view.xml b/res/layout/filter_mode_view.xml new file mode 100644 index 000000000..a58e725bd --- /dev/null +++ b/res/layout/filter_mode_view.xml @@ -0,0 +1,57 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/layout/horiz_grid.xml b/res/layout/horiz_grid.xml new file mode 100644 index 000000000..910b0ea66 --- /dev/null +++ b/res/layout/horiz_grid.xml @@ -0,0 +1,42 @@ + + + + + + + diff --git a/res/layout/list_menu.xml b/res/layout/list_menu.xml new file mode 100644 index 000000000..e110fd571 --- /dev/null +++ b/res/layout/list_menu.xml @@ -0,0 +1,36 @@ + + + + + diff --git a/res/layout/list_menu_item.xml b/res/layout/list_menu_item.xml new file mode 100644 index 000000000..fc29f3cba --- /dev/null +++ b/res/layout/list_menu_item.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + diff --git a/res/layout/list_sub_menu.xml b/res/layout/list_sub_menu.xml new file mode 100644 index 000000000..eaab0948e --- /dev/null +++ b/res/layout/list_sub_menu.xml @@ -0,0 +1,39 @@ + + + + + diff --git a/res/layout/list_sub_menu_item.xml b/res/layout/list_sub_menu_item.xml new file mode 100644 index 000000000..a79628b5d --- /dev/null +++ b/res/layout/list_sub_menu_item.xml @@ -0,0 +1,52 @@ + + + + + + + + + diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml index 89bc1ff39..5f6bcb0d5 100644 --- a/res/layout/photo_module.xml +++ b/res/layout/photo_module.xml @@ -43,6 +43,7 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/vertical_grid.xml b/res/layout/vertical_grid.xml new file mode 100644 index 000000000..0754d0483 --- /dev/null +++ b/res/layout/vertical_grid.xml @@ -0,0 +1,42 @@ + + + + + + + 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 @@ - @string/pref_camera_scenemode_entry_action - @string/pref_camera_scenemode_entry_night @string/pref_camera_scenemode_entry_auto - @string/pref_camera_scenemode_entry_sunset - @string/pref_camera_scenemode_entry_party - @string/pref_camera_scenemode_entry_asd - @string/pref_camera_scenemode_entry_portrait + @string/pref_camera_scenemode_entry_landscape - @string/pref_camera_scenemode_entry_night_portrait - @string/pref_camera_scenemode_entry_theatre - @string/pref_camera_scenemode_entry_beach - @string/pref_camera_scenemode_entry_snow - @string/pref_camera_scenemode_entry_steadyphoto - @string/pref_camera_scenemode_entry_fireworks @string/pref_camera_scenemode_entry_sports - @string/pref_camera_scenemode_entry_candlelight - @string/pref_camera_scenemode_entry_backlight @string/pref_camera_scenemode_entry_flowers - @string/pref_camera_scenemode_entry_ar + @string/pref_camera_scenemode_entry_backlight + @string/pref_camera_scenemode_entry_candlelight + @string/pref_camera_scenemode_entry_sunset + @string/pref_camera_scenemode_entry_night + @string/pref_camera_scenemode_entry_beach + @string/pref_camera_scenemode_entry_snow + + @drawable/ic_scene_mode_auto + + @drawable/ic_scene_mode_landscape + @drawable/ic_scene_mode_sports + @drawable/ic_scene_mode_flower + @drawable/ic_scene_mode_backlight + @drawable/ic_scene_mode_candlelight + @drawable/ic_scene_mode_sunset + @drawable/ic_scene_mode_night + @drawable/ic_scene_mode_beach + @drawable/ic_scene_mode_snow + + @string/pref_camera_scenemode_label_action @string/pref_camera_scenemode_label_night @@ -441,25 +447,17 @@ - action - night auto - sunset - party - asd - portrait + landscape - night-portrait - theatre - beach - snow - steadyphoto - fireworks sports - candlelight - backlight flowers - AR + backlight + candlelight + sunset + night + beach + snow 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 @@ + 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 @@ #80d05060 #FFAAAAAA + #ff10aadc + #ffade9fd + #d8ababab 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 @@ 2dp 48dp 72dp + 52dp + 80dp + 30dp + 60dp 2dip 14pt - -22dp + 5dp 200dip 400dip 48dip 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 @@ @string/pref_camera_coloreffect_entry_greentint + + @drawable/thumb_filter_nofilter + @drawable/thumb_filter_monochrome + @drawable/thumb_filter_sepia + @drawable/thumb_filter_negative + @drawable/thumb_filter_solarize + @drawable/thumb_filter_posterize + @drawable/thumb_filter_aqua + @drawable/thumb_filter_emboss + @drawable/thumb_filter_sketch + @drawable/thumb_filter_neon + 0 + 0 + 0 + 0 + 0 + + none mono 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 @@ wrap_content @drawable/bg_pressed + + + + + +