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

Commit 1e9e53ec authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 0a43f67e to master"

parents 3807cf79 bae2fe87

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -3768,6 +3768,7 @@ package android.app { 
  public static class Notification.BigPictureStyle extends android.app.Notification.Style {

    ctor public Notification.BigPictureStyle();

    ctor public Notification.BigPictureStyle(android.app.Notification.Builder);

    method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap);

    method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap);

    method public android.app.Notification build();

    method public android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence);
@@ -28265,7 +28266,9 @@ package android.widget { 
    method public void setTextViewCompoundDrawables(int, int, int, int, int);

    method public void setTextViewCompoundDrawablesRelative(int, int, int, int, int);

    method public void setTextViewText(int, java.lang.CharSequence);

    method public void setTextViewTextSize(int, int, float);

    method public void setUri(int, java.lang.String, android.net.Uri);

    method public void setViewPadding(int, int, int, int, int);

    method public void setViewVisibility(int, int);

    method public void showNext(int);

    method public void showPrevious(int);

core/java/android/app/Notification.java

+0 −1
Original line number Diff line number Diff line
@@ -1733,7 +1733,6 @@ public class Notification implements Parcelable 
        }



        /**

         * @hide

         * Override the large icon when the big notification is shown.

         */

        public BigPictureStyle bigLargeIcon(Bitmap b) {

core/java/android/widget/RemoteViews.java

+4 −2
Original line number Diff line number Diff line
@@ -1631,7 +1631,6 @@ public class RemoteViews implements Parcelable, Filter { 
    }



    /**

     * @hide

     * Equivalent to calling {@link TextView#setTextSize(int, float)}

     * 

     * @param viewId The id of the view whose text size should change
@@ -1665,7 +1664,11 @@ public class RemoteViews implements Parcelable, Filter { 
     * layout direction), or 0

     * @param top The id of a drawable to place above the text, or 0

     * @param end The id of a drawable to place after the text, or 0

<<<<<<< HEAD

     * @param bottom The id of a drawable to place below the text, or 0 

=======

     * @param bottom The id of a drawable to place below the text, or 0

>>>>>>> 0a43f67e

     */

    public void setTextViewCompoundDrawablesRelative(int viewId, int start, int top, int end, int bottom) {

        addAction(new TextViewDrawableAction(viewId, true, start, top, end, bottom));
@@ -1901,7 +1904,6 @@ public class RemoteViews implements Parcelable, Filter { 
    }



    /**

     * @hide

     * Equivalent to calling {@link View#setPadding(int, int, int, int)}.

     *

     * @param viewId The id of the view to change