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

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

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

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

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

12 years agoMake aapt ignore tools-related data.
Xavier Ducrohet [Fri, 3 Feb 2012 01:18:18 +0000 (17:18 -0800)] 
Make aapt ignore tools-related data.

This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.

The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.

(cherry picked from commit a5d5e9d906583ebeb590ca200ca9840302a5cd1a)

Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5

12 years agoMake aapt ignore tools-related data.
Xavier Ducrohet [Fri, 3 Feb 2012 01:18:18 +0000 (17:18 -0800)] 
Make aapt ignore tools-related data.

This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.

The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.

Change-Id: I3e75d44cda54e1fa7b5cdc56b3eb27db80fe7761

12 years agoaapt now sorts the strings in the resource string pool.
Dianne Hackborn [Tue, 31 Jan 2012 19:27:43 +0000 (11:27 -0800)] 
aapt now sorts the strings in the resource string pool.

In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).

Also add a new aapt command to print the contents of the resource
table string pool.

Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48

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 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to...
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)] 
am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

* commit '45470559cd4a499fd5d38cf708f0b531dc081fed':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

12 years agoam db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to...
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:35:20 +0000 (16:35 -0800)] 
am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"

* commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

12 years agoam dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to...
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)] 
am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"

* commit 'dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

12 years agoam a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to...
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)] 
am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"

* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

12 years agoam d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)] 
am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc

* commit 'd6b5584b67f8a2f3d8ea20d748652673d5761e33':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

12 years agoRename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)] 
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)

Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924

12 years agoRename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)] 
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)

Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb

12 years agoRename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)] 
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)

Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a

12 years agoRename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)] 
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229

12 years agoRename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)] 
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)

Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3

12 years agoRename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)] 
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c

12 years agoMerge "Minor tweak to console output."
Dan Morrill [Fri, 6 Jan 2012 22:39:11 +0000 (14:39 -0800)] 
Merge "Minor tweak to console output."

12 years agoMinor tweak to console output.
Dan Morrill [Fri, 6 Jan 2012 18:47:10 +0000 (10:47 -0800)] 
Minor tweak to console output.

Change-Id: I494910eda1d02f6bcff945b9a13c83767f2248b6

12 years agoRename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)] 
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69

12 years agoRename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)] 
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea

12 years agoRename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)] 
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298

12 years agoAdd a new ui mode for "appliance"
Joe Onorato [Thu, 15 Dec 2011 04:59:30 +0000 (20:59 -0800)] 
Add a new ui mode for "appliance"

The idea is that this is a device which is more-or-less headless.  It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.

Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f

12 years agoAdd a new ui mode for "appliance"
Joe Onorato [Thu, 15 Dec 2011 04:59:30 +0000 (20:59 -0800)] 
Add a new ui mode for "appliance"

The idea is that this is a device which is more-or-less headless.  It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.

Change-Id: Icc9f674299f8dbe2b736a5622a4965904d27e49c

12 years agoam ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Window...
Raphael [Mon, 12 Dec 2011 23:39:30 +0000 (15:39 -0800)] 
am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.

12 years agoam 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge."...
Raphael [Mon, 12 Dec 2011 21:16:32 +0000 (13:16 -0800)] 
am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1

* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.

12 years agoMerge "AAPT fix printf %zd crash on Windows". Do not merge.
Raphael [Fri, 28 Oct 2011 00:01:31 +0000 (17:01 -0700)] 
Merge "AAPT fix printf %zd crash on Windows". Do not merge.

There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Bug: 5742142

(cherry picked from commit f51125d8429ffa71c57ba6fbdca9effc72642a9b)

Change-Id: I7545734ce8ce4a1f3e95f8a255daa8a909f870a1

12 years agoAdd aapt support for implicitly-granted permissions
Kenny Root [Thu, 8 Dec 2011 16:46:03 +0000 (08:46 -0800)] 
Add aapt support for implicitly-granted permissions

Bug: 2363582
Bug: 2877343
Change-Id: Iff7b496fb845e45fe1be2317089a96f7d63ed223

13 years agomerged by hand (services/java/com/android/server/PowerManagerService.java needs to...
Ed Heyl [Mon, 31 Oct 2011 13:06:27 +0000 (06:06 -0700)] 
merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)

Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928

13 years agoam 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to...
Raphael [Fri, 28 Oct 2011 22:27:22 +0000 (22:27 +0000)] 
am 48ba4139: (-s ours) am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.

* commit '48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b':
  Cherry-pick f51125d from master to ics-mr0. do not merge.

13 years agoam fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.
Raphael [Fri, 28 Oct 2011 18:54:36 +0000 (18:54 +0000)] 
am fe9a2a54: (-s ours) Cherry-pick f51125d from master to ics-mr0. do not merge.

* commit 'fe9a2a5471616a3267b30013bce36b13a455c0cd':
  Cherry-pick f51125d from master to ics-mr0. do not merge.

13 years agoCherry-pick f51125d from master to ics-mr0. do not merge.
Raphael [Fri, 28 Oct 2011 00:01:31 +0000 (17:01 -0700)] 
Cherry-pick f51125d from master to ics-mr0. do not merge.

AAPT fix printf %zd crash on Windows.

There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Change-Id: Ic201faffd871bd4c1b7d173d84b089e09750cd85

13 years agoAAPT fix printf %zd crash on Windows.
Raphael [Fri, 28 Oct 2011 00:01:31 +0000 (17:01 -0700)] 
AAPT fix printf %zd crash on Windows.

There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.

SDK bugs: 20395, 20986

Change-Id: I5b8ac36749263205a19f1448b1aaca90d5a2e06d

13 years agoRename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)] 
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a

13 years agoadd -ldl to host executables
Iliyan Malchev [Thu, 20 Oct 2011 05:35:56 +0000 (22:35 -0700)] 
add -ldl to host executables

This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.

Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
13 years agoWhoops, remove left-over debug output.
Dianne Hackborn [Sun, 16 Oct 2011 21:17:07 +0000 (14:17 -0700)] 
Whoops, remove left-over debug output.

Change-Id: Ib30571b22a6750629f975319a403d38de5e9462c

13 years agoNew aapt feature to do smarter filtering of configurations.
Dianne Hackborn [Thu, 13 Oct 2011 23:26:02 +0000 (16:26 -0700)] 
New aapt feature to do smarter filtering of configurations.

This adds a --preferred-configurations flag that specifies the
specific configurations you would like to have.

It is smarter than "-c" because it will avoid stripping a
configuration if that would result in there being no value
for the resource.

It is dumber than "-c" because it can't process as many kinds
of resources.  It is really only intended for bitmaps and use
with density configs.

This required re-arranging AaptAssets to group files together
by config again, like they used to be.  I think this hasn't
broken anything.  Hopefully.

Change-Id: I4e9d12ff6e6dbd1abb8fd4cb1814c6674b19d0e5

13 years agoAdd package-verifier to aapt dump badging
Kenny Root [Thu, 29 Sep 2011 20:49:45 +0000 (13:49 -0700)] 
Add package-verifier to aapt dump badging

Print out the package-verifier information when printing out badging.

Change-Id: I9c79c163261d5d4f1094bda76d90b3ff6e1ce540

13 years agoDon't lose product variant strings that also vary between locales.
Eric Fischer [Tue, 27 Sep 2011 23:09:41 +0000 (16:09 -0700)] 
Don't lose product variant strings that also vary between locales.

Localized strings with product variants were not being included in the APK,
apparently because the check to ensure that a different variation of the
string had not already been included in the APK was matching the version
of it from the default, untranslated configuration.

Now check to make sure that the string not only exists but also exists in
the correct configuration.

Bug 5372711

Change-Id: I52975570b75e0f11827dc6bcf1cb4a987d0541aa

13 years agoam d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependenc...
Xavier Ducrohet [Thu, 18 Aug 2011 21:51:43 +0000 (14:51 -0700)] 
am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"

* commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa':
  Change generated dependency file names

13 years agoam f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
Xavier Ducrohet [Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)] 
am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"

* commit 'f4750724cf8db972a052cb388dc9a39fc7aa6dd6':
  Change generated dependency file names

13 years agoChange generated dependency file names
Josiah Gaskin [Tue, 16 Aug 2011 01:33:44 +0000 (18:33 -0700)] 
Change generated dependency file names

This changes the name of the generated dependency files to R.java.d
and <ApkName>.ap_.d respectively.

Change-Id: I17e18770fc0d0a5d31c7b37b40ac1949f45ef13a

13 years agoam 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
Xavier Ducrohet [Thu, 28 Jul 2011 01:43:32 +0000 (18:43 -0700)] 
am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
  Remove Debug Code

13 years agoam 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
Xavier Ducrohet [Thu, 28 Jul 2011 01:40:49 +0000 (18:40 -0700)] 
am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
  Remove Debug Code

13 years agoRemove Debug Code
Josiah Gaskin [Thu, 28 Jul 2011 00:45:32 +0000 (17:45 -0700)] 
Remove Debug Code

This change removes debugging code from FileFinder.
This code was considered harmful because it uses the std::cout
from <iostream>.

Change-Id: Iad9b5e8a631883bd4854abdb29bc6df8a5b4a056

13 years agoChange ZipFile flags anonymous enum
Kenny Root [Mon, 25 Jul 2011 19:55:41 +0000 (12:55 -0700)] 
Change ZipFile flags anonymous enum

The arguments that ZipFile takes were apparently meant to be a typed
enum, but the name of the type was taken out because it creates invalid
conversion warnings in C++ since this is an invalid use of enum.

Just change the typedef enum to an anonymous enum so we get rid of the
compiler warnings. It will be implicitly converted to int instead.

Change-Id: Ie72c4c235c8f9ee8fd1b795e1010b77c55e983de

13 years agoam b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
Xavier Ducrohet [Thu, 21 Jul 2011 01:56:52 +0000 (18:56 -0700)] 
am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"

* commit 'b3ab070edb17f00a4b2d0f511ca539c885b28b6f':
  Fix to compile for windows

13 years agoam 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
Xavier Ducrohet [Thu, 21 Jul 2011 01:55:21 +0000 (18:55 -0700)] 
am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"

* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
  Fix to compile for windows

13 years agoFix to compile for windows
Josiah Gaskin [Thu, 21 Jul 2011 00:33:08 +0000 (17:33 -0700)] 
Fix to compile for windows

This change includes a workaround for dirent.h on windows not
including d_type.

Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca

13 years agoam 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
Xavier Ducrohet [Thu, 21 Jul 2011 00:49:26 +0000 (17:49 -0700)] 
am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
  Added Caching for PreProcessed PNGs

13 years agoresolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
Xavier Ducrohet [Thu, 21 Jul 2011 00:45:11 +0000 (17:45 -0700)] 
resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602

13 years agoam a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
Xavier Ducrohet [Thu, 21 Jul 2011 00:18:04 +0000 (17:18 -0700)] 
am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

* commit 'a125c937de06b1cc43368743592f47513eb88b76':
  Add generation of dependency file for .ap_ package

13 years agoresolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
Xavier Ducrohet [Wed, 20 Jul 2011 23:31:25 +0000 (16:31 -0700)] 
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe

13 years agoAdded Caching for PreProcessed PNGs
Josiah Gaskin [Tue, 7 Jun 2011 00:00:35 +0000 (17:00 -0700)] 
Added Caching for PreProcessed PNGs

Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.

Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c

13 years agoam 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation...
Xavier Ducrohet [Tue, 19 Jul 2011 17:23:19 +0000 (10:23 -0700)] 
am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"

* commit '9139868b6c5cb29b3665984225dceb0193fec31d':
  Add dependency generation to Aapt for R.java

13 years agoam bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java...
Xavier Ducrohet [Tue, 19 Jul 2011 17:23:16 +0000 (10:23 -0700)] 
am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"

* commit 'bf31250ba0858a2e72a3906a1f0216846683bc2e':
  Copy once-created R.java into library projects

13 years agoam ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for...
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:28 +0000 (10:18 -0700)] 
am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java"

* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
  Add dependency generation to Aapt for R.java

13 years agoam d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library...
Xavier Ducrohet [Tue, 19 Jul 2011 17:18:25 +0000 (10:18 -0700)] 
am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects"

* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
  Copy once-created R.java into library projects

13 years agoAdd generation of dependency file for .ap_ package
Josiah Gaskin [Mon, 27 Jun 2011 23:26:02 +0000 (16:26 -0700)] 
Add generation of dependency file for .ap_ package

Make Aapt generate a dependency file in the same directory as the
output ap_ file if the --generate-dependencies flag is set.
This dependency file can then be read by the ant exec loop task
to see whether to repackage resources.

Change-Id: I763679414daf76369700aa599c26dcf78d4de099

13 years agoAdd dependency generation to Aapt for R.java
Josiah Gaskin [Tue, 14 Jun 2011 20:57:09 +0000 (13:57 -0700)] 
Add dependency generation to Aapt for R.java

Make Aapt generate a dependency file in the location specified
by RClassDir for R.java if the --generate-dependencies flag is set.
This dependency file is then read by the ant exec loop task
to see whether to recreate R.java.

Change-Id: I7152dac86b6ea0e448ef65e3a95694afe233c789

13 years agoCopy once-created R.java into library projects
Josiah Gaskin [Thu, 9 Jun 2011 02:31:40 +0000 (19:31 -0700)] 
Copy once-created R.java into library projects

This change adds functionality in Aapt to allow specification of
library projects to copy the generated R.java file into rather
than regenerating the file for each library project.

Change-Id: I05939d1dc875bd875be9298ca47cb639235070c6

13 years agoOutput Proguard options for also overlay layouts.
Ying Wang [Mon, 20 Jun 2011 22:41:08 +0000 (15:41 -0700)] 
Output Proguard options for also overlay layouts.

Change-Id: I7bfac476247bd7b532510e295cb1a3e61e9af88b

13 years agoam 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts...
Dianne Hackborn [Thu, 16 Jun 2011 21:57:59 +0000 (14:57 -0700)] 
am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling.  Only impacts SDK (aapt dump badging)." into honeycomb-mr2

* commit '810dc5980c504a89974c07fcbd28a2b5dffb47de':
  New orientation handling.  Only impacts SDK (aapt dump badging).

13 years agoam f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt...
Dianne Hackborn [Thu, 16 Jun 2011 21:55:01 +0000 (14:55 -0700)] 
am f1c5dbbd: am abd4dffc: Merge "New orientation handling.  Only impacts SDK (aapt dump badging)." into honeycomb-mr2

* commit 'f1c5dbbd457bb14d3673508aaba497cdc328a1ef':
  New orientation handling.  Only impacts SDK (aapt dump badging).

13 years agoNew orientation handling. Only impacts SDK (aapt dump badging).
Dianne Hackborn [Thu, 16 Jun 2011 18:11:23 +0000 (11:11 -0700)] 
New orientation handling.  Only impacts SDK (aapt dump badging).

This is a new way of determining whether an application requires
specific orientations, done by looking at any requirements in its
activity tags.  Note that this won't catch all possible issues,
because applications can still force an orientation through Java
APIs, but the vast majority of applications that actually require
a specific orientation should be doing it this way because it the
easiest way and the only way to cleanly launch into the app from
a different orientation without doing some serious activity tricks.

Change-Id: I11d32104f6bc3d2a72aeeff1ca150b8f1c9f5588

13 years agoresolved conflicts for merge of 77fc8b80 to master
Dianne Hackborn [Tue, 14 Jun 2011 19:17:35 +0000 (12:17 -0700)] 
resolved conflicts for merge of 77fc8b80 to master

Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d

13 years agoam 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features...
Dianne Hackborn [Tue, 14 Jun 2011 18:40:06 +0000 (11:40 -0700)] 
am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2

* commit '6c0533f994e7991b3bd60cab48362e8e2e6d86f0':
  Add new landscape and portrait orientation features.

13 years agoAdd new landscape and portrait orientation features.
Dianne Hackborn [Tue, 14 Jun 2011 02:33:22 +0000 (19:33 -0700)] 
Add new landscape and portrait orientation features.

Updates aapt to know about these.  Also updates aapt badging to:

- No longer crash due to the change to how we match unspecified
configuration resources.
- Report the new "smallest screen" supported screen configs.
- Infer old screen size buckets based on new smallest width attrs.
- Report all of the different labels and icons in an app.

Change-Id: I7376042b817391bd070f549cebbc7f03be4635c8

13 years agoam f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non...
Dianne Hackborn [Fri, 10 Jun 2011 21:08:41 +0000 (14:08 -0700)] 
am f14dff12: am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.

* commit 'f14dff1219d2a87340dccad657f666f5451d8c6e':
  Okay *now* really enforce the limit on non-public styles.

13 years agoam 9980043e: am 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.
Dianne Hackborn [Fri, 10 Jun 2011 20:00:41 +0000 (13:00 -0700)] 
am 9980043e: am 820caf7b: am 8821ba86: Ummm...  f*, stop breaking the build.

* commit '9980043e930f877c4cd066de2b3d57dce4fc926e':
  Ummm...  f*, stop breaking the build.

13 years agoresolved conflicts for merge of f51ded0f to master
Dianne Hackborn [Fri, 10 Jun 2011 19:45:36 +0000 (12:45 -0700)] 
resolved conflicts for merge of f51ded0f to master

Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2

13 years agoam c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.
Dianne Hackborn [Fri, 10 Jun 2011 14:45:38 +0000 (07:45 -0700)] 
am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public styles.

* commit 'c6adfed6dcea8482e482db58bd396ea8de08426a':
  Okay *now* really enforce the limit on non-public styles.

13 years agoam 820caf7b: am 8821ba86: Ummm... f*, stop breaking the build.
Dianne Hackborn [Thu, 9 Jun 2011 23:18:07 +0000 (16:18 -0700)] 
am 820caf7b: am 8821ba86: Ummm...  f*, stop breaking the build.

* commit '820caf7b04f1e5c83599437e9e783e91322eb4f9':
  Ummm...  f*, stop breaking the build.

13 years agoOkay *now* really enforce the limit on non-public styles.
Dianne Hackborn [Thu, 9 Jun 2011 23:17:53 +0000 (16:17 -0700)] 
Okay *now* really enforce the limit on non-public styles.

Change-Id: Ie8df6acf7cc3dec00f615b2fa9a5122ec79a0aae

13 years agoUmmm... f*, stop breaking the build.
Dianne Hackborn [Thu, 9 Jun 2011 18:29:08 +0000 (11:29 -0700)] 
Ummm...  f*, stop breaking the build.

Change-Id: I6a42cb60e7cebda6d17222e6af1f327889323c40

13 years agoam a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents...
Dianne Hackborn [Thu, 9 Jun 2011 23:06:07 +0000 (16:06 -0700)] 
am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2

* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.

13 years agoEnforce public resource restriction on bag parents.
Dianne Hackborn [Thu, 9 Jun 2011 18:29:08 +0000 (11:29 -0700)] 
Enforce public resource restriction on bag parents.

Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d

13 years agoresolved conflicts for merge of 54cb63e2 to master
Dianne Hackborn [Thu, 2 Jun 2011 23:44:52 +0000 (16:44 -0700)] 
resolved conflicts for merge of 54cb63e2 to master

Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10

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

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>
Change-Id: I4b24a7265511e416cc7e02b5bb8a08ef32b598eb

13 years agoam 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.
Dianne Hackborn [Fri, 27 May 2011 21:27:46 +0000 (14:27 -0700)] 
am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.

* commit '528c49f112dce5f9687f30a9751e783196eca0c6':
  Add "tv" density for 720p screens.

13 years agoAdd "tv" density for 720p screens.
Dianne Hackborn [Fri, 27 May 2011 20:40:26 +0000 (13:40 -0700)] 
Add "tv" density for 720p screens.

Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630

13 years agoresolved conflicts for merge of bbca8133 to master
Dianne Hackborn [Tue, 24 May 2011 18:27:11 +0000 (11:27 -0700)] 
resolved conflicts for merge of bbca8133 to master

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6

13 years agoam 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
Dianne Hackborn [Mon, 23 May 2011 23:16:54 +0000 (16:16 -0700)] 
am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2

* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
  Add "television" mode.