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

Commit d427047d authored by Filip Gruszczynski's avatar Filip Gruszczynski Committed by Android (Google) Code Review
Browse files

Merge "Remove Window.setDecorView API."

parents 4b97eecf 9b81e406

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -41844,8 +41844,6 @@ package android.view { 
    method public abstract void setContentView(int);

    method public abstract void setContentView(android.view.View);

    method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);

    method public abstract void setDecorView(android.view.View);

    method public abstract void setDecorView(int);

    method protected void setDefaultWindowFormat(int);

    method public void setDimAmount(float);

    method public void setElevation(float);

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -44177,8 +44177,6 @@ package android.view { 
    method public abstract void setContentView(int);

    method public abstract void setContentView(android.view.View);

    method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);

    method public abstract void setDecorView(android.view.View);

    method public abstract void setDecorView(int);

    method protected void setDefaultWindowFormat(int);

    method public void setDimAmount(float);

    method public void setDisableWallpaperTouchEvents(boolean);

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -41846,8 +41846,6 @@ package android.view { 
    method public abstract void setContentView(int);

    method public abstract void setContentView(android.view.View);

    method public abstract void setContentView(android.view.View, android.view.ViewGroup.LayoutParams);

    method public abstract void setDecorView(android.view.View);

    method public abstract void setDecorView(int);

    method protected void setDefaultWindowFormat(int);

    method public void setDimAmount(float);

    method public void setElevation(float);

core/java/android/view/Window.java

+2 −21
Original line number Diff line number Diff line
@@ -1157,27 +1157,6 @@ public abstract class Window { 
     */

    public abstract void setContentView(View view);



    /**

     * Install a view in the decoration (title) area, to be shown when

     * the window is in multi-window mode. This view will be placed

     * next to the window controls.

     *

     * The view may be restored to defaults by passing null.

     *

     * @param view The desired view to display in window decorations.

     */

    public abstract void setDecorView(View view);



    /**

     * Convenience for

     * {@link #setDecorView(View)}

     * to set the custom window decoration from a layout resource. The layout will be inflated

     * adding all top level views to the decoration

     *

     * @param layoutResID Resource ID to be inflated.

     */

    public abstract void setDecorView(@LayoutRes int layoutResID);



    /**

     * Set the screen content to an explicit view.  This view is placed

     * directly into the screen's view hierarchy.  It can itself be a complex
@@ -2060,4 +2039,6 @@ public abstract class Window { 
    public boolean getOverlayDecorCaption() {

        return mOverlayWithDecorCaption;

    }





}

core/java/com/android/internal/policy/PhoneWindow.java

+0 −24
Original line number Diff line number Diff line
@@ -422,30 +422,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        }

    }



    @Override

    public void setDecorView(int layoutResID) {

        View v = mLayoutInflater.inflate(layoutResID, null);

        setDecorView(v);

    }



    @Override

    public void setDecorView(View view) {

        if (mContentParent == null) {

            installDecor();

        }



        LinearLayout clientDecorPlaceholder =

                (LinearLayout) findViewById(R.id.client_decor_placeholder);



        if (clientDecorPlaceholder != null) {

            clientDecorPlaceholder.removeAllViews();



            if (view != null) {

                clientDecorPlaceholder.addView(view);

            }

        }

    }



    @Override

    public void addContentView(View view, ViewGroup.LayoutParams params) {

        if (mContentParent == null) {