Don't show tap-to-focus message.

  Bug: 12028253

Change-Id: Ifc4385c177dd895f2959429e2575d3ef1d5fcfe3

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ec4f01e..65056a1 100644 (file)
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -451,7 +451,7 @@ public class PhotoModule
         mHandler.sendEmptyMessage(MSG_SWITCH_CAMERA_START_ANIMATION);
     }
 
-    private ButtonManager.ButtonCallback mCameraButtonCallback =
+    private final ButtonManager.ButtonCallback mCameraButtonCallback =
         new ButtonManager.ButtonCallback() {
             @Override
             public void onStateChanged(int state) {
@@ -468,7 +468,7 @@ public class PhotoModule
             }
         };
 
-    private ButtonManager.ButtonCallback mHdrPlusButtonCallback =
+    private final ButtonManager.ButtonCallback mHdrPlusButtonCallback =
         new ButtonManager.ButtonCallback() {
             @Override
             public void onStateChanged(int state) {
@@ -485,7 +485,6 @@ public class PhotoModule
             settingsManager.setDefault(SettingsManager.SETTING_CAMERA_HDR_PLUS);
         }
         updateSceneMode();
-        showTapToFocusToastIfNeeded();
     }
 
     @Override
@@ -545,18 +544,6 @@ public class PhotoModule
         mUI.initializeSecondTime(mParameters);
     }
 
-    private void showTapToFocusToastIfNeeded() {
-        // Show the tap to focus toast if this is the first start.
-        SettingsManager settingsManager = mActivity.getSettingsManager();
-        boolean showHint = settingsManager.getBoolean(
-            SettingsManager.SETTING_CAMERA_FIRST_USE_HINT_SHOWN);
-        // CONVERT THIS SETTING TO A STRING
-        if (mFocusAreaSupported && showHint) {
-            // Delay the toast for one second to wait for orientation.
-            mHandler.sendEmptyMessageDelayed(MSG_SHOW_TAP_TO_FOCUS_TOAST, 1000);
-        }
-    }
-
     private void addIdleHandler() {
         MessageQueue queue = Looper.myQueue();
         queue.addIdleHandler(new MessageQueue.IdleHandler() {