commit dddc29815375022e52c2945e8cab40f61f56483c
author Ricardo Cervera-Navarro <rcervera@google.com> Fri Dec 05 00:33:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 05 00:33:35 2014 +0000
tree 12190900ee0ca04bf7b81c81e66c648af0afcfb8
parent f5aa675294ef1c622ec369450e2b0bbaa839db6d
parent 1782e526c73bfd2f4eb24b024a5019b66dbdaade

am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs

* commit '1782e526c73bfd2f4eb24b024a5019b66dbdaade':
  Revert "docs: Long press to dismiss fix by Wayne"

docs/html/training/wearables/ui/exit.jd

diff --git a/docs/html/training/wearables/ui/exit.jd b/docs/html/training/wearables/ui/exit.jd
index 6b205a57..84e1e45 100644
--- a/docs/html/training/wearables/ui/exit.jd
+++ b/docs/html/training/wearables/ui/exit.jd
@@ -67,7 +67,7 @@
         android:id="@+id/dismiss_overlay"
         android:layout_height="match_parent"
         android:layout_width="match_parent"/>
-</FrameLayout>
+<FrameLayout>
 </pre>
 
 <p>In your activity, obtain the <code>DismissOverlayView</code> element and set some introductory
@@ -100,8 +100,8 @@
 
     // Capture long presses
     &#64;Override
-    public boolean dispatchTouchEvent(MotionEvent e) {
-        return mDetector.onTouchEvent(e) || super.dispatchTouchEvent(e);
+    public boolean onTouchEvent(MotionEvent ev) {
+        return mDetector.onTouchEvent(ev) || super.onTouchEvent(ev);
     }
 }
 </pre>