summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-11-22 01:57:02 +0100
committerChippa-a <vusal1372@gmail.com>2019-10-25 15:55:25 +0300
commitb1319c956afe6c027062e3f6432bb8e06bb980a6 (patch)
tree7bd52bae130f9bf54d97fa5690cc2c8526942528 /res/layout
parent90b91bff51f505e017b9b10f4005e998a5837037 (diff)
downloadandroid_packages_apps_Snap-b1319c956afe6c027062e3f6432bb8e06bb980a6.tar.gz
android_packages_apps_Snap-b1319c956afe6c027062e3f6432bb8e06bb980a6.tar.bz2
android_packages_apps_Snap-b1319c956afe6c027062e3f6432bb8e06bb980a6.zip
snap: Panorama fixes
Change-Id: I9474219c57fc204dd16797aa8921296e61cc9d37
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/pano_module_capture.xml12
-rw-r--r--res/layout/pano_module_review.xml1
-rw-r--r--res/layout/pano_review_control.xml2
-rw-r--r--res/layout/panorama_module.xml6
4 files changed, 11 insertions, 10 deletions
diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml
index b67315cd3..4e841878b 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 5ae300272..d8748cc8b 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"