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

Commit 17c5e990 authored by Tim Kilbourn's avatar Tim Kilbourn Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev

parents 84aaf124 d689db4f

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ package android { 
    field public static final int backgroundSplit = 16843659; // 0x101038b

    field public static final int backgroundStacked = 16843658; // 0x101038a

    field public static final int backupAgent = 16843391; // 0x101027f

    field public static final int banner = 16843762; // 0x10103f2

    field public static final int baseline = 16843548; // 0x101031c

    field public static final int baselineAlignBottom = 16843042; // 0x1010122

    field public static final int baselineAligned = 16843046; // 0x1010126

core/res/res/values/attrs_manifest.xml

+12 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
         a reference to a Drawable resource containing the image definition. -->

    <attr name="icon" format="reference" />



    <!-- A Drawable resource providing an extended graphical banner for its

    <!-- @hide A Drawable resource providing an extended graphical banner for its

         associated item. Use with the application tag (to supply a default

         banner for all application activities), or with the activity, tag to

         supply a banner for a specific activity.
@@ -916,6 +916,7 @@ 
        <attr name="theme" />

        <attr name="label" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="description" />
@@ -1001,6 +1002,7 @@ 
        <attr name="name" />

        <attr name="label" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="permissionGroup" />
@@ -1028,6 +1030,7 @@ 
        <attr name="name" />

        <attr name="label" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="description" />
@@ -1061,6 +1064,7 @@ 
        <attr name="name" />

        <attr name="label" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

    </declare-styleable>
@@ -1328,6 +1332,7 @@ 
        <attr name="label" />

        <attr name="description" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="process" />
@@ -1410,6 +1415,7 @@ 
        <attr name="label" />

        <attr name="description" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="permission" />
@@ -1453,6 +1459,7 @@ 
        <attr name="label" />

        <attr name="description" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="permission" />
@@ -1488,6 +1495,7 @@ 
        <attr name="label" />

        <attr name="description" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="launchMode" />
@@ -1553,6 +1561,7 @@ 
        <attr name="label" />

        <attr name="description" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="permission" />
@@ -1625,6 +1634,7 @@ 
         parent="AndroidManifestActivity AndroidManifestReceiver AndroidManifestService">

        <attr name="label" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="priority" />
@@ -1754,6 +1764,7 @@ 
        <attr name="targetPackage" />

        <attr name="label" />

        <attr name="icon" />

        <!-- @hide -->

        <attr name="banner" />

        <attr name="logo" />

        <attr name="handleProfiling" />

core/res/res/values/public.xml

+0 −1
Original line number Diff line number Diff line
@@ -2092,7 +2092,6 @@ 
    =============================================================== -->

  <eat-comment />



  <public type="attr" name="banner" id="0x10103f2" />

  <public type="attr" name="windowSwipeToDismiss" id="0x10103f3" />

  <public type="attr" name="allowEmbedded" id="0x10103f5" />

</resources>