]> git.saurik.com Git - android/aapt.git/log
android/aapt.git
14 years agoam eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread
Kenny Root [Thu, 26 Aug 2010 00:25:15 +0000 (17:25 -0700)] 
am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread

Merge commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a'

* commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a':
  Add LFH offset to verbose list of APK

14 years agoam 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread
Kenny Root [Thu, 26 Aug 2010 00:22:01 +0000 (17:22 -0700)] 
am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread

Merge commit '2e7427f39ec15dcb43cc1247372b53980be11d38' into gingerbread-plus-aosp

* commit '2e7427f39ec15dcb43cc1247372b53980be11d38':
  Add LFH offset to verbose list of APK

14 years agoMerge "Add LFH offset to verbose list of APK" into gingerbread
Kenny Root [Thu, 26 Aug 2010 00:20:29 +0000 (17:20 -0700)] 
Merge "Add LFH offset to verbose list of APK" into gingerbread

14 years agoam 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread
Brian Carlstrom [Wed, 25 Aug 2010 17:10:31 +0000 (10:10 -0700)] 
am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread

Merge commit '7517ffd134d03bd5392e8292a18551bfce08ddce'

* commit '7517ffd134d03bd5392e8292a18551bfce08ddce':
  Fix linux 64 build

14 years agoam 59073b15: Merge "Fix linux 64 build" into gingerbread
Brian Carlstrom [Wed, 25 Aug 2010 17:07:18 +0000 (10:07 -0700)] 
am 59073b15: Merge "Fix linux 64 build" into gingerbread

Merge commit '59073b155ab0d8a5706c90200e6af614510aba0e' into gingerbread-plus-aosp

* commit '59073b155ab0d8a5706c90200e6af614510aba0e':
  Fix linux 64 build

14 years agoAdd LFH offset to verbose list of APK
Kenny Root [Wed, 25 Aug 2010 14:36:31 +0000 (07:36 -0700)] 
Add LFH offset to verbose list of APK

The Local File Header (LFH) offset is printed in debugging cases when
the platform is inspecting APKs. This adds the LFH offset field to the
list of contents of an APK, so that it can be checked easily against the
Central Directory (CD).

Change-Id: I08f9a13256bfe6563c1a963c4f0289789b2e7857

14 years agoFix linux 64 build
Brian Carlstrom [Wed, 25 Aug 2010 03:20:50 +0000 (20:20 -0700)] 
Fix linux 64 build

git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f

Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170

14 years agoam 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens...
Dianne Hackborn [Tue, 24 Aug 2010 16:02:43 +0000 (09:02 -0700)] 
am 8b569c8d: am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread

Merge commit '8b569c8d49924d849793513a5418ef0350320962'

* commit '8b569c8d49924d849793513a5418ef0350320962':
  Fix aapt dump badging to support xlarge screens.

14 years agoam 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread
Dianne Hackborn [Fri, 20 Aug 2010 20:42:25 +0000 (13:42 -0700)] 
am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gingerbread

Merge commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960' into gingerbread-plus-aosp

* commit '42f90ca54fc4c6e0bdbde7caa7d10b6090d11960':
  Fix aapt dump badging to support xlarge screens.

14 years agoUpdate aapt to find fragment references.
Dianne Hackborn [Thu, 19 Aug 2010 19:56:10 +0000 (12:56 -0700)] 
Update aapt to find fragment references.

Add knowledge about <fragment class="..."> for layout files
and update to reflect the change of the header tag from Header.

Change-Id: I91e2a5f204a8e222367985383c1721030c7954d8

14 years agoFix aapt dump badging to support xlarge screens.
Dianne Hackborn [Fri, 20 Aug 2010 19:44:33 +0000 (12:44 -0700)] 
Fix aapt dump badging to support xlarge screens.

Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049

14 years agoam 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes...
Ying Wang [Mon, 16 Aug 2010 22:16:52 +0000 (15:16 -0700)] 
am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread

Merge commit '8cfd3c01e4582a587765588c02234527e7808ca0'

* commit '8cfd3c01e4582a587765588c02234527e7808ca0':
  Output proguard keep flags for fragment classes.

14 years agoam d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted...
Eric Fischer [Mon, 16 Aug 2010 14:49:51 +0000 (07:49 -0700)] 
am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread

Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79'

* commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79':
  Change aapt's warning message to suggest formatted="false", not "true".

14 years agoam 44e0d5ca: am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.
Ficus Kirkpatrick [Mon, 16 Aug 2010 14:49:38 +0000 (07:49 -0700)] 
am 44e0d5ca: am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.

Merge commit '44e0d5ca752db52f2f02e475ecd254b676e50be2'

* commit '44e0d5ca752db52f2f02e475ecd254b676e50be2':
  Add --max-res-version flag to aapt.

14 years agoam 0f414272: am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
Ficus Kirkpatrick [Mon, 16 Aug 2010 14:49:30 +0000 (07:49 -0700)] 
am 0f414272: am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread

Merge commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4'

* commit '0f414272ccb9c387f41ad3bb5ee464a6f0b646a4':
  Add --max-res-version flag to aapt.

14 years agoam e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread
Ying Wang [Fri, 13 Aug 2010 22:29:04 +0000 (15:29 -0700)] 
am e05184f2: Merge "Output proguard keep flags for fragment classes." into gingerbread

Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp

* commit 'e05184f271f9882a5bf828e353aea40e0c06ff69':
  Output proguard keep flags for fragment classes.

14 years agoMerge "Output proguard keep flags for fragment classes." into gingerbread
Ying Wang [Fri, 13 Aug 2010 22:26:21 +0000 (15:26 -0700)] 
Merge "Output proguard keep flags for fragment classes." into gingerbread

14 years agoam 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false",...
Eric Fischer [Fri, 13 Aug 2010 21:56:47 +0000 (14:56 -0700)] 
am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread

Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp

* commit '244152bfb9020341953d3e541c85eb3961806378':
  Change aapt's warning message to suggest formatted="false", not "true".

14 years agoMerge "Change aapt's warning message to suggest formatted="false", not "true"." into...
Eric Fischer [Fri, 13 Aug 2010 21:54:15 +0000 (14:54 -0700)] 
Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread

14 years agoChange aapt's warning message to suggest formatted="false", not "true".
Eric Fischer [Fri, 13 Aug 2010 21:49:55 +0000 (14:49 -0700)] 
Change aapt's warning message to suggest formatted="false", not "true".

True is the default and specifying it won't suppress the warning.

Change-Id: I8ecc919b4059bf3321e781649cb46dd2d3807592

14 years agoam 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:47:38 +0000 (14:47 -0700)] 
am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.

Merge commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543' into gingerbread-plus-aosp

* commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543':
  Add --max-res-version flag to aapt.

14 years agoam 2abde6e0: Add --max-res-version flag to aapt.
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:45:39 +0000 (14:45 -0700)] 
am 2abde6e0: Add --max-res-version flag to aapt.

Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread

* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
  Add --max-res-version flag to aapt.

14 years agoAdd --max-res-version flag to aapt.
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:13:08 +0000 (14:13 -0700)] 
Add --max-res-version flag to aapt.

aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from gingerbread.

Change-Id: I71b889540380cb10bafb40f72582d3af785ae33a

14 years agoam 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:27:41 +0000 (14:27 -0700)] 
am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbread

Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp

* commit '7525c2cfbbaa5c947c029008ef490e93a50c064f':
  Add --max-res-version flag to aapt.

14 years agoAdd --max-res-version flag to aapt.
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:13:08 +0000 (14:13 -0700)] 
Add --max-res-version flag to aapt.

aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from froyo.

Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb

14 years agoAdd --max-res-version flag to aapt.
Ficus Kirkpatrick [Fri, 13 Aug 2010 21:13:08 +0000 (14:13 -0700)] 
Add --max-res-version flag to aapt.

aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from eclair.

Change-Id: I40ccf820c8a6e3074fccc987dd60a511dd8eb0de

14 years agoOutput proguard keep flags for fragment classes.
Ying Wang [Fri, 13 Aug 2010 20:56:07 +0000 (13:56 -0700)] 
Output proguard keep flags for fragment classes.

Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec
Bug: 2916847

14 years agoam f781b4ef: am e37ab632: Merge "Fix build on some linux machines"
Jean-Baptiste Queru [Wed, 11 Aug 2010 17:07:56 +0000 (10:07 -0700)] 
am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"

Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'

* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
  Fix build on some linux machines

14 years agoam e37ab632: Merge "Fix build on some linux machines"
Jean-Baptiste Queru [Wed, 11 Aug 2010 17:04:31 +0000 (10:04 -0700)] 
am e37ab632: Merge "Fix build on some linux machines"

Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp

* commit 'e37ab63221af94d69437741a3645fc0e14a680bc':
  Fix build on some linux machines

14 years agoFix build on some linux machines
hmepas [Wed, 21 Jan 2009 15:41:00 +0000 (07:41 -0800)] 
Fix build on some linux machines

This adds -lpthread on linux for aapt and localize, which appear to be
needed on some linux distros.

Signed-off-by: Jean-Baptiste Queru <jbq@google.com>
14 years agoam 799a5a61: am 2533a6ad: set up fast-forward from froyo-release to gingerbread
The Android Open Source Project [Tue, 29 Jun 2010 21:42:32 +0000 (14:42 -0700)] 
am 799a5a61: am 2533a6ad: set up fast-forward from froyo-release to gingerbread

Merge commit '799a5a61d5813be83c4d0814b04c374adfe3a989'

* commit '799a5a61d5813be83c4d0814b04c374adfe3a989': (22 commits)
  Properly note the current active restore set's token
  Do not log AT command traffic by default.
  Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
  TimedEventQueue is apparently important for glitch-free media playback, and so
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
  When filling the cache, we always time out waiting for a condition that won't occur.
  Respond to changes in throttle policy.
  Fix Tethering of multiple downstream ifaces.
  Update Framework to support multiple dhpc ranges
  Dumb late-night typo.
  Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
  Clean up changing AP configuration
  Grant permissions to apps on sd when enabling/disabling packages.
  Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
  Switch default install location to unspecified.
  Fix problem with calling onConfigurationChanged() too much.
  Preserve widgets on upgrade.
  Need to keep new package's cert when using original-package.
  Pick up default install location
  Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
  ...

14 years agoset up fast-forward from froyo-release to gingerbread
The Android Open Source Project [Tue, 29 Jun 2010 21:34:35 +0000 (14:34 -0700)] 
set up fast-forward from froyo-release to gingerbread

Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a

14 years agoFixes a few minor problems with AAPT
Steve Block [Mon, 14 Jun 2010 16:34:04 +0000 (17:34 +0100)] 
Fixes a few minor problems with AAPT

- Fixes casting problems with stricter compilers
- Adds a couple of missing ifdef guards

This is a first step toward being able to generate APKs on the fly on the device.

Bug: 2766918
Change-Id: Icaaee5a4032afa313256add321b447443861dd85

14 years agoam dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not...
Dan Morrill [Thu, 17 Jun 2010 19:45:53 +0000 (12:45 -0700)] 
am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.

Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'

* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files

14 years agoam 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk...
Dan Morrill [Thu, 17 Jun 2010 19:36:17 +0000 (12:36 -0700)] 
am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.

Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files

14 years agoAs Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Dan Morrill [Wed, 16 Jun 2010 04:41:42 +0000 (21:41 -0700)] 
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be
presumed to require Bluetooth just because they take the permission.

Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74

14 years agoAs Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Dan Morrill [Wed, 16 Jun 2010 04:41:42 +0000 (21:41 -0700)] 
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be
presumed to require Bluetooth just because they take the permission.

Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74

14 years agoam 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt...
Joe Onorato [Tue, 15 Jun 2010 22:49:05 +0000 (15:49 -0700)] 
am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo

Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'

* commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.

14 years agoam 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps...
Joe Onorato [Tue, 15 Jun 2010 22:21:14 +0000 (15:21 -0700)] 
am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo

Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.

14 years agoThe aapt and aidl tools are prebuilt when we're doing an apps-only build, so don...
Joe Onorato [Fri, 11 Jun 2010 01:34:55 +0000 (18:34 -0700)] 
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.

Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff

14 years agoam fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyo
Dianne Hackborn [Sun, 6 Jun 2010 19:13:59 +0000 (12:13 -0700)] 
am fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyo

14 years agoam 5474902f: Merge "xhdpi" into froyo
Dianne Hackborn [Sun, 6 Jun 2010 19:10:05 +0000 (12:10 -0700)] 
am 5474902f: Merge "xhdpi" into froyo

Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken

* commit '5474902fe9fe72c825855c4a77f99a581a9f6594':
  xhdpi

14 years agoxhdpi
Dianne Hackborn [Fri, 4 Jun 2010 21:36:39 +0000 (14:36 -0700)] 
xhdpi

This is only a tool (aapt) change, and does not impact any current code.

Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840

14 years agoam 5095232d: am 15fe2cb7: Add error checking for translatable strings
Kenny Root [Thu, 3 Jun 2010 16:37:14 +0000 (09:37 -0700)] 
am 5095232d: am 15fe2cb7: Add error checking for translatable strings

14 years agoAdd error checking for translatable strings
Kenny Root [Fri, 28 May 2010 22:44:32 +0000 (15:44 -0700)] 
Add error checking for translatable strings

Translatable strings that have multiple substitutions should use
positional String.format() substitutions. This change makes it an error
not to use that format on translatable strings that have more than one
substitution in its text.

Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916

14 years agoam 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compat...
Dan Morrill [Wed, 5 May 2010 00:46:13 +0000 (17:46 -0700)] 
am 69a07917: am 6a22fb9b: am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo

14 years agoam f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics...
Dan Morrill [Tue, 4 May 2010 19:45:49 +0000 (12:45 -0700)] 
am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo

Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken

* commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
  Adding the backward-compatible filtering heuristics for the new device

14 years agoAdding the backward-compatible filtering heuristics for the new device
Dan Morrill [Mon, 3 May 2010 23:13:14 +0000 (16:13 -0700)] 
Adding the backward-compatible filtering heuristics for the new device
features definitions added in FroYo.

Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86

14 years agoam 14cee9f6: New xlarge screen size.
Dianne Hackborn [Wed, 28 Apr 2010 23:58:05 +0000 (16:58 -0700)] 
am 14cee9f6: New xlarge screen size.

14 years agoNew xlarge screen size.
Dianne Hackborn [Sat, 24 Apr 2010 00:51:26 +0000 (17:51 -0700)] 
New xlarge screen size.

Not complete, only for experimentation at this point.

This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.

The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.

Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5

14 years agoam 91720463: am 7fca18d4: am 29355534: Fix aapt to build in Windows SDK under Linux
Raphael [Mon, 26 Apr 2010 17:11:31 +0000 (10:11 -0700)] 
am 91720463: am 7fca18d4: am 29355534: Fix aapt to build in Windows SDK under Linux

14 years agoam 7fca18d4: am 29355534: Fix aapt to build in Windows SDK under Linux
Raphael [Sat, 24 Apr 2010 00:19:35 +0000 (17:19 -0700)] 
am 7fca18d4: am 29355534: Fix aapt to build in Windows SDK under Linux

Merge commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f' into kraken

* commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f':
  Fix aapt to build in Windows SDK under Linux

14 years agoFix aapt to build in Windows SDK under Linux
Raphael [Tue, 13 Apr 2010 22:21:32 +0000 (15:21 -0700)] 
Fix aapt to build in Windows SDK under Linux

(Merge master Change Ic4a7b9e4)

14 years agoFix aapt to build in Windows SDK under Linux
Raphael [Tue, 13 Apr 2010 22:21:32 +0000 (15:21 -0700)] 
Fix aapt to build in Windows SDK under Linux

Change-Id: Ic4a7b9e4df5b32bc338547a2a9d09b834ebaff14

14 years agomerge from kraken-plus-aosp
Jean-Baptiste Queru [Tue, 6 Apr 2010 23:38:00 +0000 (16:38 -0700)] 
merge from kraken-plus-aosp

Change-Id: Ice8381ca0386c01253be0fa6f9f91b993cac500d

14 years agomerge from kraken
Jean-Baptiste Queru [Tue, 6 Apr 2010 23:36:09 +0000 (16:36 -0700)] 
merge from kraken

Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0

14 years agoMerge policy from frameworks/policies/base
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:44:22 +0000 (15:44 -0700)] 
Merge policy from frameworks/policies/base

Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662

14 years agoMerge policy from frameworks/policies/base
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:44:11 +0000 (15:44 -0700)] 
Merge policy from frameworks/policies/base

Change-Id: I55bd6b5078290aa7cdeaae8d8b4141d744ccf152

14 years agoMerge policy from frameworks/policies/base
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:43:59 +0000 (15:43 -0700)] 
Merge policy from frameworks/policies/base

Change-Id: Ieca556a1e9ef62f6450aac1dfd33e8c180e7eeeb

14 years agoUse correct API version for UTF-8 checking
Kenny Root [Wed, 24 Mar 2010 18:55:16 +0000 (11:55 -0700)] 
Use correct API version for UTF-8 checking

Use the constant for checking the API version in aapt instead of a bare
number.

Bug: 2541326
Change-Id: Ice7af7b393363a00f1832dd84753b8138d057fb4

14 years agoMake aapt warning concise
Kenny Root [Thu, 18 Mar 2010 21:14:49 +0000 (14:14 -0700)] 
Make aapt warning concise

The previous warning made it seem like it could be using the value
specified on the command line, but, in fact, it would ignore the command
line value if it were already specified in the AndroidManifest.xml

Change-Id: I15e8161e094f17412680d25d3b7b810474eb4a31

14 years agoFix minSdkVersion scanning to not throw warnings
Kenny Root [Thu, 18 Mar 2010 19:12:11 +0000 (12:12 -0700)] 
Fix minSdkVersion scanning to not throw warnings

For the UTF8/UTF16 switch code, we needed to know what was the
minSdkVersion specified as early as possible. Unfortunately, this threw
warnings when the SDK was compiling since we always set this field in
the Bundle.

This splits out the field used by the initial AndroidManifest.xml scan
to a separate one that we won't attempt to re-insert into the
AndroidManifest.xml  This also switches the logic to better reflect the
preference of UTF-8 over UTF-16; previously UTF-16 was the default.

Change-Id: Ia81f6b21047043ebb711eb24c2c3718534979ef6

14 years agoGive an 9-patch error on too many rows and columns
Kenny Root [Fri, 12 Mar 2010 22:12:14 +0000 (14:12 -0800)] 
Give an 9-patch error on too many rows and columns

When you have too many rows and columns, there are not enough colors in
the 9-patch private metadata to represent them. Instead of crashing
aapt, this change gives the user an error message telling them why it's
invalid.

Change-Id: I5e7bd59472a3a2eafa7cbc263792458cce2b5594

14 years agoRevert "Dedupe resource config pointers"
Kenny Root [Wed, 10 Mar 2010 19:38:05 +0000 (11:38 -0800)] 
Revert "Dedupe resource config pointers"

This reverts commit 7b467d8b44c00d14590c021928b6a9ad5a36348e.

14 years agoDedupe resource config pointers
Kenny Root [Wed, 10 Mar 2010 00:55:23 +0000 (16:55 -0800)] 
Dedupe resource config pointers

When there are two configs in a StringPool that would match a string ID
only keep the more generic entry to save some space. This means that if
you have both "es" and "es_US" translations that have the same
translation, the string entry would be removed from the "es_US" config.

Change-Id: I4d619942d35ddb477e2eabe4437b7f02697c24de

14 years agoAdd ability for some manifest attributes to reference resources.
Dianne Hackborn [Tue, 9 Mar 2010 23:00:30 +0000 (15:00 -0800)] 
Add ability for some manifest attributes to reference resources.

This loosens our restriction on many manifest attributes requiring
literal string values, to allow various ones to use values from
resources.  This is only allowed if the resource value does not change
from configuration changes, and the restriction is still in place
for attributes that are core to security (requesting permissions) or
market operation (used libraries and features etc).

Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8

14 years agoMerge "Change an aapt "warning" from "*** " to "**** " (from three to four stars...
Ed Heyl [Fri, 5 Mar 2010 19:59:58 +0000 (11:59 -0800)] 
Merge "Change an aapt "warning" from "*** " to "**** " (from three to four stars). "*** " (three stars and a space) is the 'magic make error string'; so this change makes it easier to find the real issues/errors in build logs.  Besides, other aapt messages are "**** "."

14 years agoChange an aapt "warning" from "*** " to "**** " (from three to four stars).
Ed Heyl [Fri, 5 Mar 2010 19:08:58 +0000 (11:08 -0800)] 
Change an aapt "warning" from "*** " to "**** " (from three to four stars).
"*** " (three stars and a space) is the 'magic make error string'; so this change makes it
easier to find the real issues/errors in build logs.  Besides, other aapt messages are "**** ".

14 years agoMerge "Fix potential aapt crash when processing overlay."
Xavier Ducrohet [Fri, 5 Mar 2010 19:22:40 +0000 (11:22 -0800)] 
Merge "Fix potential aapt crash when processing overlay."

14 years agoFix potential aapt crash when processing overlay.
Xavier Ducrohet [Thu, 4 Mar 2010 23:21:59 +0000 (15:21 -0800)] 
Fix potential aapt crash when processing overlay.

If an overlay has a type of resources that's not defined in
the main res pool, then aapt would crash.

This dynamically create new ResourceTypeSet when needed
when processing the overlays

Change-Id: I67bc3622281bde73cf42f37a0983798d3f658ce2

14 years agoRefactor car mode.
Dianne Hackborn [Fri, 5 Mar 2010 02:41:49 +0000 (18:41 -0800)] 
Refactor car mode.

Extract all UI behavior from dock observer and ACTION_DOCK_EVENT.

Also introduce a desk type to go along with the car type all through
the resource system, since we now need to have corresponding high-level
broadcasts for desk dock mode.  As part of that I also reworked some
of the logic for switching modes to all funnel through a single
update() call that looks all of the current state to decide what to
do next, and fixed various locking issues.

In addition I found there were bugs in the configuration change
handling causing us to only switch into the car mode config and
then never get out of it.  Unfortunately now that we are actually
changing the configuration for each mode change, the transitions
between them are really crummy as we restart all kinds of
activities. :(

14 years agoFix issue #2485441: SettingsBackupAgent crashed system server
Dianne Hackborn [Wed, 3 Mar 2010 21:36:35 +0000 (13:36 -0800)] 
Fix issue #2485441: SettingsBackupAgent crashed system server

Need to take care of fixing up backupAdjust as well as reporting it
to ProGuard.

14 years agoFix issue #2482423: Settings is broken due to dead-code stripping
Dianne Hackborn [Tue, 2 Mar 2010 22:56:51 +0000 (14:56 -0800)] 
Fix issue #2482423: Settings is broken due to dead-code stripping

Take care of more custom classes in layouts, and also scan through
preference XMLs.

14 years agoFix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links
Dianne Hackborn [Tue, 2 Mar 2010 01:43:39 +0000 (17:43 -0800)] 
Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links

And related:

- The aapt tool now sets a resource configurations sdk level to match any configs
  that have been set (for example if you specify density your sdk level will be
  at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.

14 years agoCreate own reference for minSdkVersion in aapt
Kenny Root [Thu, 25 Feb 2010 07:49:59 +0000 (23:49 -0800)] 
Create own reference for minSdkVersion in aapt

Fix bug where applications defining a minSdkVersion were experiencing
transient errors from memory corruption in aapt.

Change-Id: I839d5eda7388baac6133e735fa59f9799ca2822d

14 years agoScan for android namespace in manifest
Kenny Root [Thu, 25 Feb 2010 04:00:03 +0000 (20:00 -0800)] 
Scan for android namespace in manifest

android:minSdkVersion wasn't being correctly scanned because the
namespace was incorrect. This fixes that problem so packages aren't
generated as UTF-8 when minSdkVersion is less than 7.

Change-Id: I8f45d47ea886915da6a4770f6e111e6085d61bee

14 years agoUse UTF-8 strings to avoid duplicate caching, part 1
Kenny Root [Tue, 23 Feb 2010 06:36:26 +0000 (22:36 -0800)] 
Use UTF-8 strings to avoid duplicate caching, part 1

StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.

This is part 1. Part 2 will include ResXMLParser optimizations.

Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c

14 years agoUse direct reference to enum in AaptAssets
Kenny Root [Fri, 19 Feb 2010 20:45:48 +0000 (12:45 -0800)] 
Use direct reference to enum in AaptAssets

The second argument to the getNavHiddenName can be NULL, so use a direct
reference to the class to get the enum values instead of the argument.

Change-Id: I0444572c23cb4de9e7da15a8310a49cf4619bb15

14 years agoMerge "Change buf size holding integer in ResourceTable"
Kenny Root [Thu, 18 Feb 2010 20:39:15 +0000 (12:39 -0800)] 
Merge "Change buf size holding integer in ResourceTable"

14 years agoChange buf size holding integer in ResourceTable
Kenny Root [Thu, 18 Feb 2010 17:43:08 +0000 (09:43 -0800)] 
Change buf size holding integer in ResourceTable

A 32-bit integer can be 10 characters long plus a byte for \0 at the
end.

Change-Id: I58040fe6e1674e78bcc6e07463ff36fb26e280f4

14 years agoFix enum reference
Kenny Root [Thu, 18 Feb 2010 16:54:47 +0000 (08:54 -0800)] 
Fix enum reference

Was using argument that is set default to NULL as a shortcut to an
enum's value. Change it to reference to class directly to avoid a null
pointer dereference.

Change-Id: I16b8ee15af4f095f027113131d574b70768994b0

14 years agoam ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt...
Xavier Ducrohet [Sat, 13 Feb 2010 01:55:17 +0000 (17:55 -0800)] 
am ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair

Merge commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4'

* commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4':
  Add --auto-add-overlay option to aapt. DO NOT MERGE

14 years agoam 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Xavier Ducrohet [Sat, 13 Feb 2010 01:52:28 +0000 (17:52 -0800)] 
am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair

Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp

* commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
  Add --auto-add-overlay option to aapt. DO NOT MERGE

14 years agoAdd --auto-add-overlay option to aapt. DO NOT MERGE
Xavier Ducrohet [Fri, 5 Feb 2010 02:45:31 +0000 (18:45 -0800)] 
Add --auto-add-overlay option to aapt. DO NOT MERGE

This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>

(merge from master)

Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9

14 years agoDump original-package entries.
Jeff Hamilton [Fri, 12 Feb 2010 19:45:16 +0000 (13:45 -0600)] 
Dump original-package entries.

Change-Id: I29b20811847555ff9858ef47cca69c8b992b24ea

14 years agoIntroduce special UI modes for night and car usage.
Tobias Haamel [Tue, 9 Feb 2010 22:09:17 +0000 (23:09 +0100)] 
Introduce special UI modes for night and car usage.

The device mode is now called ui mode. Furthermore is the order of
precedence for the resources now in such a way that the ui mode needs
to be specified after the orientation and before the density.

The ui mode can be set, like it is done for the locale, as follows:

IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY;
am.updateConfiguration(config);

To allow users to disable the car mode and set the night mode the IUiModeManager
interface is used.

The automatic night mode switching will be added in a separate change.

14 years agoMerge "Add --auto-add-overlay option to aapt."
Xavier Ducrohet [Tue, 9 Feb 2010 19:29:11 +0000 (11:29 -0800)] 
Merge "Add --auto-add-overlay option to aapt."

14 years agoam 0af04493: am 31bfdf69: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 22:23:32 +0000 (14:23 -0800)] 
am 0af04493: am 31bfdf69: reconcile main tree with open-source eclair

Merge commit '0af0449301e72a52beeed8f26021e5460004d67a'

* commit '0af0449301e72a52beeed8f26021e5460004d67a':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.

14 years agoam 31bfdf69: reconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:48:38 +0000 (08:48 -0800)] 
am 31bfdf69: reconcile main tree with open-source eclair

Merge commit '31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp

* commit '31bfdf695ef741f64066ef605bd6a7e23df88714':
  android-2.1_r1 snapshot
  Use 128p map tiles for high dpi devices.
  Throttle nitz updates as the are too numerous on cdma.
  don't request a sync when temp providers are created
  Increase light sensor delay from one to two seconds.
  Revert jparks code from IPCThreadState.
  Add a warning when we leave threads in the binder thread pool in the background scheduling group.
  PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
  Fix regression.
  Fix broken build.
  Bluetooth A2DP suspend/resume functionality
  EventLog when a database file is deleted due to corruption.
  Don't forget to clear "backup in progress" state when finishing a pass
  Fix issue #2148939: Sholes slow to wake up in landscape mode
  Fix Cdma re-start of default connection.
  Merge change 26821 into eclair
  Not all WebView's host have permission to read the history.
  Merge change 26908 into eclair

14 years agoreconcile main tree with open-source eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)] 
reconcile main tree with open-source eclair

14 years agoAdd --auto-add-overlay option to aapt.
Xavier Ducrohet [Fri, 5 Feb 2010 02:45:31 +0000 (18:45 -0800)] 
Add --auto-add-overlay option to aapt.

This option allows resources only present in overlays to be
added automatically instead of being declared through <add-resource>

Change-Id: Iff782311056f6a045193e57d204f7d3413e11b26

14 years agoAdd the --rename-manifest-package option to aapt.
Jeff Hamilton [Wed, 6 Jan 2010 21:46:38 +0000 (15:46 -0600)] 
Add the --rename-manifest-package option to aapt.

It allows you to force override the manifest
package listed in the AndroidManifest.xml when
creating an APK file.

Change-Id: I7eac7943c4e56610b65728ae54773a273634fd9d

14 years agoreconcile android-2.1_r1 snapshot
The Android Open Source Project [Fri, 29 Jan 2010 22:09:16 +0000 (14:09 -0800)] 
reconcile android-2.1_r1 snapshot

14 years agoam 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into...
Ying Wang [Wed, 27 Jan 2010 23:53:20 +0000 (15:53 -0800)] 
am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair

Merge commit '6efe03b19e0734361b262f9a0be4d225088d7f9e'

* commit '6efe03b19e0734361b262f9a0be4d225088d7f9e':
  Find layout classes in all "layout-*" dirs.

14 years agoam 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard...
Ying Wang [Fri, 22 Jan 2010 17:45:31 +0000 (09:45 -0800)] 
am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair

Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'

* commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c':
  Add instrumentation as a source tag for proguard keep options.

14 years agoam 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair
Ying Wang [Thu, 21 Jan 2010 19:12:29 +0000 (11:12 -0800)] 
am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclair

Merge commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be' into eclair-plus-aosp

* commit '6f9e2c648c0588a2eedef2746c9750ed9c6945be':
  Find layout classes in all "layout-*" dirs.

14 years agoFind layout classes in all "layout-*" dirs.
Ying Wang [Thu, 21 Jan 2010 06:12:46 +0000 (22:12 -0800)] 
Find layout classes in all "layout-*" dirs.

Before this CL, the generated keep flags for layout classes are incomplete,
such as layout classes in res/layout-port/ and res/layout-land and so on.

14 years agoam b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options...
Ying Wang [Tue, 19 Jan 2010 22:53:47 +0000 (14:53 -0800)] 
am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair

Merge commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace' into eclair-plus-aosp

* commit 'b5fb50a133c6fc7fc93d6241912dd9ec24de6ace':
  Add instrumentation as a source tag for proguard keep options.

14 years agoAdd instrumentation as a source tag for proguard keep options.
Ying Wang [Wed, 13 Jan 2010 22:18:11 +0000 (14:18 -0800)] 
Add instrumentation as a source tag for proguard keep options.

14 years agoam b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute...
Ying Wang [Wed, 13 Jan 2010 00:37:31 +0000 (16:37 -0800)] 
am b4f41119: am a1d08886: Merge "Only output proguard keep for nonempty attribute name in the AndroidManifest.xml." into eclair

Merge commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d'

* commit 'b4f41119044e5ec7f7b76ed4ac02b5cfbaeb474d':
  Only output proguard keep for nonempty attribute name in the AndroidManifest.xml.