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

Commit 3c887cb5 authored by Jesse Evans's avatar Jesse Evans Committed by Android (Google) Code Review
Browse files

Merge "Adds an explicit id for visibleToInstantApps attr"

parents e8914d2b beb6e9fb

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ package android { 
    field public static final int fontProviderAuthority = 16844114; // 0x1010552

    field public static final int fontProviderPackage = 16844122; // 0x101055a

    field public static final int fontProviderQuery = 16844115; // 0x1010553

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontStyle = 16844095; // 0x101053f

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521
@@ -1460,7 +1460,7 @@ package android { 
    field public static final int viewportWidth = 16843778; // 0x1010402

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int visibleToInstantApps = 16844095; // 0x101053f

    field public static final int visibleToInstantApps = 16844081; // 0x1010531

    field public static final int vmSafeMode = 16843448; // 0x10102b8

    field public static final int voiceIcon = 16843908; // 0x1010484

    field public static final int voiceLanguage = 16843349; // 0x1010255

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ package android { 
    field public static final int fontProviderAuthority = 16844114; // 0x1010552

    field public static final int fontProviderPackage = 16844122; // 0x101055a

    field public static final int fontProviderQuery = 16844115; // 0x1010553

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontStyle = 16844095; // 0x101053f

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521
@@ -1576,7 +1576,7 @@ package android { 
    field public static final int viewportWidth = 16843778; // 0x1010402

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int visibleToInstantApps = 16844095; // 0x101053f

    field public static final int visibleToInstantApps = 16844081; // 0x1010531

    field public static final int vmSafeMode = 16843448; // 0x10102b8

    field public static final int voiceIcon = 16843908; // 0x1010484

    field public static final int voiceLanguage = 16843349; // 0x1010255

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ package android { 
    field public static final int fontProviderAuthority = 16844114; // 0x1010552

    field public static final int fontProviderPackage = 16844122; // 0x101055a

    field public static final int fontProviderQuery = 16844115; // 0x1010553

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontStyle = 16844095; // 0x101053f

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521
@@ -1460,7 +1460,7 @@ package android { 
    field public static final int viewportWidth = 16843778; // 0x1010402

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int visibleToInstantApps = 16844095; // 0x101053f

    field public static final int visibleToInstantApps = 16844081; // 0x1010531

    field public static final int vmSafeMode = 16843448; // 0x10102b8

    field public static final int voiceIcon = 16843908; // 0x1010484

    field public static final int voiceLanguage = 16843349; // 0x1010255

core/res/res/values/public.xml

+4 −3
Original line number Diff line number Diff line
@@ -2760,8 +2760,9 @@ 
       =============================================================== -->

    <eat-comment />



    <public-group type="attr" first-id="0x01010531">

        <public name="fontStyle" />

    <public type="attr" name="visibleToInstantApps" id="0x01010531" />



    <public-group type="attr" first-id="0x01010532">

        <public name="font" />

        <public name="fontWeight" />

        <public name="tooltipText" />
@@ -2775,7 +2776,7 @@ 
        <public name="layout_marginVertical" />

        <public name="paddingHorizontal" />

        <public name="paddingVertical" />

        <public name="visibleToInstantApps" />

        <public name="fontStyle" />

        <public name="keyboardNavigationCluster" />

        <public name="targetProcess" />

        <public name="nextClusterForward" />