summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-04-16 16:28:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-16 16:28:16 -0700
commit455cfc8dca10aa3f500ed54e9a4796d91f66fea7 (patch)
tree3e00ae246fbbd9669eeebd03d5bbe25bd38228c1
parent9704e78418a1ed9927ac2596a5c0084953dcb22b (diff)
parentfcc6a0f145fa721e3feee70bedf8e120fcc4c494 (diff)
downloadframeworks_base-455cfc8dca10aa3f500ed54e9a4796d91f66fea7.zip
frameworks_base-455cfc8dca10aa3f500ed54e9a4796d91f66fea7.tar.gz
frameworks_base-455cfc8dca10aa3f500ed54e9a4796d91f66fea7.tar.bz2
Merge "Minor doc fix."
-rw-r--r--core/java/android/view/ViewGroup.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 5e02b49..0b973e5 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -4449,8 +4449,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* Returns the basis of alignment during the layout of this view group:
* either {@link #COMPONENT_BOUNDS} or {@link #LAYOUT_BOUNDS}.
*
- * @return whether or not this view group should use the component or layout bounds during
- * layout operations
+ * @return the layout mode to use during layout operations
*
* @see #setLayoutMode(int)
*/
@@ -4479,8 +4478,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* value is {@link #LAYOUT_BOUNDS} for target SDK's greater than JellyBean,
* {@link #LAYOUT_BOUNDS} otherwise.
*
- * @return whether or not this view group should use the component or layout bounds during
- * layout operations
+ * @param layoutMode the layout mode to use during layout operations
*
* @see #getLayoutMode()
*/