commit 2a52d26c0b917de8b1e4d20ebad87b9b3825f6ca
author Philip Milne <pmilne@google.com> Mon May 07 13:09:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 07 13:09:14 2012 -0700
tree b6c99e47f0f59411a5b6e933be78427bf7f1ab4b
parent 503b2e5ae1b83e5595b47a8d376db6b89b059b87
parent 7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0

am 7bb66c9c: Hide optical bounds feature for JB.

* commit '7bb66c9cae7847e3d58f412a73d54ee5d4bcaba0':
  Hide optical bounds feature for JB.

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 300a690..848d563 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -24594,7 +24594,6 @@
     method public android.view.View getFocusedChild();
     method public android.view.animation.LayoutAnimationController getLayoutAnimation();
     method public android.view.animation.Animation.AnimationListener getLayoutAnimationListener();
-    method public int getLayoutMode();
     method public android.animation.LayoutTransition getLayoutTransition();
     method public int getPersistentDrawingCache();
     method public int indexOfChild(android.view.View);
@@ -24642,7 +24641,6 @@
     method public void setDescendantFocusability(int);
     method public void setLayoutAnimation(android.view.animation.LayoutAnimationController);
     method public void setLayoutAnimationListener(android.view.animation.Animation.AnimationListener);
-    method public void setLayoutMode(int);
     method public void setLayoutTransition(android.animation.LayoutTransition);
     method public void setMotionEventSplittingEnabled(boolean);
     method public void setOnHierarchyChangeListener(android.view.ViewGroup.OnHierarchyChangeListener);
@@ -24654,12 +24652,10 @@
     method public void startLayoutAnimation();
     method public void startViewTransition(android.view.View);
     method public void updateViewLayout(android.view.View, android.view.ViewGroup.LayoutParams);
-    field public static final int CLIP_BOUNDS = 0; // 0x0
     field protected static final int CLIP_TO_PADDING_MASK = 34; // 0x22
     field public static final int FOCUS_AFTER_DESCENDANTS = 262144; // 0x40000
     field public static final int FOCUS_BEFORE_DESCENDANTS = 131072; // 0x20000
     field public static final int FOCUS_BLOCK_DESCENDANTS = 393216; // 0x60000
-    field public static final int OPTICAL_BOUNDS = 1; // 0x1
     field public static final int PERSISTENT_ALL_CACHES = 3; // 0x3
     field public static final int PERSISTENT_ANIMATION_CACHE = 1; // 0x1
     field public static final int PERSISTENT_NO_CACHE = 0; // 0x0

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index a5ae248..29613d5 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -348,6 +348,8 @@
      * This constant is a {@link #setLayoutMode(int) layoutMode}.
      * Clip bounds are the raw values of {@link #getLeft() left}, {@link #getTop() top},
      * {@link #getRight() right} and {@link #getBottom() bottom}.
+     *
+     * @hide
      */
     public static final int CLIP_BOUNDS = 0;
 
@@ -356,6 +358,8 @@
      * Optical bounds describe where a widget appears to be. They sit inside the clip
      * bounds which need to cover a larger area to allow other effects,
      * such as shadows and glows, to be drawn.
+     *
+     * @hide
      */
     public static final int OPTICAL_BOUNDS = 1;
 
@@ -4539,6 +4543,8 @@
      * @return the layout mode to use during layout operations
      *
      * @see #setLayoutMode(int)
+     *
+     * @hide
      */
     public int getLayoutMode() {
         return mLayoutMode;
@@ -4553,6 +4559,8 @@
      * @param layoutMode the layout mode to use during layout operations
      *
      * @see #getLayoutMode()
+     *
+     * @hide
      */
     public void setLayoutMode(int layoutMode) {
         if (mLayoutMode != layoutMode) {