From d689db4f0c977f7dd2f5b056287226f2f77f314e Mon Sep 17 00:00:00 2001
From: Tim Kilbourn <tkilbourn@google.com>
Date: Tue, 6 May 2014 11:59:55 -0700
Subject: [PATCH] DO NOT MERGE Hide banner manifest attribute.

Bug: 14116162
Change-Id: I42a73183bee52286ff315fa5b0f58bfdfc020485
---
 api/current.txt                        |  1 -
 core/res/res/values/attrs_manifest.xml | 13 ++++++++++++-
 core/res/res/values/public.xml         |  1 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 2bf2636dc71b8..d2edbf25e742f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 879a42a93a35c..7bca1e4ea07a2 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -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" />
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 67b43326190f3..a2493a7e9a8e0 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -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>