5 files changed, 21 insertions, 21 deletions
diff --git a/core/java/android/view/Gravity.java b/core/java/android/view/Gravity.java
index 36d8ce6..cf79638 100644
--- a/core/java/android/view/Gravity.java
+++ b/core/java/android/view/Gravity.java
@@ -231,7 +231,7 @@ public class Gravity
     }
 
     /**
-     * Apply addition gravity behavior based on the overall "display" that an
+     * Apply additional gravity behavior based on the overall "display" that an
      * object exists in.  This can be used after
      * {@link #apply(int, int, int, Rect, int, int, Rect)} to place the object
      * within a visible display.  By default this moves or clips the object
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 4a9356a..0a84aa0 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7458,7 +7458,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback {
     }
 
     /**
-     * Provide haptic feedback to the user for this view.
+     * BZZZTT!!1!
+     * 
+     * <p>Provide haptic feedback to the user for this view.
      *
      * <p>The framework will provide haptic feedback for some built in actions,
      * such as long presses, but you may wish to provide feedback for your
@@ -7475,7 +7477,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback {
     }
 
     /**
-     * Like {@link #performHapticFeedback(int)}, with additional options.
+     * BZZZTT!!1!
+     * 
+     * <p>Like {@link #performHapticFeedback(int)}, with additional options.
      *
      * @param feedbackConstant One of the constants defined in
      * {@link HapticFeedbackConstants}
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java
index d3f48c6..8e1524b 100644
--- a/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@ -267,7 +267,6 @@ public class ViewConfiguration {
      * @return the duration in milliseconds between the first tap's up event and
      * the second tap's down event for an interaction to be considered a
      * double-tap.
-     * @hide pending API council
      */
     public static int getDoubleTapTimeout() {
         return DOUBLE_TAP_TIMEOUT;
@@ -324,7 +323,6 @@ public class ViewConfiguration {
     /**
      * @return Distance between the first touch and second touch to still be
      *         considered a double tap
-     * @hide pending API council
      */
     public int getScaledDoubleTapSlop() {
         return mDoubleTapSlop;
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java
index c1e9ed8..367c9a2 100644
--- a/core/java/android/view/ViewDebug.java
+++ b/core/java/android/view/ViewDebug.java
@@ -186,9 +186,7 @@ public class ViewDebug {
     /**
      * This annotation can be used to mark fields and methods to be dumped when
      * the view is captured. Methods with this annotation must have no arguments
-     * and must return <some type of data>.
-     * 
-     * @hide pending API Council approval
+     * and must return a valid type of data.
      */
     @Target({ ElementType.FIELD, ElementType.METHOD })
     @Retention(RetentionPolicy.RUNTIME)
@@ -1345,13 +1343,11 @@ public class ViewDebug {
     }
     
     /**
-     * dump view info for id based instrument test generation 
+     * Dump view info for id based instrument test generation 
      * (and possibly further data analysis). The results are dumped
      * to the log. 
      * @param tag for log
      * @param view for dump
-     * 
-     * @hide pending API Council approval
      */
     public static void dumpCapturedView(String tag, Object view) {        
         Class<?> klass = view.getClass();
diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java
index 4230afa..26e5cbc 100644
--- a/core/java/android/view/ViewTreeObserver.java
+++ b/core/java/android/view/ViewTreeObserver.java
@@ -102,8 +102,6 @@ public final class ViewTreeObserver {
     /**
      * Interface definition for a callback to be invoked when
      * something in the view tree has been scrolled.
-     * 
-     * @hide pending API council approval
      */
     public interface OnScrollChangedListener {
         /**
@@ -115,7 +113,9 @@ public final class ViewTreeObserver {
 
     /**
      * Parameters used with OnComputeInternalInsetsListener.
-     * {@hide pending API Council approval}
+     * 
+     * We are not yet ready to commit to this API and support it, so
+     * @hide
      */
     public final static class InternalInsetsInfo {
         /**
@@ -200,7 +200,9 @@ public final class ViewTreeObserver {
     /**
      * Interface definition for a callback to be invoked when layout has
      * completed and the client can compute its interior insets.
-     * {@hide pending API Council approval}
+     * 
+     * We are not yet ready to commit to this API and support it, so
+     * @hide
      */
     public interface OnComputeInternalInsetsListener {
         /**
@@ -381,8 +383,6 @@ public final class ViewTreeObserver {
      * @param listener The callback to add
      *
      * @throws IllegalStateException If {@link #isAlive()} returns false
-     *
-     * @hide pending API council approval
      */
     public void addOnScrollChangedListener(OnScrollChangedListener listener) {
         checkIsAlive();
@@ -402,8 +402,6 @@ public final class ViewTreeObserver {
      * @throws IllegalStateException If {@link #isAlive()} returns false
      *
      * @see #addOnScrollChangedListener(OnScrollChangedListener)
-     *
-     * @hide pending API council approval
      */
     public void removeOnScrollChangedListener(OnScrollChangedListener victim) {
         checkIsAlive();
@@ -454,7 +452,9 @@ public final class ViewTreeObserver {
      * @param listener The callback to add
      *
      * @throws IllegalStateException If {@link #isAlive()} returns false
-     * {@hide pending API Council approval}
+     * 
+     * We are not yet ready to commit to this API and support it, so
+     * @hide
      */
     public void addOnComputeInternalInsetsListener(OnComputeInternalInsetsListener listener) {
         checkIsAlive();
@@ -475,7 +475,9 @@ public final class ViewTreeObserver {
      * @throws IllegalStateException If {@link #isAlive()} returns false
      *
      * @see #addOnComputeInternalInsetsListener(OnComputeInternalInsetsListener)
-     * {@hide pending API Council approval}
+     * 
+     * We are not yet ready to commit to this API and support it, so
+     * @hide
      */
     public void removeOnComputeInternalInsetsListener(OnComputeInternalInsetsListener victim) {
         checkIsAlive();