diff options
author | Steve Kondik <steve@cyngn.com> | 2016-11-21 16:57:02 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-11-22 01:24:28 -0800 |
commit | e8e541a684fddea0cdbd3f4e148e9d3193f120eb (patch) | |
tree | 4667f2c33d2627bd0513e323e1cda153bcc0c440 /res/layout | |
parent | 272f70b628bb615cba2e7e8fd4eb9b2fd6389d4b (diff) | |
download | android_packages_apps_Snap-e8e541a684fddea0cdbd3f4e148e9d3193f120eb.tar.gz android_packages_apps_Snap-e8e541a684fddea0cdbd3f4e148e9d3193f120eb.tar.bz2 android_packages_apps_Snap-e8e541a684fddea0cdbd3f4e148e9d3193f120eb.zip |
snap: Panorama fixes
* Fix animations and transitions
* Disable warped preview overlay, this looks terrible and needs
rewritten.
Change-Id: I9474219c57fc204dd16797aa8921296e61cc9d37
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/camera_controls.xml | 2 | ||||
-rw-r--r-- | res/layout/pano_module_capture.xml | 12 | ||||
-rw-r--r-- | res/layout/pano_module_review.xml | 1 | ||||
-rw-r--r-- | res/layout/pano_review_control.xml | 2 | ||||
-rw-r--r-- | res/layout/panorama_module.xml | 6 |
5 files changed, 12 insertions, 11 deletions
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml index 39bedb059..1d1314eac 100644 --- a/res/layout/camera_controls.xml +++ b/res/layout/camera_controls.xml @@ -73,7 +73,7 @@ android:layout_height="@dimen/preview_bottom_margin" android:gravity="center" android:weightSum="100" - android:background="@drawable/camera_controls_bg_translucent" + android:background="@drawable/camera_controls_bg_opaque" android:orientation="horizontal"> <com.android.camera.ui.RotateImageView diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml index 1398b53dc..c6ea2b22a 100644 --- a/res/layout/pano_module_capture.xml +++ b/res/layout/pano_module_capture.xml @@ -16,6 +16,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/panorama_capture_layout" + android:background="@android:color/black" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -36,6 +37,13 @@ android:layout_height="match_parent" android:background="@drawable/ic_pan_border_fast" android:visibility="gone" /> + + <View + android:id="@+id/preview_cover" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black" /> + </FrameLayout> <LinearLayout @@ -73,9 +81,7 @@ style="@style/PanoViewHorizontalBar" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1" - android:gravity="top" - android:paddingTop="20dp" > + android:layout_weight="1"> <LinearLayout android:layout_width="match_parent" diff --git a/res/layout/pano_module_review.xml b/res/layout/pano_module_review.xml index aecf6f8b2..0a5f164f1 100644 --- a/res/layout/pano_module_review.xml +++ b/res/layout/pano_module_review.xml @@ -18,6 +18,7 @@ android:id="@+id/pano_review_layout" android:orientation="vertical" android:visibility="invisible" + android:background="@android:color/black" android:layout_height="match_parent" android:layout_width="match_parent"> diff --git a/res/layout/pano_review_control.xml b/res/layout/pano_review_control.xml index eeb2ebee4..4b51bda3b 100644 --- a/res/layout/pano_review_control.xml +++ b/res/layout/pano_review_control.xml @@ -29,5 +29,5 @@ style="@style/ReviewControlIcon" android:contentDescription="@string/accessibility_review_cancel" android:layout_gravity="center_horizontal|bottom" - android:src="@drawable/ic_menu_cancel_holo_light" /> + android:src="@drawable/exit_panorama" /> </merge> diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml index b1d0ded17..a5fcfb656 100644 --- a/res/layout/panorama_module.xml +++ b/res/layout/panorama_module.xml @@ -19,12 +19,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> <include layout="@layout/pano_module_capture" /> - <View - android:id="@+id/preview_cover" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/black" - android:visibility="gone" /> <com.android.camera.ui.RotateLayout android:id="@+id/waitingDialog" |