summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorRicardo Cervera-Navarro <rcervera@google.com>2014-12-05 00:27:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-05 00:28:00 +0000
commit1782e526c73bfd2f4eb24b024a5019b66dbdaade (patch)
treed7aa18d420b1fca81d57444210c2c8856eaa90f0 /docs/html/training
parent709df4fa2600d1d2ee2f686097e1c92b52b58d19 (diff)
parentdc320a0b70688563cfa028f8f69e627999afb654 (diff)
downloadframeworks_base-1782e526c73bfd2f4eb24b024a5019b66dbdaade.zip
frameworks_base-1782e526c73bfd2f4eb24b024a5019b66dbdaade.tar.gz
frameworks_base-1782e526c73bfd2f4eb24b024a5019b66dbdaade.tar.bz2
Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs
Diffstat (limited to 'docs/html/training')
-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 6b205a5..84e1e45 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>