resolved conflicts for merge of 618ae454 to master

This commit is contained in:
Scott Main
2009-10-22 14:29:35 -07:00
2 changed files with 3 additions and 3 deletions

View File

@@ -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">

View File

@@ -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>