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

Commit b63d3c3a authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Empty implementations of new ActionBar methods."

parents b6e43268 0145322e

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2452,8 +2452,8 @@ package android.app { 
    method public abstract void setLogo(android.graphics.drawable.Drawable);

    method public abstract void setNavigationMode(int);

    method public abstract void setSelectedNavigationItem(int);

    method public abstract void setSplitBackgroundDrawable(android.graphics.drawable.Drawable);

    method public abstract void setStackedBackgroundDrawable(android.graphics.drawable.Drawable);

    method public void setSplitBackgroundDrawable(android.graphics.drawable.Drawable);

    method public void setStackedBackgroundDrawable(android.graphics.drawable.Drawable);

    method public abstract void setSubtitle(java.lang.CharSequence);

    method public abstract void setSubtitle(int);

    method public abstract void setTitle(java.lang.CharSequence);

core/java/android/app/ActionBar.java

+2 −2
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ public abstract class ActionBar { 
     *

     * @param d Background drawable for the stacked row

     */

    public abstract void setStackedBackgroundDrawable(Drawable d);

    public void setStackedBackgroundDrawable(Drawable d) { }



    /**

     * Set the ActionBar's split background. This will appear in
@@ -426,7 +426,7 @@ public abstract class ActionBar { 
     *

     * @param d Background drawable for the split bar

     */

    public abstract void setSplitBackgroundDrawable(Drawable d);

    public void setSplitBackgroundDrawable(Drawable d) { }



    /**

     * @return The current custom view.