summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2016-11-30 09:20:26 +0100
committerMichael Bestas <mikeioannina@gmail.com>2016-12-23 00:35:22 -0800
commitf29da1211f7814a59b1ef648274478125ce23c8d (patch)
tree7f5b001fb78d01b1e8d0f57997fd905eab092450 /res/layout
parente600930eb8be682be31e0ae3d2f667b2369bee68 (diff)
downloadandroid_packages_apps_Snap-f29da1211f7814a59b1ef648274478125ce23c8d.zip
android_packages_apps_Snap-f29da1211f7814a59b1ef648274478125ce23c8d.tar.gz
android_packages_apps_Snap-f29da1211f7814a59b1ef648274478125ce23c8d.tar.bz2
Modernize look of review controls.
Change-Id: I79f74502364a523a7c9c9f8ae3c63c3fcfebac3d
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/camera_controls.xml112
-rw-r--r--res/layout/review_module_control.xml13
2 files changed, 66 insertions, 59 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 04c2f9e..5e6993e 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 8280b31..83fbc2a 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>