android/aapt.git
6 years agoDocument the 'aapt dump strings' command master
Mårten Kongstad [Thu, 20 Dec 2012 09:08:54 +0000 (10:08 +0100)] 
Document the 'aapt dump strings' command

Update the usage page for aapt to mention 'strings' as a valid
subcommand to 'dump'.

Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582

6 years agoMerge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp
Elliott Hughes [Thu, 17 Jan 2013 17:02:37 +0000 (17:02 +0000)] 
Merge "DO NOT MERGE Fix build." into jb-mr1-dev-plus-aosp

6 years agoam ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev
Justin Koh [Thu, 17 Jan 2013 00:21:28 +0000 (16:21 -0800)] 
am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-dev

* commit 'ba1992f8e9e50ca58f007ff528d2f6d2c2b18223':
  Remove doSingleCrunch call DO NOT MERGE

6 years agoRemove doSingleCrunch call DO NOT MERGE
Justin Koh [Wed, 16 Jan 2013 22:51:29 +0000 (14:51 -0800)] 
Remove doSingleCrunch call DO NOT MERGE

Remove doSingleCrunch call as it's breaking jb-mr1-aah-dev.

Change-Id: I0d8ee55344792fd868e74e07f31641a85e71168a

6 years agoDO NOT MERGE Fix build.
Elliott Hughes [Wed, 16 Jan 2013 19:10:36 +0000 (11:10 -0800)] 
DO NOT MERGE Fix build.

Looks like a method that won't compile was left behind as part of
a merge conflict resolution.

Change-Id: I75eabc0c626a619a666642c7c685e4ce544095e7

6 years agoam a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
Xavier Ducrohet [Tue, 15 Jan 2013 22:50:37 +0000 (14:50 -0800)] 
am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

* commit 'a4e10cc746caea514216f436e2065b3bbefb25ef':
  Fix the single crunch command to return the right error code.

6 years agoam 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
Xavier Ducrohet [Tue, 15 Jan 2013 22:48:02 +0000 (14:48 -0800)] 
am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

* commit '6080cc5fd7c332c79098a50605c0c37d99d4c481':
  Fix the single crunch command to return the right error code.

6 years agoresolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
Xavier Ducrohet [Tue, 15 Jan 2013 22:24:56 +0000 (14:24 -0800)] 
resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev

Change-Id: I839981af97e54c39f0ea0b8141a4dd02959263a0

6 years agoFix the single crunch command to return the right error code.
Xavier Ducrohet [Tue, 15 Jan 2013 02:02:40 +0000 (18:02 -0800)] 
Fix the single crunch command to return the right error code.

Casting from status_t to int doesn't work for return values
if the lower 8 bits are all 0.

Change-Id: I88e910dfe46cb72acd1595352e71da3c8eff4ca9

6 years agoam e92b9706: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single...
Xavier Ducrohet [Thu, 3 Jan 2013 18:52:37 +0000 (10:52 -0800)] 
am e92b9706: am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.

* commit 'e92b9706df09730e60c1e9ae17d4157c2c118825':
  Add single crunch command to aapt. do not merge.

6 years agoam 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command...
Xavier Ducrohet [Thu, 3 Jan 2013 18:49:28 +0000 (10:49 -0800)] 
am 816fd074: (-s ours) am afa4d8bf: (-s ours) am 22d7cf23: Add single crunch command to aapt. do not merge.

* commit '816fd074cfc32fd3323163dd0c358e249f9cbf56':
  Add single crunch command to aapt. do not merge.

6 years agoAdd single crunch command to aapt. do not merge.
Xavier Ducrohet [Fri, 21 Dec 2012 17:54:02 +0000 (09:54 -0800)] 
Add single crunch command to aapt. do not merge.

Previously the crunch command would work on a full res folder
and output a full res folder (with only the drawables). This
was only used in the SDK.

The incremental logic is moved to the SDK build system so we
change the crunch command (or rather add a new one) to only
crunch a single file.

(cherry picked from commit b1f6ad82dd8d1702617a757a88430604b3131fac)

Change-Id: I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

6 years agoam fac7b0a6: am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt
Christopher Tate [Thu, 29 Nov 2012 22:27:56 +0000 (14:27 -0800)] 
am fac7b0a6: am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt

* commit 'fac7b0a60306d851d903730ccc408a0272e866db':
  Cache resource ID lookups in aapt

6 years agoam 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt
Christopher Tate [Thu, 29 Nov 2012 18:58:26 +0000 (10:58 -0800)] 
am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt

* commit '5f958e9bfc793b3b653dfc88418bbd7745e633e1':
  Cache resource ID lookups in aapt

6 years agoCache resource ID lookups in aapt
Christopher Tate [Fri, 16 Nov 2012 23:58:08 +0000 (15:58 -0800)] 
Cache resource ID lookups in aapt

This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK.  Windows-based
use should particularly benefit from the change.

(cherry picked from commit d8dde13a63565dcd72bcf03a5088407b737ba793)

Change-Id: I33835bc64ade77688d41e8bfcd371b0a5f59d8fd

6 years agoCache resource ID lookups in aapt
Christopher Tate [Fri, 16 Nov 2012 23:58:08 +0000 (15:58 -0800)] 
Cache resource ID lookups in aapt

This speeds up certain workloads considerably, particularly
those involved in buildling apps via the SDK.  Windows-based
use should particularly benefit from the change.

Change-Id: I29f4b3a77400b201ee219729cc28a5e359c0c5e8

6 years agoam 51ce1607: am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option...
Xavier Ducrohet [Wed, 26 Sep 2012 22:15:43 +0000 (15:15 -0700)] 
am 51ce1607: am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.

* commit '51ce1607b392bf463e4175596d0b91dc337f4c14':
  Add --error-on-failed-insert option to aapt. do not merge.

6 years agoam 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt....
Xavier Ducrohet [Wed, 26 Sep 2012 22:14:19 +0000 (15:14 -0700)] 
am 46cc524a: (-s ours) am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.

* commit '46cc524a6c45d169750290f06672ee6343af51d7':
  Add --error-on-failed-insert option to aapt. do not merge.

6 years agoam f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.
Xavier Ducrohet [Wed, 26 Sep 2012 22:12:13 +0000 (15:12 -0700)] 
am f7243dcc: Add --error-on-failed-insert option to aapt. do not merge.

* commit 'f7243dcc616bc9bd84fa519356babb15d6f17e7d':
  Add --error-on-failed-insert option to aapt. do not merge.

6 years agoAdd --error-on-failed-insert option to aapt. do not merge.
Xavier Ducrohet [Thu, 6 Sep 2012 00:49:21 +0000 (17:49 -0700)] 
Add --error-on-failed-insert option to aapt. do not merge.

The new SDK build system give the ability to insert
versionCode/Name and min/targetSdkVersion in the manifest
but aapt won't replace those if they already exist.

The main problem is that aapt doesn't actually fail when
it doesn't replace them, making the output not what the
developer wanted.

This patch set adds an option to aapt to make it return
an error if the insert failed because the attribute
already existed.

Cherry-pick from 7714a2429b192c88e134ff67b969121bbaeb5457

Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9

6 years agoam a2b978bc: Merge "Fix writing text version of styleable IDs. do not merge." into...
Xavier Ducrohet [Wed, 26 Sep 2012 18:47:24 +0000 (11:47 -0700)] 
am a2b978bc: Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev

* commit 'a2b978bc55d5ebd8c32c41a707b5a155216ee0a5':
  Fix writing text version of styleable IDs. do not merge.

6 years agoMerge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev
Xavier Ducrohet [Wed, 26 Sep 2012 18:45:08 +0000 (11:45 -0700)] 
Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev

6 years agoFix writing text version of styleable IDs. do not merge.
Xavier Ducrohet [Wed, 26 Sep 2012 17:11:54 +0000 (10:11 -0700)] 
Fix writing text version of styleable IDs. do not merge.

(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)

Change-Id: Ic679080d5157daf77c35516c8f682bd13e2b4d96

6 years agoam f8b18ced: am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleabl...
Xavier Ducrohet [Wed, 26 Sep 2012 18:08:08 +0000 (11:08 -0700)] 
am f8b18ced: am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.

* commit 'f8b18ced269ddac89da92c66f594084032026ab2':
  Fix writing text version of styleable IDs. do not merge.

6 years agoam 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do...
Xavier Ducrohet [Wed, 26 Sep 2012 18:06:03 +0000 (11:06 -0700)] 
am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.

* commit '4649d03b96f576c4a7d5d4aa7d7d637a6ae091aa':
  Fix writing text version of styleable IDs. do not merge.

6 years agoam 6c6ddbff: Fix writing text version of styleable IDs. do not merge.
Xavier Ducrohet [Wed, 26 Sep 2012 18:03:45 +0000 (11:03 -0700)] 
am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.

* commit '6c6ddbff890afb2133f6da79237cf581f00c13ba':
  Fix writing text version of styleable IDs. do not merge.

6 years agoFix writing text version of styleable IDs. do not merge.
Xavier Ducrohet [Wed, 26 Sep 2012 17:11:54 +0000 (10:11 -0700)] 
Fix writing text version of styleable IDs. do not merge.

(cherry picked from commit d16047434bca24b2811de7ea9d22de6ee0f87f79)

Change-Id: Ia1fc343e0649b175d290357f63eebec0dd1ae14a

6 years agoam 253f7635: am fb34490f: Merge "Fix writing text version of styleable IDs."
Xavier Ducrohet [Wed, 26 Sep 2012 17:46:46 +0000 (10:46 -0700)] 
am 253f7635: am fb34490f: Merge "Fix writing text version of styleable IDs."

* commit '253f76357dc9acdb329f321190eca4f0b049b4af':
  Fix writing text version of styleable IDs.

6 years agoam fb34490f: Merge "Fix writing text version of styleable IDs."
Xavier Ducrohet [Wed, 26 Sep 2012 17:44:22 +0000 (10:44 -0700)] 
am fb34490f: Merge "Fix writing text version of styleable IDs."

* commit 'fb34490f4dca7aac623fb9a80fe9a2371107a786':
  Fix writing text version of styleable IDs.

6 years agoFix writing text version of styleable IDs.
Xavier Ducrohet [Wed, 26 Sep 2012 17:11:54 +0000 (10:11 -0700)] 
Fix writing text version of styleable IDs.

Change-Id: I3f2614689a597de3fd46628c020cf649a808c82f

6 years agoam fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp
Jean-Baptiste Queru [Fri, 21 Sep 2012 01:17:48 +0000 (18:17 -0700)] 
am fea72d3b: Ignore 12496bfc into jb-dev-plus-aosp

* commit 'fea72d3b1a35470489b07f4fd552b3da9f1ad80d':
  Add --output-text-symbols option to aapt. do not merge.

6 years agoIgnore 12496bfc into jb-dev-plus-aosp
Jean-Baptiste Queru [Thu, 20 Sep 2012 23:32:57 +0000 (16:32 -0700)] 
Ignore 12496bfc into jb-dev-plus-aosp

Change-Id: Ibd43b178907f547e87b4a6b0608a676b649a236a

6 years agoAdd --output-text-symbols option to aapt. do not merge.
Xavier Ducrohet [Tue, 11 Sep 2012 21:45:22 +0000 (14:45 -0700)] 
Add --output-text-symbols option to aapt. do not merge.

Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.

However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.

For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.

This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).

Chery-picked from f5de650ff1e161ea135c828e43515895343d2c0f

Change-Id: I0e08ceb6e4ceb3feb169ce17df21dd35a2505e7f

6 years agoam 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to...
Xavier Ducrohet [Mon, 17 Sep 2012 19:08:36 +0000 (12:08 -0700)] 
am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols option to aapt."

* commit '79c95c3b50ff332f9c92430fd10a15eb648a0b02':
  Add --output-text-symbols option to aapt.

6 years agoam 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option...
Xavier Ducrohet [Mon, 17 Sep 2012 19:08:29 +0000 (12:08 -0700)] 
am 8a67598e: am cc9747ed: am d7252571: Merge "Add --error-on-failed-insert option to aapt."

* commit '8a67598eb780560b7efe4e1d9944c7cbcf83bbb1':
  Add --error-on-failed-insert option to aapt.

6 years agoam 31820a35: Merge "Add --output-text-symbols option to aapt."
Xavier Ducrohet [Mon, 17 Sep 2012 19:03:19 +0000 (12:03 -0700)] 
am 31820a35: Merge "Add --output-text-symbols option to aapt."

* commit '31820a35b2cf864a8dcb71d43e6fd21d54f49a2d':
  Add --output-text-symbols option to aapt.

6 years agoam d7252571: Merge "Add --error-on-failed-insert option to aapt."
Xavier Ducrohet [Mon, 17 Sep 2012 19:03:12 +0000 (12:03 -0700)] 
am d7252571: Merge "Add --error-on-failed-insert option to aapt."

* commit 'd72525718ea7ef3e1f97cf557365b143c8919a5b':
  Add --error-on-failed-insert option to aapt.

6 years agoAdd --output-text-symbols option to aapt.
Xavier Ducrohet [Tue, 11 Sep 2012 21:45:22 +0000 (14:45 -0700)] 
Add --output-text-symbols option to aapt.

Library projects in the SDK are built using --non-constant-id
to generate a temporary R.java class.
When the library is packaged with the application to generate an
apk, the R class is recreated with the proper IDs due to all the
resources coming from the app and all the libraries.

However for large apps with many libraries (each with their own
R class in their package), this means a lot of unnecessary IDs:
all R classes contains all the IDs including for resources from
by projects they don't have access through the dependency graph.

For really large apps (X,000 resources), with lots of libraries
(10+), this can generate tens of thousands of resources, which
can trigger dalvik's limit of 65K fields and methods per dex
files.

This changes lets aapt generate not only the R class but a simple
text file containing the list of all those IDs so that it is
easier to parse back. The SDK build system will not ask aapt
to generate the R class of the libraries (through the
--extra-packages option), instead it will then read this
file to know what IDs are needed for each library and generate
a much smaller R class for each library (using the same text
file output from compiling all the resources to get the final
integer value).

Change-Id: I4db959fec372cf3ead9950e4b2b82fa1ae7eed2d

6 years agoAdd --error-on-failed-insert option to aapt.
Xavier Ducrohet [Thu, 6 Sep 2012 00:49:21 +0000 (17:49 -0700)] 
Add --error-on-failed-insert option to aapt.

The new SDK build system give the ability to insert
versionCode/Name and min/targetSdkVersion in the manifest
but aapt won't replace those if they already exist.

The main problem is that aapt doesn't actually fail when
it doesn't replace them, making the output not what the
developer wanted.

This patch set adds an option to aapt to make it return
an error if the insert failed because the attribute
already existed.

Change-Id: I8938ec1238da407a8562c974e9598db39001ffd9

6 years agoam 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files...
Elliott Hughes [Sun, 9 Sep 2012 23:13:11 +0000 (16:13 -0700)] 
am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."

* commit '61d09810a7b478810adc15af2495136255377e25':
  Fix aapt to get expat header files from the approved location.

6 years agoam bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
Elliott Hughes [Sun, 9 Sep 2012 23:09:15 +0000 (16:09 -0700)] 
am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."

* commit 'bfe1ab825731d365fef169deab646d7ceeafc998':
  Fix aapt to get expat header files from the approved location.

6 years agoFix aapt to get expat header files from the approved location.
Elliott Hughes [Sun, 9 Sep 2012 21:45:32 +0000 (14:45 -0700)] 
Fix aapt to get expat header files from the approved location.

Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e

6 years agoUse "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
Fabrice Di Meglio [Wed, 5 Sep 2012 20:12:02 +0000 (13:12 -0700)] 
Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources

- we cannot use "rtl" / "ltr" qualifiers as they can conflict with ISO-639 Alpha-3
codespace which uses 3 letters for identifying a language code (and could use either
"rtl" or "ltr" strings for defining a language in the future).

- we are using instead "ldrtl" for RTL and "ldltr" for LTR resources. Those qualifiers
are defined by more than 3 chars and outside of what is defined into ISO-639. They
are also more understandable as "ld" prefix is for "layoutdirection"

Change-Id: Id43e948103707e09bef63ebd54ac1779dde58e72

6 years agoAdd support for "-rtl" in resources
Fabrice Di Meglio [Sat, 16 Jun 2012 03:16:41 +0000 (20:16 -0700)] 
Add support for "-rtl" in resources

- fix bug #7035019 Need to have "-rtl" support for Resource

Change-Id: Ic82145c2ac672729d8a6c695a5f343276a1a0a2c

6 years agoam c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:03:43 +0000 (12:03 -0700)] 
am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree"

* commit 'c1c55afb474dd85a6205bc8ab94065f3ac38aa77':
  Normalize output from aapt d xmltree

6 years agoam e67f8c8c: Merge "Normalize output from aapt d xmltree"
Jean-Baptiste Queru [Wed, 8 Aug 2012 19:01:35 +0000 (12:01 -0700)] 
am e67f8c8c: Merge "Normalize output from aapt d xmltree"

* commit 'e67f8c8c279e20fff5f426eccd062b709e6280ed':
  Normalize output from aapt d xmltree

6 years agoMerge "Normalize output from aapt d xmltree"
Jean-Baptiste Queru [Wed, 8 Aug 2012 18:21:28 +0000 (11:21 -0700)] 
Merge "Normalize output from aapt d xmltree"

6 years agoam 2606fc48: Reconcile with jb-mr0-release jb-release
The Android Open Source Project [Mon, 30 Jul 2012 21:47:47 +0000 (14:47 -0700)] 
am 2606fc48: Reconcile with jb-mr0-release jb-release

* commit '2606fc48cb2e65489056096227430b054c558767':
  Fix NPE on some phones at startup.
  Fix 6804479: "Emergency calls only" in notification shade
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.
  Implement CMAS service category program results.
  Fix detection of CDMA cell broadcast messages.
  Fix our interpretation of apn setting's bearer.

6 years agoReconcile with jb-mr0-release jb-release
The Android Open Source Project [Mon, 30 Jul 2012 21:43:53 +0000 (14:43 -0700)] 
Reconcile with jb-mr0-release jb-release

Change-Id: I241c11b89af86b312a9112a0004efb3ab6aaa3f6

6 years agomerge in jb-mr0-release history after reset to jb-dev
The Android Automerger [Tue, 24 Jul 2012 19:39:30 +0000 (12:39 -0700)] 
merge in jb-mr0-release history after reset to jb-dev

6 years agoam be925017: am b71393bd: Merge "Fix aapt -G to properly support class attr in fragme...
Xavier Ducrohet [Fri, 20 Jul 2012 17:00:11 +0000 (10:00 -0700)] 
am be925017: am b71393bd: Merge "Fix aapt -G to properly support class attr in fragment." into jb-dev

* commit 'be925017201ad547a72e8d1e333dbc7eae3fc76f':
  Fix aapt -G to properly support class attr in fragment.

6 years agoam b71393bd: Merge "Fix aapt -G to properly support class attr in fragment." into...
Xavier Ducrohet [Thu, 19 Jul 2012 21:30:39 +0000 (14:30 -0700)] 
am b71393bd: Merge "Fix aapt -G to properly support class attr in fragment." into jb-dev

* commit 'b71393bd34a48eeb622292e78f43b99e374a5e3a':
  Fix aapt -G to properly support class attr in fragment.

6 years agoFix aapt -G to properly support class attr in fragment.
Xavier Ducrohet [Thu, 19 Jul 2012 01:06:09 +0000 (18:06 -0700)] 
Fix aapt -G to properly support class attr in fragment.

The code added attributes android:name and class to a
KeyedVector under the same key (fragment) so the 2nd
add (android:name) removed class with was never checked.

This replace the value type in the KeyedVector to be
Vector<NamespaceAttributePair> instead of just
NamespaceAttributePair.

Change-Id: I009b8a8cca878191661c2a63bb14c967d230498d

6 years agoNormalize output from aapt d xmltree
Shachar Shemesh [Sun, 8 Jul 2012 03:37:48 +0000 (06:37 +0300)] 
Normalize output from aapt d xmltree

When using aapt dump xmltree to dump an XML which has a content element with newlines, the output contains a
newline. This makes it very difficult, sometimes impossible, to understand what is part of the content, and
what is the meta-data.

We now pass XML content through the same normalizer used for other tags.

Change-Id: I327321520fac563eb32aecaf796f2473866697fc

6 years agoam cc6cf51b: am 8c71784e: Merge "Initialize mJunkPath to false"
Jean-Baptiste Queru [Fri, 22 Jun 2012 21:36:49 +0000 (14:36 -0700)] 
am cc6cf51b: am 8c71784e: Merge "Initialize mJunkPath to false"

* commit 'cc6cf51b80eabd199f797f40b76f7980c343962b':
  Initialize mJunkPath to false

6 years agoam 8c71784e: Merge "Initialize mJunkPath to false"
Jean-Baptiste Queru [Fri, 22 Jun 2012 21:34:54 +0000 (14:34 -0700)] 
am 8c71784e: Merge "Initialize mJunkPath to false"

* commit '8c71784e9e83e914135e996591aa7903edd2fd96':
  Initialize mJunkPath to false

6 years agoInitialize mJunkPath to false
Haitao Feng [Fri, 22 Jun 2012 01:20:26 +0000 (09:20 +0800)] 
Initialize mJunkPath to false

Change-Id: Ib48bb1d91736d27f055528c3ba275237ff5ada07

6 years agoam 5158db8b: Reconcile with jb-release
The Android Open Source Project [Tue, 19 Jun 2012 13:19:56 +0000 (06:19 -0700)] 
am 5158db8b: Reconcile with jb-release

* commit '5158db8b07e9512788ecf1f887643e8bc25ce48f':
  Fix an NPE and possible unsynchronized call of Locked method.
  Fix 6665117: ACTION_ASSIST visual improvements
  Capture window manager's last ANR state in bug report.
  Capture input dispatcher's last ANR state in bug report.
  Fix issue #6636731: Mariner animation ring gets stuck
  Jelly Bean ringtone Bug: 6619980
  Remove Disco video from builds.
  Change snap behavior for lock screen
  Improve ANR diagnostics.
  Detect bad behavior earlier in Choreographer.
  Revert "Fix fake bold for fallback fonts in frameworks."
  Include important native processes in watchdog stacks.
  Fix issue #6641368: can't launch gallery

6 years agoReconcile with jb-release
The Android Open Source Project [Tue, 19 Jun 2012 13:13:23 +0000 (06:13 -0700)] 
Reconcile with jb-release

Change-Id: I451b63991c4550290f6e32f2f555f0412bf0b28c

6 years agoam 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into...
Dianne Hackborn [Tue, 12 Jun 2012 20:00:15 +0000 (13:00 -0700)] 
am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev

* commit '6892f1ec9670432f1cab71813592077bea991a8b':
  Fix issue #6641368: can't launch gallery

6 years agoam 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev
Dianne Hackborn [Tue, 12 Jun 2012 19:41:36 +0000 (12:41 -0700)] 
am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev

* commit '0f6471ace77387560988964ed0679f843bba6f1f':
  Fix issue #6641368: can't launch gallery

6 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 12 Jun 2012 18:22:34 +0000 (11:22 -0700)] 
merge in jb-release history after reset to jb-dev

6 years agoFix issue #6641368: can't launch gallery
Dianne Hackborn [Mon, 11 Jun 2012 19:27:05 +0000 (12:27 -0700)] 
Fix issue #6641368: can't launch gallery

This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627,
but with comments added so I don't make this mistake again. :)

Change-Id: I053216279e3721f08f32f561bb989736ef619f82

6 years agoFix issue #6641368: can't launch gallery
Dianne Hackborn [Mon, 11 Jun 2012 19:27:05 +0000 (12:27 -0700)] 
Fix issue #6641368: can't launch gallery

This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627,
but with comments added so I don't make this mistake again. :)

Change-Id: I053216279e3721f08f32f561bb989736ef619f82

6 years agoam f22eb963: am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for...
Jean-Baptiste Queru [Wed, 6 Jun 2012 01:52:44 +0000 (18:52 -0700)] 
am f22eb963: am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."

* commit 'f22eb96301aa1c4e0f7ac317daa64a617c21855c':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.

6 years agoam c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with...
Jean-Baptiste Queru [Wed, 6 Jun 2012 01:48:00 +0000 (18:48 -0700)] 
am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."

* commit 'c9fe6568f3e7e4d9dc6da072afc929b9a81001ed':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.

6 years agoam 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X...
Jean-Baptiste Queru [Wed, 6 Jun 2012 01:43:49 +0000 (18:43 -0700)] 
am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."

* commit '9e22d9c514457c4b163d03b9241e4e28b1698368':
  Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.

6 years agoFix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
Ying Wang [Thu, 31 May 2012 01:02:55 +0000 (18:02 -0700)] 
Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.

With SDK 10.6 without _DARWIN_UNLIMITED_STREAMS aapt sometimes fails
right away with the error "Too many open files" when calling fopen().

Change-Id: Ifa7bd8a9530d706aa47f98be8186f1aefe943d76

6 years agoMerge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."
Ying Wang [Tue, 5 Jun 2012 18:20:41 +0000 (11:20 -0700)] 
Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."

6 years agoam 9f374b9d: am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
Tor Norbye [Tue, 5 Jun 2012 16:55:22 +0000 (09:55 -0700)] 
am 9f374b9d: am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"

* commit '9f374b9de5a557a7977b24d41f45c3464cfff8c1':
  Tweak default ignore-assets path

6 years agoam 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"
Tor Norbye [Tue, 5 Jun 2012 15:45:20 +0000 (08:45 -0700)] 
am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"

* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
  Tweak default ignore-assets path

6 years agoam 36ac43ba: Merge "Tweak default ignore-assets path"
Tor Norbye [Tue, 5 Jun 2012 15:41:16 +0000 (08:41 -0700)] 
am 36ac43ba: Merge "Tweak default ignore-assets path"

* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
  Tweak default ignore-assets path

6 years agoTweak default ignore-assets path
Tor Norbye [Mon, 4 Jun 2012 17:38:13 +0000 (10:38 -0700)] 
Tweak default ignore-assets path

Add .DS_Store to the list of ignored files that are silently
ignored (other dot-files are ignored but aapt emits a "(skipping <x>)"
message.)

Also, add a "!" prefix to the *~ pattern for Emacs/Vim/Gedit backup
files.

Finally, move the !*.scc pattern up in front of the .* pattern, such
that it doesn't match the earlier .* pattern (which is verbose, unlike
!*.scc).

Change-Id: Id3e96490f1802486aea8c58366d43e9d413971b8

6 years agoam 5daa08df: am 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal pointer increment...
Jean-Baptiste Queru [Sat, 2 Jun 2012 17:05:23 +0000 (10:05 -0700)] 
am 5daa08df: am 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"

* commit '5daa08df5e6a70b40aef210ec5b2bcfa897aaef6':
  aapt: Remove terminal pointer incrementaion

6 years agoam 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"
Jean-Baptiste Queru [Sat, 2 Jun 2012 17:00:47 +0000 (10:00 -0700)] 
am 3df4e1a2: am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"

* commit '3df4e1a2f1b4f0eb110c8983107b7c7fa21ed338':
  aapt: Remove terminal pointer incrementaion

6 years agoam 0748a569: Merge "aapt: Remove terminal pointer incrementaion"
Jean-Baptiste Queru [Sat, 2 Jun 2012 16:56:45 +0000 (09:56 -0700)] 
am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"

* commit '0748a5698776d1a9693a5449ffc983af26cc533b':
  aapt: Remove terminal pointer incrementaion

6 years agoMerge "aapt: Remove terminal pointer incrementaion"
Jean-Baptiste Queru [Sat, 2 Jun 2012 16:21:36 +0000 (09:21 -0700)] 
Merge "aapt: Remove terminal pointer incrementaion"

6 years agoFix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
Ying Wang [Thu, 31 May 2012 01:02:55 +0000 (18:02 -0700)] 
Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.

With SDK 10.6 without _DARWIN_UNLIMITED_STREAMS aapt sometimes fails
right away with the error "Too many open files" when calling fopen().

Change-Id: Ifa7bd8a9530d706aa47f98be8186f1aefe943d76

6 years agoam e8417384: (-s ours) am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge...
Raphaël Moll [Wed, 30 May 2012 22:29:47 +0000 (15:29 -0700)] 
am e8417384: (-s ours) am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern." DO NOT MERGE."

* commit 'e8417384e6646c714e48aff3bb603b60458cd8e0':
  Merge "Fix length of pattern." DO NOT MERGE.

6 years agoam ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern...
Raphaël Moll [Wed, 30 May 2012 22:25:10 +0000 (15:25 -0700)] 
am ae545bb8: (-s ours) am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern." DO NOT MERGE."

* commit 'ae545bb87c8509c31a72bbc03c0bee7cb23a5133':
  Merge "Fix length of pattern." DO NOT MERGE.

7 years agoMerge "Fix length of pattern." DO NOT MERGE.
Ying Wang [Tue, 22 May 2012 18:24:22 +0000 (11:24 -0700)] 
Merge "Fix length of pattern." DO NOT MERGE.

After skipping * with "token++", the length should decrease by 1 as
well.

(merged from 996b073e813ba1a22a13282ccdebb664f14ba898)

Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d

7 years agoam ac9f5057: am 996b073e: Fix length of pattern.
Ying Wang [Tue, 22 May 2012 21:20:14 +0000 (14:20 -0700)] 
am ac9f5057: am 996b073e: Fix length of pattern.

* commit 'ac9f50573dad2050d261850f1accbcea383cc6f0':
  Fix length of pattern.

7 years agoam 996b073e: Fix length of pattern.
Ying Wang [Tue, 22 May 2012 18:43:14 +0000 (11:43 -0700)] 
am 996b073e: Fix length of pattern.

* commit '996b073e813ba1a22a13282ccdebb664f14ba898':
  Fix length of pattern.

7 years agoFix length of pattern.
Ying Wang [Tue, 22 May 2012 18:24:22 +0000 (11:24 -0700)] 
Fix length of pattern.

After skipping * with "token++", the length should decrease by 1 as
well.

Change-Id: I132eb7d12bb756f2f713c607e92741ca834aef81

7 years agoam 82ca5ffb: am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag...
Raphael Moll [Mon, 21 May 2012 21:32:24 +0000 (14:32 -0700)] 
am 82ca5ffb: am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev

* commit '82ca5ffb53ff909aa240532ebdfa1f98dc0db178':
  Merge "AAPT: support a new --ignore-assets flag."

7 years agoam 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard rules for...
Dianne Hackborn [Mon, 21 May 2012 21:29:14 +0000 (14:29 -0700)] 
am 72669b5f: am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev

* commit '72669b5f4663937b09d33f9d951f0b86a03fa98b':
  Add aapt support for generating proguard rules for onClick methods.

7 years agoam f67f834a: am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env...
Raphael Moll [Mon, 21 May 2012 21:27:08 +0000 (14:27 -0700)] 
am f67f834a: am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."

* commit 'f67f834a9cb7ee9b743e79af85cb42bd45b5aa23':
  Support a new ANDROID_AAPT_IGNORE env var.

7 years agoam 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev
Raphael Moll [Mon, 21 May 2012 20:13:38 +0000 (13:13 -0700)] 
am 9c06ac09: Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev

* commit '9c06ac09c3530c5f0bc0b47a3350eedb5b539c35':
  Merge "AAPT: support a new --ignore-assets flag."

7 years agoMerge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev
Raphael Moll [Mon, 21 May 2012 20:09:29 +0000 (13:09 -0700)] 
Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-dev

7 years agoMerge "AAPT: support a new --ignore-assets flag."
Raphael Moll [Mon, 7 May 2012 23:16:46 +0000 (16:16 -0700)] 
Merge "AAPT: support a new --ignore-assets flag."

AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.

Added a command-line option for it:
  aapt di --ignore-assets "foo*:*.blah"

If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.

Otherwise a default is used that matches the current behavior.

SDK Bug: 5343 24067

(cherry-pick from AOSP 90897ed87bce639bf6bb2ccf15fbabb59b131bab)

Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f

7 years agoam 13a0271c: Merge "Add aapt support for generating proguard rules for onClick method...
Dianne Hackborn [Sat, 19 May 2012 02:41:10 +0000 (19:41 -0700)] 
am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev

* commit '13a0271cb81d497edbf93f3d6ecf4b9b8da4ee69':
  Add aapt support for generating proguard rules for onClick methods.

7 years agoAdd aapt support for generating proguard rules for onClick methods.
Dianne Hackborn [Sat, 19 May 2012 02:22:14 +0000 (19:22 -0700)] 
Add aapt support for generating proguard rules for onClick methods.

Also fix Activity menu inflater when using the dark on light
theme wrapper to still be able to find onClick listeners.

Change-Id: Ie206db26d1df96041bc477804e476b02ad99dc9d

7 years agoam 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."
Raphael Moll [Fri, 18 May 2012 23:33:14 +0000 (16:33 -0700)] 
am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."

* commit '8748399f6f999d21eef9226baadb20f71dfb61ea':
  Support a new ANDROID_AAPT_IGNORE env var.

7 years agoSupport a new ANDROID_AAPT_IGNORE env var.
Raphael Moll [Mon, 7 May 2012 23:16:46 +0000 (16:16 -0700)] 
Support a new ANDROID_AAPT_IGNORE env var.

AAPT has a fixed built-in list of files and directories
to ignore when parsing resource files. Over the years we
always had developers requiring specific patterns.
If the env var ANDROID_AAPT_IGNORE is set, it is parsed
to find which file/directory patterns to ignore.
Otherwise a default is used that matches the current behavior.

Added a command-line option for it:
  aapt di --ignore-assets "foo*:*.blah"

SDK Bug: 5343 24067

Change-Id: Ia4caa2a8188c8c1df143f884e459b8182645995f

7 years agoam 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
Jean-Baptiste Queru [Tue, 1 May 2012 17:10:30 +0000 (10:10 -0700)] 
am 3e2d5914: resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

* commit '3e2d59146df9e9e325dcc65018bb130b03242bbc':
  Runtime resource overlay: clean-up.

7 years agoresolved conflicts for merge of 13c04786 to jb-dev-plus-aosp
Jean-Baptiste Queru [Tue, 1 May 2012 17:00:22 +0000 (10:00 -0700)] 
resolved conflicts for merge of 13c04786 to jb-dev-plus-aosp

Change-Id: Ib7aa5a768f4606beb2a4387811cfed7c00cbc111

7 years agoam 39b58ba2: resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
Jean-Baptiste Queru [Tue, 1 May 2012 16:58:21 +0000 (09:58 -0700)] 
am 39b58ba2: resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

* commit '39b58ba2b299e1c97e13535aae9add530d942c7b':
  Build overlay packages just like regular packages.

7 years agoresolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp
Jean-Baptiste Queru [Tue, 1 May 2012 16:53:48 +0000 (09:53 -0700)] 
resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

Change-Id: I5386585e473201268c6ed8b05e0a16569d434ea2

7 years agoMerge "Runtime resource overlay: clean-up."
Jean-Baptiste Queru [Tue, 1 May 2012 16:20:32 +0000 (09:20 -0700)] 
Merge "Runtime resource overlay: clean-up."

7 years agoMerge "Build overlay packages just like regular packages."
Jean-Baptiste Queru [Tue, 1 May 2012 15:49:37 +0000 (08:49 -0700)] 
Merge "Build overlay packages just like regular packages."