Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afb856f2 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

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

* commit '45c77ca0':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
parents 7fb1aac6 45c77ca0

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/view/ViewGroup.java

+3 −0
Original line number Diff line number Diff line
@@ -5358,6 +5358,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        }

    }



    /**

     * @hide

     */

    @Override

    public void resolveLayoutParams() {

        super.resolveLayoutParams();