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

Commit feccee99 authored by Aurimas Liutikas's avatar Aurimas Liutikas Committed by Android (Google) Code Review
Browse files

Merge "Remove old private constant from ResourceId."

parents 0f5eade4 d8ebfefc

core/java/android/app/AlertDialog.java

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.annotation.UnsupportedAppUsage; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.res.ResourceId;

import android.content.res.Resources;

import android.database.Cursor;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -465,7 +466,7 @@ public class AlertDialog extends Dialog implements DialogInterface { 
         * @param context the parent context

         */

        public Builder(Context context) {

            this(context, resolveDialogTheme(context, ResourceId.ID_NULL));

            this(context, resolveDialogTheme(context, Resources.ID_NULL));

        }



        /**

core/java/android/app/Dialog.java

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.content.ContextWrapper; 
import android.content.DialogInterface;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.content.res.ResourceId;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;
@@ -183,7 +183,7 @@ public class Dialog implements DialogInterface, Window.Callback, 


    Dialog(@NonNull Context context, @StyleRes int themeResId, boolean createContextThemeWrapper) {

        if (createContextThemeWrapper) {

            if (themeResId == ResourceId.ID_NULL) {

            if (themeResId == Resources.ID_NULL) {

                final TypedValue outValue = new TypedValue();

                context.getTheme().resolveAttribute(R.attr.dialogTheme, outValue, true);

                themeResId = outValue.resourceId;

core/java/android/content/pm/PermissionGroupInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class PermissionGroupInfo extends PackageItemInfo implements Parcelable { 
     * only access while in the foreground.

     *

     * From the "requestDetail" attribute or, if not set, {@link

     * android.content.res.ResourceId#ID_NULL}.

     * android.content.res.Resources#ID_NULL}.

     *

     * @hide

     */
@@ -61,7 +61,7 @@ public class PermissionGroupInfo extends PackageItemInfo implements Parcelable { 
     * access. Also used when requesting both foreground and background access.

     *

     * From the "backgroundRequest" attribute or, if not set, {@link

     * android.content.res.ResourceId#ID_NULL}.

     * android.content.res.Resources#ID_NULL}.

     *

     * @hide

     */
@@ -73,7 +73,7 @@ public class PermissionGroupInfo extends PackageItemInfo implements Parcelable { 
     * background access.

     *

     * From the "backgroundRequestDetail" attribute or, if not set, {@link

     * android.content.res.ResourceId#ID_NULL}.

     * android.content.res.Resources#ID_NULL}.

     *

     * @hide

     */

core/java/android/content/pm/SuspendDialogInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.content.pm;



import static android.content.res.ResourceId.ID_NULL;

import static android.content.res.Resources.ID_NULL;



import android.annotation.DrawableRes;

import android.annotation.NonNull;

core/java/android/content/res/ResourceId.java

+0 −6
Original line number Diff line number Diff line
@@ -22,12 +22,6 @@ import android.annotation.AnyRes; 
 * @hide

 */

public final class ResourceId {



    /**

     * The {@code null} resource ID.

     */

    public static final @AnyRes int ID_NULL = 0;



    /**

     * Checks whether the integer {@code id} is a valid resource ID, as generated by AAPT.

     * <p>Note that a negative integer is not necessarily an invalid resource ID, and custom