Fix the SDK buildandroid-sdk-2.0.1_r1

Eliminate @link references to now hidden APIs. This involved mostly
reverting the docs to their 5.xml state.

One special case involved bringing
ViewGroup#FLAG_USE_CHILD_DRAWING_ORDER back into 5.xml (it was removed
from 5.xml after SDK 5 was released) 6.xml and current.xml, since it
will be needed until replacement APIs are published in 7.xml as part of
2.1

6 files changed, 38 insertions, 9 deletions

diff --git a/api/5.xml b/api/5.xml
index 73df0cbd1944..614804708a48 100644
--- a/api/5.xml
+++ b/api/5.xml
@@ -162357,6 +162357,17 @@
  visibility="protected"
 >
 </field>
+<field name="FLAG_USE_CHILD_DRAWING_ORDER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1024"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</field>
 <field name="FOCUS_AFTER_DESCENDANTS"
  type="int"
  transient="false"
diff --git a/api/6.xml b/api/6.xml
index a4103fdf005e..ad7d44a00154 100644
--- a/api/6.xml
+++ b/api/6.xml
@@ -162438,6 +162438,17 @@
  visibility="protected"
 >
 </field>
+<field name="FLAG_USE_CHILD_DRAWING_ORDER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1024"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</field>
 <field name="FOCUS_AFTER_DESCENDANTS"
  type="int"
  transient="false"
diff --git a/api/current.xml b/api/current.xml
index a4103fdf005e..ad7d44a00154 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -162438,6 +162438,17 @@
  visibility="protected"
 >
 </field>
+<field name="FLAG_USE_CHILD_DRAWING_ORDER"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="1024"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="protected"
+>
+</field>
 <field name="FOCUS_AFTER_DESCENDANTS"
  type="int"
  transient="false"
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 694c1acac3ff..db2e45cf6a39 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1280,8 +1280,8 @@ public class Intent implements Parcelable {
      * the package.
      * <ul>
      * <li> {@link #EXTRA_UID} containing the integer uid assigned to the package.
-     * <li> {@link #EXTRA_CHANGED_COMPONENT_NAME_LIST} containing the class name
-     * of the changed components.
+     * <li> {@link #EXTRA_CHANGED_COMPONENT_NAME} containing the class name of the
+     * changed component.
      * <li> {@link #EXTRA_DONT_KILL_APP} containing boolean field to override the
      * default action of restarting the application.
      * </ul>
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 8a3f5d19c198..182212c8ae04 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -151,7 +151,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * When set, the drawing method will call {@link #getChildDrawingOrder(int, int)}
      * to get the index of the child to draw for that iteration.
      * 
-     * @hide
      */
     protected static final int FLAG_USE_CHILD_DRAWING_ORDER = 0x400;
 
@@ -1309,14 +1308,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
      * if you want to change the drawing order of children. By default, it
      * returns i.
      * <p>
-     * NOTE: In order for this method to be called, you must enable child ordering
-     * first by calling {@link #setChildrenDrawingOrderEnabled(boolean)}.
+     * NOTE: In order for this method to be called, the
+     * {@link #FLAG_USE_CHILD_DRAWING_ORDER} must be set.
      *
      * @param i The current iteration.
      * @return The index of the child to draw this iteration.
-     * 
-     * @see #setChildrenDrawingOrderEnabled(boolean)
-     * @see #isChildrenDrawingOrderEnabled()
      */
     protected int getChildDrawingOrder(int childCount, int i) {
         return i;
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 175d7493ed12..69896c9e6322 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -3471,7 +3471,7 @@
          referenced from its
          {@link android.service.wallpaper.WallpaperService#SERVICE_META_DATA}
          meta-data entry.  Described here are the attributes that can be
-         included in that tag. -->
+         included in that tag. @hide -->
     <declare-styleable name="Wallpaper">
         <!-- Component name of an activity that allows the user to modify
              the current settings for this wallpaper. -->