summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorChih-yu Huang <akahuang@google.com>2011-10-28 16:27:08 +0800
committerChih-yu Huang <akahuang@google.com>2011-10-28 18:51:28 +0800
commitd6e5029b2df45210834334f7c2e99dfc85e962f0 (patch)
tree96bce8fdb2d21237d13484bfe9aaca21c348309a /res
parent60dc073ff3087af41f9cf3b738eaa74bb2212f95 (diff)
downloadLegacyCamera-d6e5029b2df45210834334f7c2e99dfc85e962f0.zip
LegacyCamera-d6e5029b2df45210834334f7c2e99dfc85e962f0.tar.gz
LegacyCamera-d6e5029b2df45210834334f7c2e99dfc85e962f0.tar.bz2
Show video snapshot toast in first use.
bug:5494290 Change-Id: I7cb498ef50610d300a64d9d053b0a411d86da730
Diffstat (limited to 'res')
-rw-r--r--res/layout-sw600dp/preview_frame.xml2
-rw-r--r--res/layout-sw600dp/preview_frame_video.xml1
-rw-r--r--res/layout/first_hint_toast.xml (renamed from res/layout/tap_to_focus_toast.xml)8
-rw-r--r--res/layout/preview_frame.xml2
-rw-r--r--res/layout/preview_frame_video.xml1
5 files changed, 8 insertions, 6 deletions
diff --git a/res/layout-sw600dp/preview_frame.xml b/res/layout-sw600dp/preview_frame.xml
index 961a407..896d394 100644
--- a/res/layout-sw600dp/preview_frame.xml
+++ b/res/layout-sw600dp/preview_frame.xml
@@ -31,6 +31,6 @@
android:visibility="gone"/>
<include layout="@layout/focus_indicator"/>
<include layout="@layout/priority_indicators"/>
- <include layout="@layout/tap_to_focus_toast"/>
+ <include layout="@layout/first_hint_toast"/>
</com.android.camera.PreviewFrameLayout>
</RelativeLayout>
diff --git a/res/layout-sw600dp/preview_frame_video.xml b/res/layout-sw600dp/preview_frame_video.xml
index 69b7fe3..4e59c90 100644
--- a/res/layout-sw600dp/preview_frame_video.xml
+++ b/res/layout-sw600dp/preview_frame_video.xml
@@ -44,5 +44,6 @@
android:background="@drawable/bg_pressed"
android:visibility="gone"
android:onClick="onReviewPlayClicked" />
+ <include layout="@layout/first_hint_toast"/>
</com.android.camera.PreviewFrameLayout>
</RelativeLayout>
diff --git a/res/layout/tap_to_focus_toast.xml b/res/layout/first_hint_toast.xml
index 1ea67e7..fb60d29 100644
--- a/res/layout/tap_to_focus_toast.xml
+++ b/res/layout/first_hint_toast.xml
@@ -17,13 +17,12 @@
*/
-->
<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/tap_to_focus_prompt"
+ android:id="@+id/first_use_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:visibility="gone">
- <TextView
- android:text="@string/tap_to_focus"
+ <TextView android:id="@+id/toast_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
@@ -32,4 +31,5 @@
android:paddingBottom="5dp"
android:textAppearance="?android:textAppearanceMedium"
android:background="@color/on_viewfinder_label_background_color" />
-</com.android.camera.ui.RotateLayout> \ No newline at end of file
+</com.android.camera.ui.RotateLayout>
+
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml
index c225a58..31ba61b 100644
--- a/res/layout/preview_frame.xml
+++ b/res/layout/preview_frame.xml
@@ -32,7 +32,7 @@
android:visibility="gone"/>
<include layout="@layout/focus_indicator"/>
<include layout="@layout/priority_indicators"/>
- <include layout="@layout/tap_to_focus_toast"/>
+ <include layout="@layout/first_hint_toast"/>
</com.android.camera.PreviewFrameLayout>
<include layout="@layout/indicator_bar" />
</RelativeLayout>
diff --git a/res/layout/preview_frame_video.xml b/res/layout/preview_frame_video.xml
index 5e27169..af945f5 100644
--- a/res/layout/preview_frame_video.xml
+++ b/res/layout/preview_frame_video.xml
@@ -44,6 +44,7 @@
android:src="@drawable/ic_gallery_play"
android:visibility="gone"
android:onClick="onReviewPlayClicked"/>
+ <include layout="@layout/first_hint_toast"/>
</com.android.camera.PreviewFrameLayout>
<!-- Fill up the space below preview frame with black. -->