summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ricardo Cervera-Navarro <rcervera@google.com> 2014-12-05 02:34:02 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-05 02:34:02 +0000
commit53966f6268ac1861d62bda97f361cf67b2156f6c (patch)
treebcc82af355a365f0705a832f70b669a3ebfc045a
parent238efad04bfd144942b363c8589004ba831f3c63 (diff)
parent8242ae16b6f0f293ececb75228fb1364061171d0 (diff)
am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs
* commit '8242ae16b6f0f293ececb75228fb1364061171d0': Revert "docs: Long press to dismiss fix by Wayne"
-rw-r--r--docs/html/training/wearables/ui/exit.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/training/wearables/ui/exit.jd b/docs/html/training/wearables/ui/exit.jd
index 6b205a57b3d8..84e1e45c9bd1 100644
--- a/docs/html/training/wearables/ui/exit.jd
+++ b/docs/html/training/wearables/ui/exit.jd
@@ -67,7 +67,7 @@ For example:</p>
android:id="@+id/dismiss_overlay"
android:layout_height="match_parent"
android:layout_width="match_parent"/>
-&lt;/FrameLayout>
+&lt;FrameLayout>
</pre>
<p>In your activity, obtain the <code>DismissOverlayView</code> element and set some introductory
@@ -100,8 +100,8 @@ public class WearActivity extends Activity {
// 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>