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

Commit 482b34a6 authored by Romain Guy's avatar Romain Guy
Browse files

Documentation fix. 

Activity's documentation wasn't clear on what would happen when
calling setContentView(View).

Change-Id: I37be6565ba897694460c80a39562346293faa8ea
parent ed8f8dd8

core/java/android/app/Activity.java

+17 −3
Original line number Diff line number Diff line
@@ -1764,6 +1764,9 @@ public class Activity extends ContextThemeWrapper 
     * inflated, adding all top-level views to the activity.

     *

     * @param layoutResID Resource ID to be inflated.

     * 

     * @see #setContentView(android.view.View)

     * @see #setContentView(android.view.View, android.view.ViewGroup.LayoutParams)

     */

    public void setContentView(int layoutResID) {

        getWindow().setContentView(layoutResID);
@@ -1773,9 +1776,17 @@ public class Activity extends ContextThemeWrapper 
    /**

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

     * directly into the activity's view hierarchy.  It can itself be a complex

     * view hierarhcy.

     * view hierarchy.  When calling this method, the layout parameters of the

     * specified view are ignored.  Both the width and the height of the view are

     * set by default to {@link ViewGroup.LayoutParams#MATCH_PARENT}. To use

     * your own layout parameters, invoke

     * {@link #setContentView(android.view.View, android.view.ViewGroup.LayoutParams)}

     * instead.

     * 

     * @param view The desired content to display.

     *

     * @see #setContentView(int)

     * @see #setContentView(android.view.View, android.view.ViewGroup.LayoutParams)

     */

    public void setContentView(View view) {

        getWindow().setContentView(view);
@@ -1785,10 +1796,13 @@ public class Activity extends ContextThemeWrapper 
    /**

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

     * directly into the activity's view hierarchy.  It can itself be a complex

     * view hierarhcy.

     * view hierarchy.

     * 

     * @param view The desired content to display.

     * @param params Layout parameters for the view.

     *

     * @see #setContentView(android.view.View)

     * @see #setContentView(int)

     */

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

        getWindow().setContentView(view, params);