Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()" am: 7160459

Browse Source 
am: ae975ab

* commit 'ae975aba7372b18cbf7f30cdc4b74cff32cc3558':
  Fix javadoc for View.getMeasuredHeight() and View.getMeasuredHeightAndState()

Change-Id: I565ec862ff883bac9894aeec6fc63b7ce323e00c
This commit is contained in:
Markus Michler
2016-03-29 18:34:03 +00:00
committed by android-build-merger
parent ade7fbb0a1 ae975aba73
commit e113d6a669
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -11668,7 +11668,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/** /**
* Like {@link #getMeasuredHeightAndState()}, but only returns the * Like {@link #getMeasuredHeightAndState()}, but only returns the
* raw width component (that is the result is masked by * raw height component (that is the result is masked by
* {@link #MEASURED_SIZE_MASK}). * {@link #MEASURED_SIZE_MASK}).
* *
* @return The raw measured height of this view. * @return The raw measured height of this view.
@@ -11684,7 +11684,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* This should be used during measurement and layout calculations only. Use * This should be used during measurement and layout calculations only. Use
* {@link #getHeight()} to see how wide a view is after layout. * {@link #getHeight()} to see how wide a view is after layout.
* *
* @return The measured width of this view as a bit mask. * @return The measured height of this view as a bit mask.
*/ */
@ViewDebug.ExportedProperty(category = "measurement", flagMapping = { @ViewDebug.ExportedProperty(category = "measurement", flagMapping = {
@ViewDebug.FlagToString(mask = MEASURED_STATE_MASK, equals = MEASURED_STATE_TOO_SMALL, @ViewDebug.FlagToString(mask = MEASURED_STATE_MASK, equals = MEASURED_STATE_TOO_SMALL,