drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.

Browse Source 
* commit '0f3a98f5c93581cc511684b92e11e2ed2a17581e':
  DO NOT MERGE Hide isGame manifest attribute.
This commit is contained in:
Tim Kilbourn
2014-05-06 17:42:31 +00:00
committed by Android Git Automerger
parent ddaacaa7ce 0f3a98f5c9
commit a7b267b81b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/attrs_manifest.xml
View File

@ -312,7 +312,7 @@
content providers. --> content providers. -->
<attr name="exported" format="boolean" /> <attr name="exported" format="boolean" />
<!-- A boolean flag used to indicate if an application is a Game or not. <!-- @hide A boolean flag used to indicate if an application is a Game or not.
<p>This information can be used by the system to group together <p>This information can be used by the system to group together
applications that are classified as games, and display them separately applications that are classified as games, and display them separately
from the other applications. --> from the other applications. -->
@ -980,6 +980,7 @@
any accounts. The type should correspond to the account authenticator type, such as any accounts. The type should correspond to the account authenticator type, such as
"com.google". --> "com.google". -->
<attr name="requiredAccountType" format="string"/> <attr name="requiredAccountType" format="string"/>
<!-- @hide -->
<attr name="isGame" /> <attr name="isGame" />
</declare-styleable> </declare-styleable>

1
core/res/res/values/public.xml
View File

@ -2094,6 +2094,5 @@
<public type="attr" name="banner" id="0x10103f2" /> <public type="attr" name="banner" id="0x10103f2" />
<public type="attr" name="windowSwipeToDismiss" id="0x10103f3" /> <public type="attr" name="windowSwipeToDismiss" id="0x10103f3" />
<public type="attr" name="isGame" id="0x10103f4" />
<public type="attr" name="allowEmbedded" id="0x10103f5" /> <public type="attr" name="allowEmbedded" id="0x10103f5" />
</resources> </resources>