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

Commit 1462ddcb authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 56ac0185: Change parameter name for Activity#setActionBar 

* commit '56ac018506f527ecd6b7a76adf824066371aa4fa':
  Change parameter name for Activity#setActionBar
parents ba7c2f70 37780146

core/java/android/app/Activity.java

+3 −3
Original line number Diff line number Diff line
@@ -2075,15 +2075,15 @@ public class Activity extends ContextThemeWrapper 
     * <p>In order to use a Toolbar within the Activity's window content the application

     * must not request the window feature {@link Window#FEATURE_ACTION_BAR FEATURE_ACTION_BAR}.</p>

     *

     * @param actionBar Toolbar to set as the Activity's action bar

     * @param toolbar Toolbar to set as the Activity's action bar

     */

    public void setActionBar(@Nullable Toolbar actionBar) {

    public void setActionBar(@Nullable Toolbar toolbar) {

        if (getActionBar() instanceof WindowDecorActionBar) {

            throw new IllegalStateException("This Activity already has an action bar supplied " +

                    "by the window decor. Do not request Window.FEATURE_ACTION_BAR and set " +

                    "android:windowActionBar to false in your theme to use a Toolbar instead.");

        }

        mActionBar = new ToolbarActionBar(actionBar);

        mActionBar = new ToolbarActionBar(toolbar);

    }

    

    /**