diff options
| author | Scott Main <smain@google.com> | 2009-10-22 14:29:35 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2009-10-22 14:29:35 -0700 |
| commit | 3f3b61bd97f6fffdfa103b80acf0c3a123a79e39 (patch) | |
| tree | cf711cec1154c3aaee7dd2705d0ca528bbcd3a1f /docs | |
| parent | 40d787ccce7bc4773cdaf115cef78ca85911c292 (diff) | |
| parent | 618ae454947b597e107d9f24c1a83489275803bd (diff) | |
| download | frameworks_base-3f3b61bd97f6fffdfa103b80acf0c3a123a79e39.zip frameworks_base-3f3b61bd97f6fffdfa103b80acf0c3a123a79e39.tar.gz frameworks_base-3f3b61bd97f6fffdfa103b80acf0c3a123a79e39.tar.bz2 | |
resolved conflicts for merge of 618ae454 to master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/ui-events.jd | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 6045826..201890d 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -98,7 +98,7 @@ </li> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/resources/index.html"> - <span class="en">Resources and Assests</span> + <span class="en">Resources and Assets</span> </a></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/resources/resources-i18n.html"> diff --git a/docs/html/guide/topics/ui/ui-events.jd b/docs/html/guide/topics/ui/ui-events.jd index 60c8a1b..6b30e44 100644 --- a/docs/html/guide/topics/ui/ui-events.jd +++ b/docs/html/guide/topics/ui/ui-events.jd @@ -28,8 +28,8 @@ the specific View object that the user interacts with. The View class provides t methods that look useful for UI events. These methods are called by the Android framework when the respective action occurs on that object. For instance, when a View (such as a Button) is touched, the <code>onTouchEvent()</code> method is called on that object. However, in order to intercept this, you must extend -the class and override the method. Obviously, extending every View object -you want to use (just to handle an event) would be absurd. This is why the View class also contains +the class and override the method. However, extending every View object +in order to handle such an event would not be practical. This is why the View class also contains a collection of nested interfaces with callbacks that you can much more easily define. These interfaces, called <a href="#EventListeners">event listeners</a>, are your ticket to capturing the user interaction with your UI.</p> |