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

Commit 1241652d authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Ensure PiP test apis are marked as TestApi"

parents c5101b30 37b99ba2

api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,12 @@ package android.app { 
    method public android.content.ComponentName getEffectsSuppressor();

  }



  public final class PictureInPictureParams implements android.os.Parcelable {

    method public java.util.List<android.app.RemoteAction> getActions();

    method public float getAspectRatio();

    method public android.graphics.Rect getSourceRectHint();

  }



  public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener {

    method public android.widget.TimePicker getTimePicker();

  }

config/hiddenapi-light-greylist.txt

+0 −3
Original line number Diff line number Diff line
@@ -857,9 +857,6 @@ Landroid/app/PendingIntent;->setOnMarshaledListener(Landroid/app/PendingIntent$O 
Landroid/app/PictureInPictureArgs;-><init>()V

Landroid/app/PictureInPictureArgs;->setActions(Ljava/util/List;)V

Landroid/app/PictureInPictureArgs;->setAspectRatio(F)V

Landroid/app/PictureInPictureParams;->getActions()Ljava/util/List;

Landroid/app/PictureInPictureParams;->getAspectRatio()F

Landroid/app/PictureInPictureParams;->getSourceRectHint()Landroid/graphics/Rect;

Landroid/app/Presentation;->createPresentationContext(Landroid/content/Context;Landroid/view/Display;I)Landroid/content/Context;

Landroid/app/ProgressDialog;->mMessageView:Landroid/widget/TextView;

Landroid/app/ProgressDialog;->mProgress:Landroid/widget/ProgressBar;

core/java/android/app/PictureInPictureParams.java

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app;



import android.annotation.Nullable;

import android.annotation.TestApi;

import android.graphics.Rect;

import android.os.Parcel;

import android.os.Parcelable;
@@ -181,6 +182,7 @@ public final class PictureInPictureParams implements Parcelable { 
     * @return the aspect ratio. If none is set, return 0.

     * @hide

     */

    @TestApi

    public float getAspectRatio() {

        if (mAspectRatio != null) {

            return mAspectRatio.floatValue();
@@ -205,6 +207,7 @@ public final class PictureInPictureParams implements Parcelable { 
     * @return the set of user actions.

     * @hide

     */

    @TestApi

    public List<RemoteAction> getActions() {

        return mUserActions;

    }
@@ -231,6 +234,7 @@ public final class PictureInPictureParams implements Parcelable { 
     * @return the source rect hint

     * @hide

     */

    @TestApi

    public Rect getSourceRectHint() {

        return mSourceRectHint;

    }