]> git.saurik.com Git - android/aapt.git/log
android/aapt.git
12 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

12 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

12 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

12 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

12 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

12 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.

12 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.

12 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

12 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

12 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

12 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

12 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

12 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

12 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"

12 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.

12 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

12 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.

12 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

12 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."

12 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

12 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

12 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.

12 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

12 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.

12 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

12 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

12 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

12 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."

12 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."

12 years agoApply --extra-packages in case --custom-pacakge is also specified.
Ying Wang [Thu, 26 Apr 2012 01:53:49 +0000 (18:53 -0700)] 
Apply --extra-packages in case --custom-pacakge is also specified.

Cherry-picked from master.

Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88

12 years agoAdd new aapt dump badging output explaining implicit badging.
Dianne Hackborn [Sat, 14 Apr 2012 02:18:41 +0000 (19:18 -0700)] 
Add new aapt dump badging output explaining implicit badging.

New uses-implied-feature and uses-implied-permission tell you
about any features or permissions that aapt is automatically
adding to your app, and why it is doing so.

Change-Id: I45edb055408e1259699c994f956166ce67e8db5d

12 years agoMerge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest...
Dan Morrill [Wed, 11 Apr 2012 00:13:17 +0000 (17:13 -0700)] 
Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole."

12 years agoImplement call log permission compatibility.
Dianne Hackborn [Fri, 6 Apr 2012 02:33:30 +0000 (19:33 -0700)] 
Implement call log permission compatibility.

If a pre-JellyBean application requests read/write contacts, it
will implicitly be given read/write call log.

Change-Id: I029db4b09fda737bb8fba4e1611355ebdbbfd34f

12 years agoEmbed layout padding in nine patch images
Amith Yamasani [Wed, 4 Apr 2012 17:27:15 +0000 (10:27 -0700)] 
Embed layout padding in nine patch images

- Added a new custom PNG chunk that carries the layout padding ints.
- Extract the padding ticks from .9.png images and store in the chunk.
- Load the padding information at runtime into Bitmap and NinePatchDrawable.

- The new chunk is ordered first so that it doesn't cause a problem in older
  versions of the platform.

Bug: 6087201

Change-Id: I5de46167a1d44b3ec21065b0c165e594b1dc8399

12 years agoAdding a line for android-debuggable to 'dump badging' if AndroidManifest.xml
Dan Morrill [Tue, 3 Apr 2012 19:44:40 +0000 (12:44 -0700)] 
Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml
is configured as such. This is to be used by e.g. Play Store to warn the
developer that they are about to publish a security hole.

Change-Id: Ib6f8537462cbc00ed0504435bdeee2aae0c5b69b

12 years agoaapt: Remove terminal pointer incrementaion
Nobuhiro Hayashi [Mon, 30 Jan 2012 09:42:20 +0000 (18:42 +0900)] 
aapt: Remove terminal pointer incrementaion

When initialization, 'end' pointer refers terminal
character in a string. But it is incremented in
while loop. It occurs the access to non-secure memory.

Issue detail
  http://code.google.com/p/android/issues/detail?id=24896

Change-Id: I751d1154d797738c87a66374a66933528c045be5

12 years agoframeworks/base: move Zip* from libandroidfw to libutils
Colin Cross [Fri, 23 Mar 2012 01:43:07 +0000 (18:43 -0700)] 
frameworks/base: move Zip* from libandroidfw to libutils

ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).

Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3

12 years agoMerge remote-tracking branch 'goog/ics-aah-exp' into merge
Mike Lockwood [Thu, 22 Mar 2012 22:32:51 +0000 (15:32 -0700)] 
Merge remote-tracking branch 'goog/ics-aah-exp' into merge

12 years agoUse qsort_r_compat() as a portable wrapper for qsort_r().
Jeff Brown [Mon, 19 Mar 2012 21:08:58 +0000 (14:08 -0700)] 
Use qsort_r_compat() as a portable wrapper for qsort_r().

Change-Id: Ie79f81625947f4e95122047605d994c86e872e74

12 years agoFix build break on glibc, for real.
Jeff Brown [Mon, 19 Mar 2012 19:02:10 +0000 (12:02 -0700)] 
Fix build break on glibc, for real.

Change-Id: I8bbec237229b05f96c708d41f3c4da17e2a90e2b

12 years agoFix build break on glibc hosts.
Jeff Brown [Mon, 19 Mar 2012 18:48:12 +0000 (11:48 -0700)] 
Fix build break on glibc hosts.

Change-Id: Ida70bec6ea972d042982428353cbbc33cde25136

12 years agoaapt: Preprocess images in parallel.
Jeff Brown [Sat, 17 Mar 2012 05:17:41 +0000 (22:17 -0700)] 
aapt: Preprocess images in parallel.

Currently hardcoded to use up to 4 threads.

This change substantially reduces the amount of time spent
preprocessing framework resources to just a few seconds.

Change-Id: I02fdd283fb529a152aeb22ac87f278779fd77983

12 years agoUse quicksort to sort the string pool.
Jeff Brown [Sat, 17 Mar 2012 02:25:20 +0000 (19:25 -0700)] 
Use quicksort to sort the string pool.

The current implementation of Vector::sort uses insertion sort
on the assumption that the data is mostly sorted.  It isn't.

This change brings the total time spent sorting packages by config
down to 500ms from about 93 seconds.

Bug: 6186278
Change-Id: Iec8da11e09297acd6c73733d063b0fa9dacf69f7

12 years agoAdd some comments about StringPool sort order.
Jeff Brown [Fri, 16 Mar 2012 22:25:17 +0000 (15:25 -0700)] 
Add some comments about StringPool sort order.

Change-Id: I57f24d46328a6bfef883819eaf95c03114d573bb

12 years agoRemove dead code in StringPool.
Jeff Brown [Fri, 16 Mar 2012 22:25:17 +0000 (15:25 -0700)] 
Remove dead code in StringPool.

The sorted string pool option was no longer used.
Neither were strings with associated identifiers.

Change-Id: Ic5f6368637fbeedfda873d63f4ad0f3ea9d0d603

12 years agoMake StringPool entry types trivially movable.
Jeff Brown [Fri, 16 Mar 2012 22:24:32 +0000 (15:24 -0700)] 
Make StringPool entry types trivially movable.

Change-Id: If93957a840a0f1cae2e6ef291eeeb1b0c7c20958

12 years agoAdd new READ_EXTERNAL_STORAGE permission.
Dianne Hackborn [Mon, 12 Mar 2012 17:51:26 +0000 (10:51 -0700)] 
Add new READ_EXTERNAL_STORAGE permission.

Also adds some initial compatibility code for dealing with it.

Change-Id: I104bff11798349e4aaa6da9b7be787b257daa1bb

12 years agoMerge "Fix an issue where a non-styled string could be made into a styled string"
Ben Gruver [Thu, 8 Mar 2012 22:52:09 +0000 (14:52 -0800)] 
Merge "Fix an issue where a non-styled string could be made into a styled string"

12 years agoFix an issue where a non-styled string could be made into a styled string
Ben Gruver [Thu, 8 Mar 2012 05:19:16 +0000 (21:19 -0800)] 
Fix an issue where a non-styled string could be made into a styled string

If a styled version of an otherwise identical string is encountered before
a non-styled version, aapt merges the two, effectively making the
non-styled string have a spurious style.

Change-Id: I424a61c0c83c59e0b9c8939e457402efd06a7a4f

12 years agoMerge "Fix up getAttributeFlags() function"
Ben Gruver [Thu, 8 Mar 2012 00:16:18 +0000 (16:16 -0800)] 
Merge "Fix up getAttributeFlags() function"

12 years agoam 4ec961d5: (-s ours) DO NOT MERGE
Ramanan Rajeswaran [Wed, 7 Mar 2012 23:39:40 +0000 (15:39 -0800)] 
am 4ec961d5: (-s ours) DO NOT MERGE

* commit '4ec961d5752363161cc78112fbe542b1c0473158':
  DO NOT MERGE

12 years agoam b663a4b7: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize(...
Dianne Hackborn [Wed, 7 Mar 2012 23:39:38 +0000 (15:39 -0800)] 
am b663a4b7: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

* commit 'b663a4b7da68cc6d81d4b338d94fb48eaec8cb05':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

12 years agoam 5e7bb1e6: (-s ours) DO NOT MERGE
Ramanan Rajeswaran [Wed, 7 Mar 2012 23:34:11 +0000 (15:34 -0800)] 
am 5e7bb1e6: (-s ours) DO NOT MERGE

* commit '5e7bb1e675df2cc1edd9808afcaaeed07830bd9f':
  DO NOT MERGE

12 years agoam e6a0ec60: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize(...
Dianne Hackborn [Wed, 7 Mar 2012 23:34:10 +0000 (15:34 -0800)] 
am e6a0ec60: (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

* commit 'e6a0ec60607783b426b92f638055c79178fdd892':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

12 years agoFix up getAttributeFlags() function
Ben Gruver [Wed, 7 Mar 2012 03:26:22 +0000 (19:26 -0800)] 
Fix up getAttributeFlags() function

In addition to a couple of minor clean-up items, this fixes an issue that can
rarely cause incorrect parsing of attribute flag values, when there is a '|'
character in the few bytes past the end of the attribute value being parsed.

Change-Id: I6050b1c2db60720c7c0ab7df9eba8cfc629b320e

12 years agoDO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)] 
DO NOT MERGE

Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad

12 years agoAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)] 
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598

12 years agoDO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)] 
DO NOT MERGE

Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad

12 years agoAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)] 
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598

12 years agoam 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside...
Xavier Ducrohet [Fri, 24 Feb 2012 02:49:51 +0000 (18:49 -0800)] 
am 1704a5cc: (-s ours) am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '1704a5cc59c501fab53dbd2e754a8479ac1f57ca':

12 years agoam 737d6ef5: (-s ours) am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml...
inazaruk [Fri, 24 Feb 2012 02:49:47 +0000 (18:49 -0800)] 
am 737d6ef5: (-s ours) am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

* commit '737d6ef5f1b545f3fc3bb0d839abc9a421760ed1':

12 years agoam 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside...
Xavier Ducrohet [Fri, 24 Feb 2012 02:47:08 +0000 (18:47 -0800)] 
am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '54c8c3d920ee863716638483602a011943da6484':
  Move the automatic namespace outside of the res namespace. do not merge.

12 years agoam 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml...
inazaruk [Fri, 24 Feb 2012 02:47:06 +0000 (18:47 -0800)] 
am 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

* commit '85eb3f0af00aa35cceebbf162de4434418bf5a84':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

12 years agoam f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace...
Xavier Ducrohet [Fri, 24 Feb 2012 02:45:56 +0000 (18:45 -0800)] 
am f31297ed: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit 'f31297edf899997dc9f173f6ddca30b0e4f2d677':

12 years agoam 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libra...
inazaruk [Fri, 24 Feb 2012 02:45:53 +0000 (18:45 -0800)] 
am 68ad43e1: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

* commit '68ad43e10ba76721295e66b746c5f5c5e7094a0b':

12 years agoam b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace...
Xavier Ducrohet [Fri, 24 Feb 2012 02:44:16 +0000 (18:44 -0800)] 
am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit 'b3c780f16c37d2fb41a4eb211ea062b4c0b4e366':
  Move the automatic namespace outside of the res namespace. do not merge.

12 years agoam 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libra...
inazaruk [Fri, 24 Feb 2012 02:44:14 +0000 (18:44 -0800)] 
am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

* commit '9694910e17a18c307e61811284f88a26db2bfbae':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

12 years agoam 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:42:04 +0000 (18:42 -0800)] 
am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.

12 years agoam eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do...
inazaruk [Fri, 24 Feb 2012 02:42:02 +0000 (18:42 -0800)] 
am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

12 years agoam 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:42:01 +0000 (18:42 -0800)] 
am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.

12 years agoam eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do...
inazaruk [Fri, 24 Feb 2012 02:41:54 +0000 (18:41 -0800)] 
am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

12 years agoam 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:41:48 +0000 (18:41 -0800)] 
am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.

* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
  Move the automatic namespace outside of the res namespace. do not merge.

12 years agoam eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do...
inazaruk [Fri, 24 Feb 2012 02:41:43 +0000 (18:41 -0800)] 
am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
  Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

12 years agoMove the automatic namespace outside of the res namespace. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 00:59:27 +0000 (16:59 -0800)] 
Move the automatic namespace outside of the res namespace. do not merge.

(cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225)

Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4

12 years agoFix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
inazaruk [Sun, 22 May 2011 22:09:06 +0000 (15:09 -0700)] 
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.

Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.

Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>
(cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18)

Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194

12 years agoMove the automatic namespace outside of the res namespace.
Xavier Ducrohet [Fri, 24 Feb 2012 00:59:27 +0000 (16:59 -0800)] 
Move the automatic namespace outside of the res namespace.

Change-Id: I107ee94af0a13f008ef4a8844a9038b84f97a247

12 years agoam 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custo...
Jean-Baptiste Queru [Thu, 23 Feb 2012 21:04:24 +0000 (13:04 -0800)] 
am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

* commit '0842a2262d03fc98e42541cb38f51a341d346ae0':
  Fix for issue 9656 - custom xml attributes in Android Libraries

12 years agoam fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attribu...
Jean-Baptiste Queru [Thu, 23 Feb 2012 21:01:59 +0000 (13:01 -0800)] 
am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

* commit 'fe99051c78994e0cc5153468eeba6f75f3e04b8e':
  Fix for issue 9656 - custom xml attributes in Android Libraries

12 years agoam 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
Jean-Baptiste Queru [Thu, 23 Feb 2012 20:57:03 +0000 (12:57 -0800)] 
am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries

12 years agoMerge "Fix for issue 9656 - custom xml attributes in Android Libraries"
Jean-Baptiste Queru [Thu, 23 Feb 2012 20:38:12 +0000 (12:38 -0800)] 
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

12 years agoanother attempt at fixing the linux build
Mathias Agopian [Tue, 21 Feb 2012 22:34:47 +0000 (14:34 -0800)] 
another attempt at fixing the linux build

Change-Id: Iac20439fd6eea4682859112e72f051294bc87ef6

12 years agoframeworks/base refactoring
Mathias Agopian [Tue, 21 Feb 2012 00:58:20 +0000 (16:58 -0800)] 
frameworks/base refactoring

create the new libandroidfw from parts of libui and libutils

Change-Id: I1584995616fff5d527a2aba63921b682a6194d58

12 years agoframeworks/base refactoring.
Mathias Agopian [Sat, 18 Feb 2012 02:27:36 +0000 (18:27 -0800)] 
frameworks/base refactoring.

step 2: move libutils headers to their new home: androidfw

Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef

12 years agoRuntime resource overlay: clean-up.
Mårten Kongstad [Wed, 8 Feb 2012 09:22:47 +0000 (10:22 +0100)] 
Runtime resource overlay: clean-up.

This is a combination of three minor clean-up tasks:

- Generate correct idmap even if name lookup fails:

  Any resources following a resource with a spec but no actual values
  would receive an incorrect ID in the idmap due to an accumulating offset
  error. To combat this, a dummy value is inserted in the idmap whenever
  a resource with a spec but no values is encountered.

- Optimize pruning of padding zeroes in idmaps:

  Earlier, trailing zeroes were iteratively popped from the end of each
  type block of an idmap. This commit instead tracks where to make the
  cut, and does so with a single function call.

- aapt: warn about resources which lack values:

  The resource framework assumes every resource to have a value for
  at least one valid configuration. However, if multiple resource
  directories are used (several -S options to aapt), the list of
  configurations is limited by dpi (-c option to aapt) and a resource
  is only available in discarded dpi configurations, aapt will create
  a resource entry where each configuration lack an actual value. This
  commit lets aapt emit a warning whenever this has happened.

Change-Id: Ic7451b7f4adfef5bfa6b0d7e64e057f317a2cdaa

12 years agoam 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
Ramanan Rajeswaran [Tue, 14 Feb 2012 15:36:53 +0000 (07:36 -0800)] 
am 128dfa51: (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp

* commit '128dfa514818399ff8b5fde56fa487374f6fd504':
  DO NOT MERGE

12 years agoDO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)] 
DO NOT MERGE

Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad

12 years agoam 84affb8a: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Mon, 13 Feb 2012 22:42:40 +0000 (14:42 -0800)] 
am 84affb8a: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

* commit '84affb8ae6477c46c75f834b73daa13b2a751c21':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

12 years agoAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)] 
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598

12 years agoam 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:27:40 +0000 (14:27 -0800)] 
am 352b8d03: (-s ours) am 8046e294: Merge "DO NOT MERGE" into ics-scoop

* commit '352b8d03c63585f4eaec09d2e39a4d173be83164':
  DO NOT MERGE

12 years agoam 8046e294: Merge "DO NOT MERGE" into ics-scoop
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)] 
am 8046e294: Merge "DO NOT MERGE" into ics-scoop

* commit '8046e294c545b8e3712bff7925b024639936d5bf':
  DO NOT MERGE

12 years agoDO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)] 
DO NOT MERGE

Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This reverts commit c1496d2d9a496e4aba817a58ecb9e07fe55cdba5.

Change-Id: If60df742b19c925cc99b20d01108b84415b124ad

12 years agoam d1f88de2: am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize...
Dianne Hackborn [Mon, 13 Feb 2012 20:41:27 +0000 (12:41 -0800)] 
am d1f88de2: am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

* commit 'd1f88de2c496423e483760654a4381b563dc1e1d':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

12 years agoam c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Mon, 13 Feb 2012 20:38:37 +0000 (12:38 -0800)] 
am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

* commit 'c1496d2d9a496e4aba817a58ecb9e07fe55cdba5':
  Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

12 years agoAdd xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)] 
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598

12 years agoOnly generate private symbols that are needed.
Dianne Hackborn [Mon, 6 Feb 2012 23:33:21 +0000 (15:33 -0800)] 
Only generate private symbols that are needed.

Change-Id: Icc4c86638db8429a387bf87c934cc712f807e213

12 years agoBuild overlay packages just like regular packages.
Mårten Kongstad [Tue, 7 Feb 2012 18:12:45 +0000 (19:12 +0100)] 
Build overlay packages just like regular packages.

Previously, building overlay packages required passing aapt its -o flag.
This commit decouples the idmap generation code from the effects of the
-o flag.

Since this commit renders the -o flag obsolete, support for the flag was
removed from aapt as well.

Change-Id: Ied2e0ab8cb800e49623f0a2044b06cd4935473d5

12 years agoam 9485ca87: am b54f371c: am f8aea993: Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:46:49 +0000 (11:46 -0800)] 
am 9485ca87: am b54f371c: am f8aea993: Make aapt ignore tools-related data.

* commit '9485ca87edd819e3106a4b8c3d08f1ab73adf818':

12 years agoam 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:43 +0000 (11:44 -0800)] 
am 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore tools-related data.

* commit '3d4db0dc1803252b924076f7d10d8e806af71824':
  Make aapt ignore tools-related data.

12 years agoam b54f371c: am f8aea993: Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:19 +0000 (11:44 -0800)] 
am b54f371c: am f8aea993: Make aapt ignore tools-related data.

* commit 'b54f371cc4cfd32acf0fec35885a1da64accec9e':

12 years agoam c205a9d6: am f8aea993: Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:42:50 +0000 (11:42 -0800)] 
am c205a9d6: am f8aea993: Make aapt ignore tools-related data.

* commit 'c205a9d68c23e9ade2cbe28bba0f257d84d23a97':
  Make aapt ignore tools-related data.