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

Commit c624c56f authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "Make attrresourcesMap public"

parents 1efe5eb8 636edc23

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1144,6 +1144,7 @@ package android { 
    field public static final int resizeable = 16843405; // 0x101028d

    field public static final int resizeableActivity = 16844022; // 0x10104f6

    field public static final int resource = 16842789; // 0x1010025

    field public static final int resourcesMap = 16844297; // 0x1010609

    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field @Deprecated public static final int restoreNeedsApplication = 16843421; // 0x101029d

    field public static final int restrictedAccountType = 16843733; // 0x10103d5

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ package android { 
    field public static final int isVrOnly = 16844152; // 0x1010578

    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565

    field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566

    field public static final int resourcesMap = 16844297; // 0x1010609

    field public static final int supportsAmbientMode = 16844173; // 0x101058d

    field public static final int userRestriction = 16844164; // 0x1010584

  }

core/res/res/values/public.xml

+0 −1
Original line number Diff line number Diff line
@@ -3000,7 +3000,6 @@ 
    <public-group type="attr" first-id="0x01010607">

      <public name="importantForContentCapture" />

      <public name="forceQueryable" />

      <!-- @hide @SystemApi -->

      <public name="resourcesMap" />

      <public name="animatedImageDrawable"/>

      <public name="htmlDescription"/>