summaryrefslogtreecommitdiffstats
path: root/res/layout-w1024dp
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-09-09 04:37:04 +0800
committerWu-cheng Li <wuchengli@google.com>2011-09-09 05:36:22 +0800
commit6a6cad85e4932ca6b3f00acd6617e9ad1701d13d (patch)
tree8451ec1c2e86ede56d5f3965615e536cbd5b7de9 /res/layout-w1024dp
parent4d08a6cda05212e7861b75845f999e1e979e3c5f (diff)
downloadLegacyCamera-6a6cad85e4932ca6b3f00acd6617e9ad1701d13d.zip
LegacyCamera-6a6cad85e4932ca6b3f00acd6617e9ad1701d13d.tar.gz
LegacyCamera-6a6cad85e4932ca6b3f00acd6617e9ad1701d13d.tar.bz2
Put a red border around the viewfinder during video snapshot.
Also remove the viewfinder border in all other cases. bug:5187868 Change-Id: I4164fc9b0b62268b80496c71058466e03cbf0aa3
Diffstat (limited to 'res/layout-w1024dp')
-rw-r--r--res/layout-w1024dp/preview_frame.xml7
-rw-r--r--res/layout-w1024dp/preview_frame_video.xml8
2 files changed, 3 insertions, 12 deletions
diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index ea57476..762fef5 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -33,11 +33,4 @@
<include layout="@layout/priority_indicators"/>
<include layout="@layout/tap_to_focus_toast"/>
</RelativeLayout>
- <!-- This is the border of preview and the corner is round. If it is the background,
- preview will be on top and the inner corner will be square, which looks bad.
- So this is put in the end of layout to keep corner round. -->
- <ImageView android:id="@+id/preview_border"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/border_preview"/>
</com.android.camera.PreviewFrameLayout>
diff --git a/res/layout-w1024dp/preview_frame_video.xml b/res/layout-w1024dp/preview_frame_video.xml
index 98d9ce2..edd176a 100644
--- a/res/layout-w1024dp/preview_frame_video.xml
+++ b/res/layout-w1024dp/preview_frame_video.xml
@@ -63,11 +63,9 @@
android:visibility="gone"
android:background="@android:color/black"/>
</RelativeLayout>
- <!-- This is the border of preview and the corner is round. If it is the background,
- preview will be on top and the inner corner will be square, which looks bad.
- So this is put in the end of layout to keep corner round. -->
- <ImageView android:id="@+id/preview_border"
+ <!-- Border for video snapshot. -->
+ <View android:id="@+id/preview_border"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/border_preview"/>
+ android:visibility="gone"/>
</com.android.camera.PreviewFrameLayout>