Add tap to focus toast.

bug:5039278
Change-Id: I1c47ffa46df7b6c1fdd447b688e1c7ccb724cb5a

4 files changed, 40 insertions, 0 deletions

diff --git a/res/layout-w1024dp/preview_frame.xml b/res/layout-w1024dp/preview_frame.xml
index 406d6e5..7c92f1d 100644
--- a/res/layout-w1024dp/preview_frame.xml
+++ b/res/layout-w1024dp/preview_frame.xml
@@ -48,6 +48,7 @@
                 android:layout_margin="15dp"
                 android:visibility="gone"/>
         <include layout="@layout/review_control"/>
+        <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.
diff --git a/res/layout/preview_frame.xml b/res/layout/preview_frame.xml
index f65f197..63887ff 100644
--- a/res/layout/preview_frame.xml
+++ b/res/layout/preview_frame.xml
@@ -59,5 +59,6 @@
                 android:layout_height="match_parent"
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"/>
+        <include layout="@layout/tap_to_focus_toast"/>
     </RelativeLayout>
 </com.android.camera.PreviewFrameLayout>
diff --git a/res/layout/tap_to_focus_toast.xml b/res/layout/tap_to_focus_toast.xml
new file mode 100644
index 0000000..1ea67e7
--- /dev/null
+++ b/res/layout/tap_to_focus_toast.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/tap_to_focus_prompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone">
+    <TextView
+            android:text="@string/tap_to_focus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="5dp"
+            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
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8bad5d5..2dc18bd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -270,4 +270,7 @@
 
     <!-- The text shown on the button for starting panorama capturing [CHAR LIMIT=10] -->
     <string name="pano_capture_start">Start</string>
+
+    <!-- Toast telling users tapping on the viewfinder will trigger autofocus [CHAR LIMIT=24] -->
+    <string name="tap_to_focus">Tap to focus</string>
 </resources>