diff --git a/docs/html/guide/developing/projects/projects-cmdline.jd b/docs/html/guide/developing/projects/projects-cmdline.jd index 08e0d9a16a8f3..81c2c584e45eb 100644 --- a/docs/html/guide/developing/projects/projects-cmdline.jd +++ b/docs/html/guide/developing/projects/projects-cmdline.jd @@ -114,7 +114,7 @@ android create project \
Caution: You should refrain from moving the location of the
SDK directory, because this will break the SDK location property located in local.properties.
If you need to update the SDK location, use the android update project command.
- See Updating a Project for more information.
Figure 5. Comparison of pre-scaled and auto-scaled bitmaps, from +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html"> ApiDemos.
@@ -1150,7 +1150,7 @@ subtle, because all of the bitmaps are being scaled to match the current screen scaled bitmaps have slightly different appearances depending on whether they are pre-scaled or auto-scaled at draw time. You can find the source code for this sample application, which demonstrates using pre-scaled and auto-scaled bitmaps, in +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/DensityActivity.html"> ApiDemos.Note: In Android 3.0 and above, there should be no perceivable diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd index 7dddd9acc7ef5..7bbf5e65948d1 100644 --- a/docs/html/guide/topics/admin/device-admin.jd +++ b/docs/html/guide/topics/admin/device-admin.jd @@ -619,8 +619,8 @@ long pwExpiration; mDPM.setPasswordExpirationTimeout(mDeviceAdminSample, pwExpiration); -
From the Device Administration API sample, here is the code +
From the Device Administration API sample, here is the code that updates the password expiration status:
diff --git a/docs/html/guide/topics/fundamentals/loaders.jd b/docs/html/guide/topics/fundamentals/loaders.jd
index d31f0905dfe76..3aad2046771d8 100644
--- a/docs/html/guide/topics/fundamentals/loaders.jd
+++ b/docs/html/guide/topics/fundamentals/loaders.jd
@@ -32,7 +32,8 @@ parent.link=activities.html
Related samples
- FragmentListCursorLoader
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LoaderCursor.html">
+LoaderCursor
-
LoaderThrottle
@@ -485,7 +486,9 @@ public static class CursorLoaderListFragment extends ListFragment
There are a few different samples in ApiDemos that
illustrate how to use loaders:
- - FragmentListCursorLoader — A complete version of the
+
-
+LoaderCursor — A complete version of the
snippet shown above.
- LoaderThrottle — An example of how to use throttling to
reduce the number of queries a content provider does then its data changes.
diff --git a/docs/html/guide/topics/graphics/2d-graphics.jd b/docs/html/guide/topics/graphics/2d-graphics.jd
index ac2b47c5c3c52..5abffb39cee80 100644
--- a/docs/html/guide/topics/graphics/2d-graphics.jd
+++ b/docs/html/guide/topics/graphics/2d-graphics.jd
@@ -188,7 +188,7 @@ browse the source in the Sample Cod
This document discusses the basics of using Drawable objects to draw graphics and how to use a
couple subclasses of the Drawable class. For information on using Drawables to do frame-by-frame
-animation, see Frame-by-Frame
+animation, see Drawable
Animation.
A {@link android.graphics.drawable.Drawable} is a general abstraction for "something that can be
diff --git a/docs/html/guide/topics/graphics/animation.jd b/docs/html/guide/topics/graphics/animation.jd
index e8996f69af8d1..561369d2fe862 100644
--- a/docs/html/guide/topics/graphics/animation.jd
+++ b/docs/html/guide/topics/graphics/animation.jd
@@ -6,7 +6,8 @@ page.title=Animation
See also
- - Property Animation
+ - Property
+Animation
- View Animation
- Drawable Animation
diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd
index ffa9a3900ee5d..ab623c2691000 100644
--- a/docs/html/guide/topics/graphics/index.jd
+++ b/docs/html/guide/topics/graphics/index.jd
@@ -5,7 +5,7 @@ page.title=Graphics
Topics
diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd
index 231f4efa59f82..6a2a20f13fb61 100644
--- a/docs/html/guide/topics/graphics/opengl.jd
+++ b/docs/html/guide/topics/graphics/opengl.jd
@@ -40,14 +40,11 @@ parent.link=index.html
Related samples
- - GLSurfaceViewActivity
- - GLES20Activity
- - TouchRotateActivity
- - Compressed Textures
+ - GLSurfaceViewActivity
+ - GLES20Activity
+ - TouchRotateActivity
+ - Compressed Textures
See also
@@ -94,8 +91,8 @@ understanding how to implement these classes in an activity should be your first
implement the touch listeners, as shown in OpenGL Tutorials for
ES 1.0,
ES 2.0 and the TouchRotateActivity sample.
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.html"
+>TouchRotateActivity sample.
- {@link android.opengl.GLSurfaceView.Renderer}
- This interface defines the methods required for drawing graphics in an OpenGL {@link
@@ -410,9 +407,8 @@ framework provides support for the ETC1 compression format as a standard feature
android.opengl.ETC1Util} utility class and the {@code etc1tool} compression tool (located in the
Android SDK at {@code <sdk>/tools/}). For an example of an Android application that uses
texture compression, see the CompressedTextureActivity code sample.
-
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/CompressedTextureActivity.html"
+>CompressedTextureActivity code sample.
To check if the ETC1 format is supported on a device, call the {@link
android.opengl.ETC1Util#isETC1Supported() ETC1Util.isETC1Supported()} method.
diff --git a/docs/html/guide/topics/renderscript/compute.jd b/docs/html/guide/topics/renderscript/compute.jd
index e4c22830fc329..8f08f595b0f10 100644
--- a/docs/html/guide/topics/renderscript/compute.jd
+++ b/docs/html/guide/topics/renderscript/compute.jd
@@ -1,6 +1,6 @@
page.title=Compute
parent.title=RenderScript
-parent.link=index.html
+parent.link=index.html
@jd:body
diff --git a/docs/html/guide/topics/renderscript/graphics.jd b/docs/html/guide/topics/renderscript/graphics.jd
index d8be85f124b13..3ea3f85841ddd 100644
--- a/docs/html/guide/topics/renderscript/graphics.jd
+++ b/docs/html/guide/topics/renderscript/graphics.jd
@@ -22,13 +22,13 @@ parent.link=index.html
- Balls
- - Fountain
+ - Fountain
- Hello
World
- - Samples
+ - Misc Samples
diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd
index 480ca7855f29b..eaa698fc45a7c 100644
--- a/docs/html/guide/topics/resources/animation-resource.jd
+++ b/docs/html/guide/topics/resources/animation-resource.jd
@@ -10,8 +10,8 @@ parent.link=available-resources.html
- Property Animation
- View Animation
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index 27409d59ed5d5..e06563d47d2bb 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -807,8 +807,8 @@ the Action
Bar developer guide.
Also see the Searchable Dictionary for an example implementation using
+href="{@docRoot}resources/samples/SearchableDictionary/src/com/example/android/searchabledict/SearchableDictionary.html"
+>Searchable Dictionary
for an example implementation using
both the dialog and the widget.
diff --git a/docs/html/guide/topics/usb/adk.jd b/docs/html/guide/topics/usb/adk.jd
index 120576bf5bc04..6c7ab0d80dd96 100644
--- a/docs/html/guide/topics/usb/adk.jd
+++ b/docs/html/guide/topics/usb/adk.jd
@@ -396,7 +396,7 @@ page.title=Android Open Accessory Development Kit
- Connect the ADK board (USB-A) to your Android-powered device (micro-USB). Ensure that the
power cable to the accessory is plugged in or that the micro-USB port on the accesory is
- connected to your computer for power (this also allows you to monitor the
+ connected to your computer for power (this also allows you to monitor the
ADK board). When connected, accept the prompt that asks for whether or not to open the
DemoKit application to connect to the accessory. If the prompt does not show up, connect and
reconnect the accessory.
@@ -625,8 +625,8 @@ void loop()
AndroidAccessory::isAccessoryDevice(). This method checks the vendor and product ID
of the device descriptor. A device in accessory mode has a vendor ID of 0x18D1 and a product ID
of 0x2D00 or 0x2D01. If the device is in accessory mode, then the ADK board can establish communication with the device. If not, the board attempts to start the device in accessory mode.
+ "#establish">establish communication with the device. If not, the board attempts to start the device in accessory mode.
bool AndroidAccessory::isConnected(void)
{
@@ -699,7 +699,7 @@ bool AndroidAccessory::switchDevice(byte addr)
If this method returns false, the board waits until a new device is connected. If it is
successful, the device displays itself on the USB bus as being in accessory mode when the ADK board
re-enumerates the bus. When the device is in accessory mode, the accessory then establishes communication with the device.
+"establish-adk">establishes communication with the device.
Establish communication with the device
diff --git a/docs/html/guide/topics/usb/index.jd b/docs/html/guide/topics/usb/index.jd
index 6dc8ec5d6e363..ef53bdf7c5db7 100644
--- a/docs/html/guide/topics/usb/index.jd
+++ b/docs/html/guide/topics/usb/index.jd
@@ -42,8 +42,8 @@ page.title=USB Host and Accessory
dependant on the device's hardware, regardless of platform level. You can filter for devices that
support USB host and accessory through a <uses-feature> element. See
- the USB accessory and host documentation for more details.
+ the USB accessory and host documentation for more details.
Debugging considerations
diff --git a/docs/html/sdk/android-4.0.jd b/docs/html/sdk/android-4.0.jd
index ade3d8b2e9e8c..4580986a65fcf 100644
--- a/docs/html/sdk/android-4.0.jd
+++ b/docs/html/sdk/android-4.0.jd
@@ -1196,8 +1196,10 @@ a narrow screen, so the system will place more of them into the overflow menu. H
allows you to enable “split action bar" so that more action items can appear on the screen in a
separate bar at the bottom of the screen. To enable split action bar, add {@link
android.R.attr#uiOptions android:uiOptions} with {@code "splitActionBarWhenNarrow"} to either your
-{@code <application>} tag or
-individual {@code <activity>} tags
+{@code <application>}
+tag or
+individual {@code
+<activity>} tags
in your manifest file. When enabled, the system will add an additional bar at the bottom of the
screen for all action items when the screen is narrow (no action items will appear in the primary
action bar).
@@ -1267,9 +1269,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
For an example using the {@link android.widget.ShareActionProvider}, see the ActionBarActionProviderActivity -class in ApiDemos.
+href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/ActionBarActionProviderActivity.html" +>ActionBarActionProviderActivity class in ApiDemos.For a demonstration of the new hover events, see the Hover class in +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/view/Hover.html">Hover class in ApiDemos.
@@ -1571,7 +1572,7 @@ android.view.MotionEvent#AXIS_DISTANCE}, {@link android.view.MotionEvent#AXIS_TI android.view.MotionEvent#AXIS_ORIENTATION}.For a demonstration of tool types, button states and the new axis codes, see the TouchPaint +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchPaint.html">TouchPaint class in ApiDemos.
@@ -1773,7 +1774,7 @@ operations. See the object (View, Drawable, Fragment, Object, or anything else) and define animation aspects such as duration, interpolation, repeat and more. The new framework makes Animations in Android simpler than ever. See the -Property Animation developer +Property Animation developer guide.