Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev

This commit is contained in:
Fabrice Di Meglio
2012-10-18 16:20:35 -07:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 1 deletions

View File

@@ -25642,7 +25642,6 @@ package android.view {
method public void requestDisallowInterceptTouchEvent(boolean);
method public boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
method public void requestTransparentRegion(android.view.View);
method public void resolveLayoutParams();
method public void scheduleLayoutAnimation();
method public void setAddStatesFromChildren(boolean);
method public void setAlwaysDrawnWithCacheEnabled(boolean);

View File

@@ -5358,6 +5358,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
}
}
/**
* @hide
*/
@Override
public void resolveLayoutParams() {
super.resolveLayoutParams();