diff options
26 files changed, 90 insertions, 94 deletions
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 464430b..1e3e275 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -101,41 +101,41 @@ </a></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html"> - <span class="en">Declaring Layout</span> + <span class="en">XML Layouts</span> + </a></li> + <li><a href="<?cs var:toroot ?>guide/topics/ui/ui-events.html"> + <span class="en">Input Events</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html"> - <span class="en">Creating Menus</span> + <span class="en">Menus</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/actionbar.html"> - <span class="en">Using the Action Bar</span> + <span class="en">Action Bar</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/dialogs.html"> - <span class="en">Creating Dialogs</span> - </a></li> - <li><a href="<?cs var:toroot ?>guide/topics/ui/ui-events.html"> - <span class="en">Handling UI Events</span> + <span class="en">Dialogs</span> </a></li> <li class="toggle-list"> <div><a href="<?cs var:toroot ?>guide/topics/ui/notifiers/index.html"> - <span class="en">Notifying the User</span> + <span class="en">Notifications</span> </a></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/ui/notifiers/toasts.html"> - <span class="en">Creating Toast Notifications</span> + <span class="en">Toast Notifications</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/notifiers/notifications.html"> - <span class="en">Creating Status Bar Notifications</span> + <span class="en">Status Bar Notifications</span> </a></li> </ul> </li> <li><a href="<?cs var:toroot ?>guide/topics/ui/drag-drop.html"> - <span class="en">Dragging and Dropping</span> + <span class="en">Drag and Drop</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html"> - <span class="en">Applying Styles and Themes</span> + <span class="en">Styles and Themes</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/custom-components.html"> - <span class="en">Building Custom Components</span> + <span class="en">Custom Components</span> </a></li> <li><a href="<?cs var:toroot ?>guide/topics/ui/binding.html"> <span class="en">Binding to Data with AdapterView</span> diff --git a/docs/html/guide/practices/design/seamlessness.jd b/docs/html/guide/practices/design/seamlessness.jd index dedc16f..6c73426 100644 --- a/docs/html/guide/practices/design/seamlessness.jd +++ b/docs/html/guide/practices/design/seamlessness.jd @@ -171,7 +171,7 @@ interface they've come to expect. When designing your UIs, you should try and avoid rolling your own as much as possible. Instead, use a Theme. You can override or extend those parts of the theme that you need to, but at least you're starting from the same UI base as all the other applications. For all -the details, read <a href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a>.</p> +the details, read <a href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a>.</p> <h2 id="flexui">Design Your UI to Work with Multiple Screen Resolutions</h2> diff --git a/docs/html/guide/practices/ui_guidelines/menu_design.jd b/docs/html/guide/practices/ui_guidelines/menu_design.jd index 7751a7b..3edf33f 100644 --- a/docs/html/guide/practices/ui_guidelines/menu_design.jd +++ b/docs/html/guide/practices/ui_guidelines/menu_design.jd @@ -260,8 +260,8 @@ or device to another. <img src={@docRoot}images/menu_design/TaskFlowDiagram.png> <p> - For more technical information on menus, see - <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a>. + For more technical information on menus, see the + <a href="{@docRoot}guide/topics/ui/menus.html">Menus</a> developer guide. </p> <h3 id="commands_fixed">Commands Fixed in an Activity Screen</h4> diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd index 22283cd..20ce701 100644 --- a/docs/html/guide/topics/appwidgets/index.jd +++ b/docs/html/guide/topics/appwidgets/index.jd @@ -297,8 +297,7 @@ Guidelines</a>.</p> <p>Creating the App Widget layout is simple if you're familiar with <a -href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout in -XML</a>. +href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a>. However, you must be aware that App Widget layouts are based on {@link android.widget.RemoteViews}, which do not support every kind of layout or view widget.</p> diff --git a/docs/html/guide/topics/fundamentals/fragments.jd b/docs/html/guide/topics/fundamentals/fragments.jd index 3908a7c..8f61945 100644 --- a/docs/html/guide/topics/fundamentals/fragments.jd +++ b/docs/html/guide/topics/fundamentals/fragments.jd @@ -631,8 +631,9 @@ selects a menu item. If the activity's implementation of the on-item-selected ca handle the selected item, then the event is passed to the fragment's callback. This is true for the Options Menu and context menus.</p> -<p>For more information about menus, see <a href="{@docRoot}guide/topics/ui/menus.html">Creating -Menus</a> and <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a>.</p> +<p>For more information about menus, see the <a +href="{@docRoot}guide/topics/ui/menus.html">Menus</a> and <a +href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guides.</p> diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd index 2490e39..f0a923a 100644 --- a/docs/html/guide/topics/graphics/index.jd +++ b/docs/html/guide/topics/graphics/index.jd @@ -150,7 +150,7 @@ use your Canvas to draw a Bitmap handled by the system.</p> <p class="note"><strong>Note: </strong> In order to request an invalidate from a thread other than your main Activity's thread, you must call <code>{@link android.view.View#postInvalidate()}</code>.</p> -<p>Also read <a href="{@docRoot}guide/topics/ui/custom-components.html">Building Custom Components</a> +<p>Also read <a href="{@docRoot}guide/topics/ui/custom-components.html">Custom Components</a> for a guide to extending a View class, and <a href="2d-graphics.html">2D Graphics: Drawables</a> for information on using Drawable objects like images from your resources and other primitive shapes.</p> diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd index b069521..286e3d1 100644 --- a/docs/html/guide/topics/resources/layout-resource.jd +++ b/docs/html/guide/topics/resources/layout-resource.jd @@ -7,7 +7,7 @@ parent.link=available-resources.html <div id="qv"> <h2>See also</h2> <ol> - <li><a href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a></li> + <li><a href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a></li> </ol> </div> </div> @@ -127,8 +127,9 @@ or {@code "wrap_content"}). See the <a href="#layoutvalues">valid values</a> bel </dl> <p>More attributes are supported by the {@link android.view.View} base class, and many more are supported by each implementation of - {@link android.view.View}. Read <a href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring - Layout</a> for more information. For a reference of all available attributes, + {@link android.view.View}. Read <a +href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a> for more information. For +a reference of all available attributes, see the corresponding reference documentation (for example, the <a href="{@docRoot}reference/android/widget/TextView.html#lattrs">TextView XML attributes</a>).</p> </dd> @@ -235,7 +236,8 @@ deprecate <code>fill_parent</code>.</td> <p>You can create your own custom {@link android.view.View} and {@link android.view.ViewGroup} elements and apply them to your layout the same as a standard layout element. You can also specify the attributes supported in the XML element. To learn more, -read <a href="{@docRoot}guide/topics/ui/custom-components.html">Building Custom Components</a>. +see the <a href="{@docRoot}guide/topics/ui/custom-components.html">Custom Components</a> developer +guide. </p> </dd> <!-- end elements and attributes --> @@ -273,7 +275,7 @@ public void onCreate(Bundle savedInstanceState) { <dt>see also:</dt> <dd> <ul> - <li><a href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a></li> + <li><a href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a></li> <li>{@link android.view.View}</li> <li>{@link android.view.ViewGroup}</li> </ul> diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd index 36e12f6..9affb15 100755 --- a/docs/html/guide/topics/resources/localization.jd +++ b/docs/html/guide/topics/resources/localization.jd @@ -52,7 +52,7 @@ defaults.</li> <li><a
href="{@docRoot}resources/tutorials/localization/index.html">Hello, L10N Tutorial</a></li>
<li><a href="{@docRoot}guide/topics/resources/providing-resources.html">Providing Resources</a></li>
- <li><a href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a></li>
+ <li><a href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a></li>
<li><a href="{@docRoot}reference/android/app/Activity.html#ActivityLifecycle">Activity Lifecycle</a></li>
</ol>
</div>
diff --git a/docs/html/guide/topics/resources/menu-resource.jd b/docs/html/guide/topics/resources/menu-resource.jd index 5b90ce2..64cdf21 100644 --- a/docs/html/guide/topics/resources/menu-resource.jd +++ b/docs/html/guide/topics/resources/menu-resource.jd @@ -7,7 +7,7 @@ parent.link=available-resources.html <div id="qv"> <h2>See also</h2> <ol> - <li><a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a></li> + <li><a href="{@docRoot}guide/topics/ui/menus.html">Menus</a></li> </ol> </div> </div> @@ -15,8 +15,8 @@ parent.link=available-resources.html <p>A menu resource defines an application menu (Options Menu, Context Menu, or submenu) that can be inflated with {@link android.view.MenuInflater}.</p> -<p>For a guide to using menus, see the <a href="{@docRoot}guide/topics/ui/menus.html">Creating -Menus</a> document.</p> +<p>For a guide to using menus, see the <a href="{@docRoot}guide/topics/ui/menus.html">Menus</a> +developer guide.</p> <dl class="xml"> @@ -132,22 +132,22 @@ Avoid using this unless it's critical that the item always appear in the action bar. Setting multiple items to always appear as action items can result in them overlapping with other UI in the action bar.</td></tr> </table> - <p>See <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a> for -more information.</p> + <p>See the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer +guide for more information.</p> <p>Introduced in API Level 11.</p> </dd> <dt><code>android:actionViewLayout</code></dt> <dd><em>Layout resource</em>. A layout to use as the action view. - <p>See <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a> for -more information.</p> + <p>See the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer +guide for more information.</p> <p>Introduced in API Level 11.</p></dd> <dt><code>android:actionViewClassName</code></dt> <dd><em>Class name</em>. A fully-qualified class name for the {@link android.view.View} to use as the action view. - <p>See <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a> for -more information.</p> + <p>See the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer +guide for more information.</p> <p class="warning"><strong>Warning:</strong> If you obfuscate your code using <a href="{@docRoot}guide/developing/tools/proguard.html">ProGuard</a> (or a similar tool), be sure to exclude the class you specify in this attribute from renaming, because it can break the diff --git a/docs/html/guide/topics/resources/style-resource.jd b/docs/html/guide/topics/resources/style-resource.jd index def727c..f6252db 100644 --- a/docs/html/guide/topics/resources/style-resource.jd +++ b/docs/html/guide/topics/resources/style-resource.jd @@ -7,7 +7,7 @@ parent.link=available-resources.html <div id="qv"> <h2>See also</h2> <ol> - <li><a href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a></li> + <li><a href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a></li> </ol> </div> </div> @@ -18,7 +18,7 @@ A style can be applied to an individual {@link android.view.View} (from within a an entire {@link android.app.Activity} or application (from within the manifest file).</p> <p>For more information about creating and applying styles, please read -<a href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a>.</p> +<a href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a>.</p> <p class="note"><strong>Note:</strong> A style is a simple resource that is referenced using the value provided in the {@code name} attribute (not the name of the XML file). As diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd index d869a44..27409d5 100644 --- a/docs/html/guide/topics/search/search-dialog.jd +++ b/docs/html/guide/topics/search/search-dialog.jd @@ -748,8 +748,8 @@ with some callback methods and event listeners. For more information, see the re documentation for {@link android.widget.SearchView} and its nested interfaces for the appropriate event listeners.</p> -<p>For more information about action views in the Action Bar, read <a -href="{@docRoot}guide/topics/ui/actionbar.html#ActionView">Using the Action Bar</a> (which +<p>For more information about action views in the Action Bar, read the <a +href="{@docRoot}guide/topics/ui/actionbar.html#ActionView">Action Bar</a> developer guide (which includes sample code for adding a search widget as an action view).</p> @@ -803,8 +803,8 @@ handle the "Search" menu item and open the search dialog by calling {@link android.app.Activity#onSearchRequested onSearchRequested()}.</p> <p>For more information about how items in the Action Bar work and how to handle this situation, see -the documentation for <a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action -Bar</a>.</p> +the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action +Bar</a> developer guide.</p> <p>Also see the <a href="{@docRoot}resources/samples/SearchableDictionary/src/com/example/android/searchabledict/ diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index 6f12b95..4742923 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -1,4 +1,4 @@ -page.title=Using the Action Bar +page.title=Action Bar parent.title=User Interface parent.link=index.html @jd:body @@ -49,7 +49,7 @@ href="{@docRoot}resources/samples/HoneycombGallery/index.html">Honeycomb Gallery <h2>See also</h2> <ol> - <li><a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a></li> + <li><a href="{@docRoot}guide/topics/ui/menus.html">Menus</a></li> </ol> </div> </div> @@ -157,7 +157,7 @@ action items and the overflow menu.</p> <p>When the activity first starts, the system populates the Action Bar and overflow menu by calling {@link android.app.Activity#onCreateOptionsMenu onCreateOptionsMenu()} for your activity. As -discussed in the guide to <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a>, it's in +discussed in the <a href="{@docRoot}guide/topics/ui/menus.html">Menus</a> developer guid, it's in this callback method that you define the Options Menu for the activity.</p> <p>You can specify a menu item to appear as an action item—if there is room @@ -211,7 +211,7 @@ doing so, because it can create a cluttered UI if there are too many action item collide with other elements in the Action Bar.</p> <p>For more information about menus, see the <a -href="{@docRoot}guide/topics/ui/menus.html#options-menu">Creating Menus</a> developer guide.</p> +href="{@docRoot}guide/topics/ui/menus.html#options-menu">Menus</a> developer guide.</p> <h3 id="Home">Using the app icon as an action item</h3> @@ -845,7 +845,7 @@ Bar completely, use the following style attributes:</p> </dl> <p>For more information about using themes in your application, read <a -href="{@docRoot}guide/topics/ui/themes.html">Applying Styles and Themes</a>.</p> +href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a>.</p> diff --git a/docs/html/guide/topics/ui/custom-components.jd b/docs/html/guide/topics/ui/custom-components.jd index 900e08b..be82dbc 100644 --- a/docs/html/guide/topics/ui/custom-components.jd +++ b/docs/html/guide/topics/ui/custom-components.jd @@ -1,4 +1,4 @@ -page.title=Building Custom Components +page.title=Custom Components parent.title=User Interface parent.link=index.html @jd:body diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd index 4a574be..4dc915f 100644 --- a/docs/html/guide/topics/ui/declaring-layout.jd +++ b/docs/html/guide/topics/ui/declaring-layout.jd @@ -1,4 +1,4 @@ -page.title=Declaring Layout +page.title=XML Layouts parent.title=User Interface parent.link=index.html @jd:body diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd index c1272b6..16f14cb 100644 --- a/docs/html/guide/topics/ui/dialogs.jd +++ b/docs/html/guide/topics/ui/dialogs.jd @@ -1,4 +1,4 @@ -page.title=Creating Dialogs +page.title=Dialogs parent.title=User Interface parent.link=index.html @jd:body diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd index 0329c19..93753cc 100644 --- a/docs/html/guide/topics/ui/drag-drop.jd +++ b/docs/html/guide/topics/ui/drag-drop.jd @@ -1,4 +1,4 @@ -page.title=Dragging and Dropping +page.title=Drag and Drop parent.title=User Interface parent.link=index.html @jd:body @@ -107,7 +107,7 @@ DraggableDot.java</a> in <a href="{@docRoot}resources/samples/ApiDemos/index.htm <a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a> </li> <li> - <a href="{@docRoot}guide/topics/ui/ui-events.html">Handling UI Events</a> + <a href="{@docRoot}guide/topics/ui/ui-events.html">Input Events</a> </li> </ol> </div> diff --git a/docs/html/guide/topics/ui/index.jd b/docs/html/guide/topics/ui/index.jd index 375c9fe..d3060c5 100644 --- a/docs/html/guide/topics/ui/index.jd +++ b/docs/html/guide/topics/ui/index.jd @@ -9,7 +9,7 @@ page.title=User Interface <li><a href="#ViewHierarchy">View Hierarchy</a></li> <li><a href="#Layout">Layout</a></li> <li><a href="#Widgets">Widgets</a></li> - <li><a href="#Events">UI Events</a></li> + <li><a href="#Events">Input Events</a></li> <li><a href="#Menus">Menus</a></li> <li><a href="#Advanced">Advanced Topics</a> <ol> @@ -104,7 +104,7 @@ the Android system initializes these run-time objects, corresponding to the elem another LinearLayout (or other type of view group) inside here, to lengthen the view hierarchy and create a more complex layout.</p> -<p>For more on building a UI layout, read <a href="declaring-layout.html">Declaring Layout</a>. +<p>For more on building a UI layout, read <a href="declaring-layout.html">XML Layouts</a>. <div class="sidebox-wrapper"> <div class="sidebox"> @@ -132,16 +132,16 @@ Some widgets provided by Android are more complex, like a date picker, a clock, But you're not limited to the kinds of widgets provided by the Android platform. If you'd like to do something more customized and create your own actionable elements, you can, by defining your own View object or by extending and combining existing widgets.</p> -<p>Read more in <a href="custom-components.html">Building Custom Components</a>.</p> +<p>Read more in the <a href="custom-components.html">Custom Components</a> developer guide.</p> <p>For a list of the widgets provided by Android, see the {@link android.widget} package.</p> -<h2 id="Events">UI Events</h2> +<h2 id="Events">Input Events</h2> <p>Once you've added some Views/widgets to the UI, you probably want to know about the -user's interaction with them, so you can perform actions. To be informed of UI events, you need to -do one of two things:</p> +user's interaction with them, so you can perform actions. To be informed of user input events, you +need to do one of two things:</p> <ul> <li><strong>Define an event listener and register it with the View.</strong> More often than not, this is how you'll listen for events. The View class contains a collection of nested interfaces named @@ -166,8 +166,8 @@ so your only chance to define them is when you </li> </ul> -<p>Continue reading about handling user interaction with Views in the <a href="ui-events.html">Handling UI Events</a> -document.</p> +<p>Continue reading about handling user interaction with Views in the <a +href="ui-events.html">Input Events</a> document.</p> <h2 id="Menus">Menus</h2> @@ -192,7 +192,7 @@ method will be called by the framework.</p> <p>And just like your application layout, you have the option to declare the items for you menu in an XML file.</p> -<p>Read <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a> to learn more.</p> +<p>Read <a href="{@docRoot}guide/topics/ui/menus.html">Menus</a> to learn more.</p> <h2 id="Advanced">Advanced Topics</h2> @@ -232,4 +232,4 @@ applied to specific activities or the entire application.</li> <p>Styles and themes are resources. Android provides some default style and theme resources that you can use, or you can declare your own custom style and theme resources.</p> <p>Learn more about using styles and themes in the -<a href="themes.html">Applying Styles and Themes</a> document.</p> +<a href="themes.html">Styles and Themes</a> document.</p> diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd index 984bf8f..2948244 100644 --- a/docs/html/guide/topics/ui/menus.jd +++ b/docs/html/guide/topics/ui/menus.jd @@ -1,4 +1,4 @@ -page.title=Creating Menus +page.title=Menus parent.title=User Interface parent.link=index.html @jd:body @@ -36,7 +36,7 @@ parent.link=index.html <h2>See also</h2> <ol> - <li><a href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a></li> + <li><a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a></li> <li><a href="{@docRoot}guide/topics/resources/menu-resource.html">Menu Resource</a></li> </ol> </div> @@ -301,8 +301,8 @@ cannot take focus, so you should never use focus as the basis for modifying items in the Options Menu. If you want to provide menu items that are context-sensitive to a {@link android.view.View}, use a <a href="#context-menu">Context Menu</a>.</p> -<p>If you're developing for Android 3.0 or higher, be sure to also read <a -href="{@docRoot}guide/topics/ui/actionbar.html">Using the Action Bar</a>.</p> +<p>If you're developing for Android 3.0 or higher, be sure to also read the <a +href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p> diff --git a/docs/html/guide/topics/ui/notifiers/index.jd b/docs/html/guide/topics/ui/notifiers/index.jd index 8fc57fc..c61d4f0 100644 --- a/docs/html/guide/topics/ui/notifiers/index.jd +++ b/docs/html/guide/topics/ui/notifiers/index.jd @@ -1,19 +1,8 @@ -page.title=Notifying the User +page.title=Notifications parent.title=User Interface parent.link=../index.html @jd:body -<div id="qv-wrapper"> - <div id="qv"> - <h2>Topics</h2> - <ol> - <li><a href="toasts.html">Creating Toast Notifications</a></li> - <li><a href="notifications.html">Creating Status Bar Notifications</a></li> - <li><a href="{@docRoot}guide/topics/ui/dialogs.html">Creating Dialogs</a></li> - </ol> - </div> -</div> - <p>Several types of situations may arise that require you to notify the user about an event that occurs in your application. Some events require the user to respond and others do not. For example:</p> @@ -57,7 +46,7 @@ to the screen. A toast can not accept user interaction events; if you'd like the user to respond and take action, consider using a <a href="#StatusBar">Status Bar Notification</a> instead.</p> -<p>For more information, refer to <a href="toasts.html">Creating Toast Notifications</a>.</p> +<p>For more information, refer to <a href="toasts.html">Toast Notifications</a>.</p> <h2 id="StatusBar">Status Bar Notification</h2> @@ -79,7 +68,7 @@ while your Activity is still in focus, consider using a <a href="#Dialog">Dialog Notification</a> instead.</p> <p>For more information, refer to -<a href="notifications.html">Creating Status Bar Notifications</a>.</p> +<a href="notifications.html">Status Bar Notifications</a>.</p> <h2 id="Dialog">Dialog Notification</h2> @@ -97,7 +86,7 @@ You can use also use dialogs as integral components in your application's UI and for other purposes besides notifications. For a complete discussion on all the available types of dialogs, including its uses for notifications, refer to -<a href="{@docRoot}guide/topics/ui/dialogs.html">Creating Dialogs</a>.</p> +<a href="{@docRoot}guide/topics/ui/dialogs.html">Dialogs</a>.</p> diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd index f12c5ee..7bc1cde 100644 --- a/docs/html/guide/topics/ui/notifiers/notifications.jd +++ b/docs/html/guide/topics/ui/notifiers/notifications.jd @@ -1,5 +1,5 @@ -page.title=Creating Status Bar Notifications -parent.title=Notifying the User +page.title=Status Bar Notifications +parent.title=Notifications parent.link=index.html @jd:body diff --git a/docs/html/guide/topics/ui/notifiers/toasts.jd b/docs/html/guide/topics/ui/notifiers/toasts.jd index 0d3e10c..1a1fb1f 100644 --- a/docs/html/guide/topics/ui/notifiers/toasts.jd +++ b/docs/html/guide/topics/ui/notifiers/toasts.jd @@ -1,5 +1,5 @@ -page.title=Creating Toast Notifications -parent.title=Notifying the User +page.title=Toast Notifications +parent.title=Notifications parent.link=index.html @jd:body diff --git a/docs/html/guide/topics/ui/themes.jd b/docs/html/guide/topics/ui/themes.jd index a213bea..d787492 100644 --- a/docs/html/guide/topics/ui/themes.jd +++ b/docs/html/guide/topics/ui/themes.jd @@ -1,4 +1,4 @@ -page.title=Applying Styles and Themes +page.title=Styles and Themes parent.title=User Interface parent.link=index.html @jd:body diff --git a/docs/html/guide/topics/ui/ui-events.jd b/docs/html/guide/topics/ui/ui-events.jd index 7d7bfaf..93bad43 100644 --- a/docs/html/guide/topics/ui/ui-events.jd +++ b/docs/html/guide/topics/ui/ui-events.jd @@ -1,4 +1,4 @@ -page.title=Handling UI Events +page.title=Input Events parent.title=User Interface parent.link=index.html @jd:body @@ -72,7 +72,8 @@ been registered is triggered by user interaction with the item in the UI.</p> <dt><code>onCreateContextMenu()</code></dt> <dd>From {@link android.view.View.OnCreateContextMenuListener}. This is called when a Context Menu is being built (as the result of a sustained "long click"). See the discussion - on context menus in <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Creating Menus</a> for more information.</dd> + on context menus in the <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Menus</a> + developer guide.</dd> </dl> <p>These methods are the sole inhabitants of their respective interface. To define one of these methods @@ -159,8 +160,9 @@ default event handler in the View. So be certain that you want to terminate the <p>If you're building a custom component from View, then you'll be able to define several callback methods used as default event handlers. -In the document on <a href="{@docRoot}guide/topics/ui/custom-components.html">Building Custom Components</a>, -you'll learn see some of the common callbacks used for event handling, including:</p> +In the document about <a href="{@docRoot}guide/topics/ui/custom-components.html">Custom +Components</a>, you'll learn see some of the common callbacks used for event handling, +including:</p> <ul> <li><code>{@link android.view.View#onKeyDown}</code> - Called when a new key event occurs.</li> <li><code>{@link android.view.View#onKeyUp}</code> - Called when a key up event occurs.</li> diff --git a/docs/html/guide/tutorials/notepad/notepad-ex2.jd b/docs/html/guide/tutorials/notepad/notepad-ex2.jd index 854731f..fed40ab 100644 --- a/docs/html/guide/tutorials/notepad/notepad-ex2.jd +++ b/docs/html/guide/tutorials/notepad/notepad-ex2.jd @@ -299,7 +299,8 @@ case ACTIVITY_EDIT: in real Android applications.</p> <p>Creating a good UI is part art and part science, and the rest is work. Mastery of <a - href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a> is an essential part of creating + href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a> is an essential part of +creating a good looking Android application.</p> <p>Take a look at the <a href="{@docRoot}resources/tutorials/views/index.html">Hello Views</a> diff --git a/docs/html/resources/faq/commontasks.jd b/docs/html/resources/faq/commontasks.jd index b211db0..c72343a 100644 --- a/docs/html/resources/faq/commontasks.jd +++ b/docs/html/resources/faq/commontasks.jd @@ -268,7 +268,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data){ {@link android.app.Activity#finishActivity(int) Activity.finishActivity()} on any screens that it opens to close them. </p> <a name="listening" id="listening"></a><h2>Listening for Button Clicks</h2> -<p>Button click and other UI event capturing are covered in <a href="{@docRoot}guide/topics/ui/ui-events.html">Handling UI Events</a> on the UI Design page.</p> +<p>Button click and other UI event capturing are covered in <a +href="{@docRoot}guide/topics/ui/ui-events.html">Input Events</a>.</p> <a name="configurewindowproperties" id="configurewindowproperties"></a><h2>Configuring General Window Properties</h2> <p>You can set a number of general window properties, such as whether to display a title, whether the window is floating, and whether it displays an icon, by @@ -543,7 +544,7 @@ focus to the notification before they can interact with it.</p> which enables a dialog box with an embedded progress bar to send a "I'm working on it" notification to the user. </p> <a name="addmenuitems" id="addmenuitems"></a><h2>Adding Items to the Screen Menu</h2> -<p>See <a href="{@docRoot}guide/topics/ui/menus.html">Creating Menus</a>.</p> +<p>See <a href="{@docRoot}guide/topics/ui/menus.html">Menus</a>.</p> <a name="webpage" id="webpage"></a><h2>Display a Web Page</h2> <p>Use the {@link android.webkit.WebView webkit.WebView} object. </p> diff --git a/docs/html/resources/tutorials/notepad/notepad-ex2.jd b/docs/html/resources/tutorials/notepad/notepad-ex2.jd index 499b796..7e3288f 100644 --- a/docs/html/resources/tutorials/notepad/notepad-ex2.jd +++ b/docs/html/resources/tutorials/notepad/notepad-ex2.jd @@ -299,7 +299,8 @@ case ACTIVITY_EDIT: in real Android applications.</p> <p>Creating a good UI is part art and part science, and the rest is work. Mastery of <a - href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a> is an essential part of creating + href="{@docRoot}guide/topics/ui/declaring-layout.html">XML Layouts</a> is an essential part of +creating a good looking Android application.</p> <p>Take a look at the <a href="{@docRoot}resources/tutorials/views/index.html">Hello Views</a> |