Dianne Hackborn [Fri, 22 Oct 2010 03:27:26 +0000 (20:27 -0700)]
am
101f14b2: (-s ours) am
ba501785: Merge "Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit '
101f14b275ab2451aef50dec427376d721d17aea'
* commit '
101f14b275ab2451aef50dec427376d721d17aea':
Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE
Dianne Hackborn [Fri, 22 Oct 2010 03:17:56 +0000 (20:17 -0700)]
am
ba501785: Merge "Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit '
ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp
* commit '
ba501785c7b298198d1c6e4787fd40e98f97da67':
Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE
Dianne Hackborn [Thu, 21 Oct 2010 22:32:06 +0000 (15:32 -0700)]
Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE
Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
Dan Morrill [Fri, 15 Oct 2010 15:33:00 +0000 (08:33 -0700)]
am
b58af2b8: am
5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Merge commit '
b58af2b8b3871436942d0e2c878c906bffaa2fb0'
* commit '
b58af2b8b3871436942d0e2c878c906bffaa2fb0':
Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
Dan Morrill [Wed, 13 Oct 2010 22:23:27 +0000 (15:23 -0700)]
am
5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify filtering based on support for OpenGL ES texture and texture compression formats." into gingerbread
Merge commit '
5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1' into gingerbread-plus-aosp
* commit '
5c62ab0af9dadc3bccdad7b01c3ae17266f0b0e1':
Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
Dan Morrill [Wed, 13 Oct 2010 21:33:43 +0000 (14:33 -0700)]
Adding a new <uses-gl-texture/> tag, to be used to enable apps to specify
filtering based on support for OpenGL ES texture and texture compression
formats.
Change-Id: I993209a673579b296007ae2ba830d0275770dd11
Xavier Ducrohet [Tue, 12 Oct 2010 00:42:54 +0000 (17:42 -0700)]
am
ceb3aae3: am
4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit '
ceb3aae348d4b17e6282fe7706fc22b699ee9a1d'
* commit '
ceb3aae348d4b17e6282fe7706fc22b699ee9a1d':
Avoid pre-processing images when they won't be used
Xavier Ducrohet [Sun, 10 Oct 2010 22:19:58 +0000 (15:19 -0700)]
am
4e1658af: Merge "Avoid pre-processing images when they won\'t be used" into gingerbread
Merge commit '
4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d' into gingerbread-plus-aosp
* commit '
4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d':
Avoid pre-processing images when they won't be used
Anthony Newnam [Wed, 1 Sep 2010 17:06:04 +0000 (12:06 -0500)]
Avoid pre-processing images when they won't be used
Change-Id: I24db3645c399f66dc7cc0e85909ce34b68ff829e
Dianne Hackborn [Mon, 4 Oct 2010 21:54:59 +0000 (14:54 -0700)]
resolved conflicts for merge of
10d5b096 to master
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
Dianne Hackborn [Mon, 4 Oct 2010 21:03:06 +0000 (14:03 -0700)]
am
407f625a: Add new API to find out whether external storage is removable.
Merge commit '
407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp
* commit '
407f625a9b8e356e765a5ec587c443af1f3aadb5':
Add new API to find out whether external storage is removable.
Dianne Hackborn [Mon, 4 Oct 2010 18:31:17 +0000 (11:31 -0700)]
Add new API to find out whether external storage is removable.
This is implemented based on whether we are using the "nosdcard"
product. Needed to tweak aapt to allow use of the product attribute
with other resource definition tags besides strings.
Change-Id: I49922d23b52a34183a8e2f4d2515adaf1fc9149a
Eric Fischer [Thu, 23 Sep 2010 20:52:00 +0000 (13:52 -0700)]
am
9c708358: am
37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Merge commit '
9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7'
* commit '
9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7':
Add an aapt option to allow string variations for different devices.
Eric Fischer [Thu, 23 Sep 2010 20:49:44 +0000 (13:49 -0700)]
am
37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Merge commit '
37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp
* commit '
37cedce14bc0e68e8bf27c2cecb181728226e6ed':
Add an aapt option to allow string variations for different devices.
Eric Fischer [Wed, 15 Sep 2010 22:59:21 +0000 (15:59 -0700)]
Add an aapt option to allow string variations for different devices.
The --product option to aapt is a comma-separated list of characteristics
of the device being built for. For example, --product nosdcard,grayscale
for a device with no SD card and a grayscale screen.
Strings can specify a product="characteristic" option to cause that version
of the string to be used only for that type of device. All such strings
should also specify, at the end of the block, product="default", which
will be used if none of the variations match. For example:
<string name="choose" product="bw">Choose black or white</string>
<string name="choose" product="grayscale">Choose a shade of gray</string>
<string name="choose" product="default">Choose a color</string>
The default characteristic will also be used when no --product option
is specified.
Change-Id: Ie6c1505599e02e15b7818e8be6ec47bc6ce71aaa
Xavier Ducrohet [Fri, 10 Sep 2010 22:01:56 +0000 (15:01 -0700)]
am
fa888784: am
89fef418: Merge "Avoid pre-processing images when they won\'t be used"
Merge commit '
fa8887848e2877dd96e853dfcd52086f1b66c26b'
* commit '
fa8887848e2877dd96e853dfcd52086f1b66c26b':
Avoid pre-processing images when they won't be used
Xavier Ducrohet [Fri, 10 Sep 2010 20:03:43 +0000 (13:03 -0700)]
am
89fef418: Merge "Avoid pre-processing images when they won\'t be used"
Merge commit '
89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp
* commit '
89fef4183a3c58aebbbf66e894bbdc1ae9f634e9':
Avoid pre-processing images when they won't be used
Anthony Newnam [Wed, 1 Sep 2010 17:06:04 +0000 (12:06 -0500)]
Avoid pre-processing images when they won't be used
Change-Id: Iffa31228ca95a2e29ccc0aa81bda0fc66922d577
Dianne Hackborn [Fri, 3 Sep 2010 00:59:51 +0000 (17:59 -0700)]
am
31103928: am
192b56d4: Merge "Implement #
2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '
31103928ed5b9091bcd7de74c8a49675d10c87e7'
* commit '
31103928ed5b9091bcd7de74c8a49675d10c87e7':
Implement #
2964234: Add support for <uses-package> element to aapt
Dianne Hackborn [Fri, 3 Sep 2010 00:36:37 +0000 (17:36 -0700)]
am
192b56d4: Merge "Implement #
2964234: Add support for <uses-package> element to aapt" into gingerbread
Merge commit '
192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d' into gingerbread-plus-aosp
* commit '
192b56d42a4f6e5e6c736b0f22dd5bd201b02c9d':
Implement #
2964234: Add support for <uses-package> element to aapt
Dianne Hackborn [Fri, 3 Sep 2010 00:14:41 +0000 (17:14 -0700)]
Implement #
2964234: Add support for <uses-package> element to aapt
Change-Id: Ifb381f387cab7e5a99006691e330d0e3d9d0f250
Jean-Baptiste Queru [Thu, 2 Sep 2010 19:08:37 +0000 (12:08 -0700)]
am
d0743dfb: resolved conflicts for merge of
bd6abed3 to gingerbread-plus-aosp
Merge commit '
d0743dfbeeb1fb5d63a6be2631e9aa2107233291'
* commit '
d0743dfbeeb1fb5d63a6be2631e9aa2107233291':
Add a --debug-mode option to aapt.
Jean-Baptiste Queru [Thu, 2 Sep 2010 19:05:33 +0000 (12:05 -0700)]
resolved conflicts for merge of
bd6abed3 to gingerbread-plus-aosp
Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d
Xavier Ducrohet [Tue, 31 Aug 2010 17:45:31 +0000 (10:45 -0700)]
Add a --debug-mode option to aapt.
When passed (with no needed parameters) to the aapt command line,
aapt will insert debuggable=true in the application node of the manifest
automatically.
This is to be used by the SDK tools to make true "debug" builds
that require no code/file change.
Change-Id: I909759caef499a91d10cc9a0902c6448c87e75ef
Xavier Ducrohet [Tue, 31 Aug 2010 21:35:28 +0000 (14:35 -0700)]
am
b4649ec7: am
23827557: Merge "Add a --debug-mode option to aapt." into gingerbread
Merge commit '
b4649ec720fa959b700a7a03c089bfdc61321d16'
* commit '
b4649ec720fa959b700a7a03c089bfdc61321d16':
Add a --debug-mode option to aapt.
Xavier Ducrohet [Tue, 31 Aug 2010 21:32:53 +0000 (14:32 -0700)]
am
23827557: Merge "Add a --debug-mode option to aapt." into gingerbread
Merge commit '
2382755730206da52b64bf7bd2fad421f9a6fd0d' into gingerbread-plus-aosp
* commit '
2382755730206da52b64bf7bd2fad421f9a6fd0d':
Add a --debug-mode option to aapt.
Xavier Ducrohet [Tue, 31 Aug 2010 17:45:31 +0000 (10:45 -0700)]
Add a --debug-mode option to aapt.
When passed (with no needed parameters) to the aapt command line,
aapt will insert debuggable=true in the application node of the manifest
automatically.
This is to be used by the SDK tools to make true "debug" builds
that require no code/file change.
Change-Id: I6f0a7af7b7d51f26bb0ec012e6f142a6060b8618
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
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
Kenny Root [Thu, 26 Aug 2010 00:20:29 +0000 (17:20 -0700)]
Merge "Add LFH offset to verbose list of APK" 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
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
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
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
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.
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.
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
Dianne Hackborn [Fri, 20 Aug 2010 19:44:33 +0000 (12:44 -0700)]
Fix aapt dump badging to support xlarge screens.
Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
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.
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".
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.
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.
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.
Ying Wang [Fri, 13 Aug 2010 22:26:21 +0000 (15:26 -0700)]
Merge "Output proguard keep flags for fragment classes." into gingerbread
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".
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
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
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.
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.
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
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.
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
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
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
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
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
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>
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.
...
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
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
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
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
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
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
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.
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.
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
Dianne Hackborn [Sun, 6 Jun 2010 19:13:59 +0000 (12:13 -0700)]
am
fc15bd94: am
168585ed: am
5474902f: Merge "xhdpi" into froyo
Dianne Hackborn [Sun, 6 Jun 2010 19:10:05 +0000 (12:10 -0700)]
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
Kenny Root [Thu, 3 Jun 2010 16:37:14 +0000 (09:37 -0700)]
am
5095232d: am
15fe2cb7: Add 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
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
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
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
Dianne Hackborn [Wed, 28 Apr 2010 23:58:05 +0000 (16:58 -0700)]
am
14cee9f6: New 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
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
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
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)
Raphael [Tue, 13 Apr 2010 22:21:32 +0000 (15:21 -0700)]
Fix aapt to build in Windows SDK under Linux
Change-Id: Ic4a7b9e4df5b32bc338547a2a9d09b834ebaff14
Jean-Baptiste Queru [Tue, 6 Apr 2010 23:38:00 +0000 (16:38 -0700)]
merge from kraken-plus-aosp
Change-Id: Ice8381ca0386c01253be0fa6f9f91b993cac500d
Jean-Baptiste Queru [Tue, 6 Apr 2010 23:36:09 +0000 (16:36 -0700)]
merge from kraken
Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:44:22 +0000 (15:44 -0700)]
Merge policy from frameworks/policies/base
Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:44:11 +0000 (15:44 -0700)]
Merge policy from frameworks/policies/base
Change-Id: I55bd6b5078290aa7cdeaae8d8b4141d744ccf152
Jean-Baptiste Queru [Tue, 6 Apr 2010 22:43:59 +0000 (15:43 -0700)]
Merge policy from frameworks/policies/base
Change-Id: Ieca556a1e9ef62f6450aac1dfd33e8c180e7eeeb
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
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
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
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
Kenny Root [Wed, 10 Mar 2010 19:38:05 +0000 (11:38 -0800)]
Revert "Dedupe resource config pointers"
This reverts commit
7b467d8b44c00d14590c021928b6a9ad5a36348e.
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
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
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 "**** "."
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 "**** ".
Xavier Ducrohet [Fri, 5 Mar 2010 19:22:40 +0000 (11:22 -0800)]
Merge "Fix 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
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. :(
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.
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.