diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-11-30 09:20:26 +0100 |
---|---|---|
committer | Michael Bestas <mikeioannina@gmail.com> | 2016-12-23 00:35:22 -0800 |
commit | f29da1211f7814a59b1ef648274478125ce23c8d (patch) | |
tree | 7f5b001fb78d01b1e8d0f57997fd905eab092450 /res | |
parent | e600930eb8be682be31e0ae3d2f667b2369bee68 (diff) | |
download | android_packages_apps_Snap-f29da1211f7814a59b1ef648274478125ce23c8d.tar.gz android_packages_apps_Snap-f29da1211f7814a59b1ef648274478125ce23c8d.tar.bz2 android_packages_apps_Snap-f29da1211f7814a59b1ef648274478125ce23c8d.zip |
Modernize look of review controls.
Change-Id: I79f74502364a523a7c9c9f8ae3c63c3fcfebac3d
Diffstat (limited to 'res')
17 files changed, 106 insertions, 76 deletions
diff --git a/res/drawable-hdpi/ic_btn_shutter_retake.png b/res/drawable-hdpi/ic_btn_shutter_retake.png Binary files differdeleted file mode 100644 index cc7a44c5d..000000000 --- a/res/drawable-hdpi/ic_btn_shutter_retake.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_cancel_holo_light.png b/res/drawable-hdpi/ic_menu_cancel_holo_light.png Binary files differdeleted file mode 100644 index e0f85c51e..000000000 --- a/res/drawable-hdpi/ic_menu_cancel_holo_light.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_menu_done_holo_light.png b/res/drawable-hdpi/ic_menu_done_holo_light.png Binary files differdeleted file mode 100644 index 923589eb0..000000000 --- a/res/drawable-hdpi/ic_menu_done_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_btn_shutter_retake.png b/res/drawable-mdpi/ic_btn_shutter_retake.png Binary files differdeleted file mode 100644 index dc631dbce..000000000 --- a/res/drawable-mdpi/ic_btn_shutter_retake.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_cancel_holo_light.png b/res/drawable-mdpi/ic_menu_cancel_holo_light.png Binary files differdeleted file mode 100644 index d5ca91820..000000000 --- a/res/drawable-mdpi/ic_menu_cancel_holo_light.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_menu_done_holo_light.png b/res/drawable-mdpi/ic_menu_done_holo_light.png Binary files differdeleted file mode 100644 index d83141436..000000000 --- a/res/drawable-mdpi/ic_menu_done_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_btn_shutter_retake.png b/res/drawable-xhdpi/ic_btn_shutter_retake.png Binary files differdeleted file mode 100644 index ec8c50e8e..000000000 --- a/res/drawable-xhdpi/ic_btn_shutter_retake.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_cancel_holo_light.png b/res/drawable-xhdpi/ic_menu_cancel_holo_light.png Binary files differdeleted file mode 100644 index a9e1eb059..000000000 --- a/res/drawable-xhdpi/ic_menu_cancel_holo_light.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_menu_done_holo_light.png b/res/drawable-xhdpi/ic_menu_done_holo_light.png Binary files differdeleted file mode 100644 index 7351f21a5..000000000 --- a/res/drawable-xhdpi/ic_menu_done_holo_light.png +++ /dev/null diff --git a/res/drawable/ic_menu_cancel.xml b/res/drawable/ic_menu_cancel.xml new file mode 100644 index 000000000..4f344de54 --- /dev/null +++ b/res/drawable/ic_menu_cancel.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="@android:color/white" + android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/> +</vector> diff --git a/res/drawable/ic_menu_done.xml b/res/drawable/ic_menu_done.xml new file mode 100644 index 000000000..2b78ab384 --- /dev/null +++ b/res/drawable/ic_menu_done.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="@android:color/white" + android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/> +</vector> diff --git a/res/drawable/ic_menu_retake.xml b/res/drawable/ic_menu_retake.xml new file mode 100644 index 000000000..df5195f23 --- /dev/null +++ b/res/drawable/ic_menu_retake.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="@android:color/white" + android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> +</vector> diff --git a/res/layout-land/review_module_control.xml b/res/layout-land/review_module_control.xml index d740eec7d..f6c0f7fd0 100644 --- a/res/layout-land/review_module_control.xml +++ b/res/layout-land/review_module_control.xml @@ -14,7 +14,7 @@ limitations under the License. --> <com.android.camera.ui.RotatableLayout - xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:android="http://schemas.android.com/apk/res/android" style="@style/CameraControls" android:layout_gravity="right|center_vertical" android:layout_marginRight="2dip"> @@ -22,27 +22,21 @@ style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_ok" android:visibility="gone" - android:scaleType="center" android:layout_gravity="top|right" - android:background="@drawable/bg_pressed" - android:src="@drawable/ic_menu_done_holo_light" /> + android:src="@drawable/ic_menu_done" /> <com.android.camera.ui.RotateImageView android:id="@+id/btn_retake" - style="@style/ReviewControlIcon" - android:contentDescription="@string/accessibility_review_retake" - android:layout_gravity="right|center_vertical" - android:scaleType="center" - android:focusable="true" - android:visibility="gone" - android:background="@drawable/bg_pressed" - android:src="@drawable/ic_btn_shutter_retake" /> + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_retake" + android:layout_gravity="right|center_vertical" + android:visibility="gone" + android:src="@drawable/ic_menu_retake" /> <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:visibility="gone" - android:scaleType="center" android:layout_gravity="bottom|right" - android:background="@drawable/bg_pressed" - android:src="@drawable/ic_menu_cancel_holo_light" /> + android:src="@drawable/ic_menu_cancel" /> + </com.android.camera.ui.RotatableLayout> diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index 04c2f9e46..5e6993e12 100644 --- a/res/layout/camera_controls.xml +++ b/res/layout/camera_controls.xml @@ -71,67 +71,81 @@ android:id="@+id/bottom_bar" android:layout_width="match_parent" android:layout_height="@dimen/preview_bottom_margin" - android:gravity="center" - android:weightSum="100" android:background="@drawable/camera_controls_bg_opaque" - android:orientation="horizontal"> - - <com.android.camera.ui.RotateImageView - android:id="@+id/preview_thumb" - android:layout_width="0dp" - android:layout_height="@dimen/thumbnail_size" - android:layout_weight="25" - android:layout_gravity="center_horizontal|center_vertical" - android:background="@android:color/transparent" - android:contentDescription="@string/switch_photo_filmstrip" - android:scaleType="fitCenter" /> + android:orientation="vertical"> <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" android:gravity="center" - android:layout_weight="50" + android:weightSum="100" android:orientation="horizontal"> - <com.android.camera.ShutterButton - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <com.android.camera.ui.RotateImageView + android:id="@+id/preview_thumb" + android:layout_width="0dp" + android:layout_height="@dimen/thumbnail_size" + android:layout_weight="25" android:layout_gravity="center_horizontal|center_vertical" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="fitCenter" - android:src="@drawable/btn_new_shutter" /> - - <ImageView - android:id="@+id/video_button" - android:visibility="gone" - android:layout_width="wrap_content" + android:background="@android:color/transparent" + android:contentDescription="@string/switch_photo_filmstrip" + android:scaleType="fitCenter" /> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:gravity="center" + android:layout_weight="50" + android:orientation="horizontal"> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|center_vertical" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/btn_new_shutter" /> + + <ImageView + android:id="@+id/video_button" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|center_vertical" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="fitCenter" + android:src="@drawable/btn_new_shutter_video" /> + + </LinearLayout> + + <FrameLayout + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|center_vertical" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="fitCenter" - android:src="@drawable/btn_new_shutter_video" /> + android:layout_weight="25"> - </LinearLayout> + <com.android.camera.ui.ModuleSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_gravity="center" + android:scaleType="center" + android:contentDescription="@string/accessibility_mode_picker" /> + </FrameLayout> - <FrameLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="25"> + </LinearLayout> - <com.android.camera.ui.ModuleSwitcher - android:id="@+id/camera_switcher" - style="@style/SwitcherButton" - android:layout_gravity="center" - android:scaleType="center" - android:contentDescription="@string/accessibility_mode_picker" /> - </FrameLayout> + <ViewStub + android:id="@+id/review_control_stub" + android:layout="@layout/review_module_control" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - </LinearLayout> + </LinearLayout> <LinearLayout android:id="@+id/remaining_photos" diff --git a/res/layout/review_module_control.xml b/res/layout/review_module_control.xml index 8280b3101..83fbc2af9 100644 --- a/res/layout/review_module_control.xml +++ b/res/layout/review_module_control.xml @@ -22,27 +22,20 @@ style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_ok" android:visibility="gone" - android:scaleType="center" android:layout_gravity="right|bottom" - android:background="@drawable/bg_pressed" - android:src="@drawable/ic_menu_done_holo_light" /> + android:src="@drawable/ic_menu_done" /> <com.android.camera.ui.RotateImageView android:id="@+id/btn_retake" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_retake" android:layout_gravity="bottom|center_horizontal" - android:scaleType="center" - android:focusable="true" android:visibility="gone" - android:background="@drawable/bg_pressed" - android:src="@drawable/ic_btn_shutter_retake" /> + android:src="@drawable/ic_menu_retake" /> <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel" style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:visibility="gone" - android:scaleType="center" android:layout_gravity="left|bottom" - android:background="@drawable/bg_pressed" - android:src="@drawable/ic_menu_cancel_holo_light" /> + android:src="@drawable/ic_menu_cancel" /> </com.android.camera.ui.RotatableLayout> diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 7195ac821..305d1fc73 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -29,7 +29,8 @@ <item name="android:layout_centerHorizontal">true</item> <item name="android:clickable">true</item> <item name="android:focusable">true</item> - <item name="android:background">@drawable/bg_pressed</item> + <item name="android:scaleType">center</item> + <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item> </style> <style name="SettingPopupWindow"> <item name="android:layout_width">wrap_content</item> diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml index 830b0c754..4b2649f93 100644 --- a/res/values-port/styles.xml +++ b/res/values-port/styles.xml @@ -21,7 +21,8 @@ <item name="android:layout_centerVertical">true</item> <item name="android:clickable">true</item> <item name="android:focusable">true</item> - <item name="android:background">@drawable/bg_pressed</item> + <item name="android:scaleType">center</item> + <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item> </style> <style name="SettingPopupWindow"> <item name="android:layout_width">wrap_content</item> |