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

13 years agoAdd "television" mode.
Dianne Hackborn [Fri, 20 May 2011 23:11:04 +0000 (16:11 -0700)] 
Add "television" mode.

Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b

13 years agoReconcile with honeycomb-release
The Android Open Source Project [Fri, 20 May 2011 21:33:24 +0000 (14:33 -0700)] 
Reconcile with honeycomb-release

Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f

13 years agoresolved conflicts for merge of 06a8ceac to master
Dianne Hackborn [Fri, 20 May 2011 04:44:52 +0000 (21:44 -0700)] 
resolved conflicts for merge of 06a8ceac to master

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

13 years agoam c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.
Dianne Hackborn [Fri, 20 May 2011 02:34:21 +0000 (19:34 -0700)] 
am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.

* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
  Add new "-swNNNdp" resource qualifier.

13 years agoAdd new "-swNNNdp" resource qualifier.
Dianne Hackborn [Fri, 20 May 2011 01:13:32 +0000 (18:13 -0700)] 
Add new "-swNNNdp" resource qualifier.

Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce

13 years agoam 2e4a3236: (-s ours) am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate...
Dianne Hackborn [Fri, 13 May 2011 22:22:30 +0000 (15:22 -0700)] 
am 2e4a3236: (-s ours) am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE.  Integrate add new screen width/height in "dp" configs." into honeycomb-mr2

* commit '2e4a3236a7634d17f89288e9739a438ecbea0471':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.

13 years agoam 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height...
Dianne Hackborn [Fri, 13 May 2011 18:21:26 +0000 (11:21 -0700)] 
am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE.  Integrate add new screen width/height in "dp" configs." into honeycomb-mr2

* commit '46a282f323bc05606e4fe1eba795bd9ac7c99819':
  DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.

13 years agoDO NOT MERGE. Integrate add new screen width/height in "dp" configs.
Dianne Hackborn [Fri, 13 May 2011 01:07:47 +0000 (18:07 -0700)] 
DO NOT MERGE.  Integrate add new screen width/height in "dp" configs.

You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I4acb73d82677b74092c1da9e4046a4951921f9f4

13 years agoam eedf20c2: Ignore xml change since file no longer exists
Conley Owens [Wed, 27 Apr 2011 23:54:40 +0000 (16:54 -0700)] 
am eedf20c2: Ignore xml change since file no longer exists

* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoIgnore xml change since file no longer exists
Conley Owens [Wed, 27 Apr 2011 23:49:07 +0000 (16:49 -0700)] 
Ignore xml change since file no longer exists

13 years agoMerge changes I0ab47e2f,Ib8016996
Conley Owens [Wed, 27 Apr 2011 20:06:46 +0000 (13:06 -0700)] 
Merge changes I0ab47e2f,Ib8016996

* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content

13 years agoresolved conflicts for merge of 18490fb9 to master
Kenny Root [Tue, 12 Apr 2011 19:51:08 +0000 (12:51 -0700)] 
resolved conflicts for merge of 18490fb9 to master

Change-Id: I6c68e6fb0f9c1182a955689bbffc161a8f30bd37

13 years agoresolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
Kenny Root [Tue, 12 Apr 2011 17:27:15 +0000 (10:27 -0700)] 
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp

Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53

13 years agoNormalize output of XMLtree content
Shachar Shemesh [Mon, 11 Apr 2011 10:32:19 +0000 (13:32 +0300)] 
Normalize output of XMLtree content

Make the output from aapt dump xmltree normalized, so that it is unambigously
displayed regardless of the content of the strings. Previous patch left out
handling of XML element content.

Change-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a

13 years agoAdd new resource configurations for screen width/height in "dp".
Dianne Hackborn [Wed, 30 Mar 2011 23:20:26 +0000 (16:20 -0700)] 
Add new resource configurations for screen width/height in "dp".

You can now specify resource configuration variants "wNNNdp"
and "hNNNdp".  These are the minimum screen width/height in "dp"
units.  This allows you to do things like have your app adjust
its layout based only on the about of horizontal space available.

This introduces a new configuration change flag for screen size.
Note that this configuration change happens each time the orientation
changes.  Applications often say they handle the orientation change
to avoid being restarted at a screen rotation, and this will now
cause them to be restarted.  To address this, we assume the app can
handle this new config change if its target SDK version is < ICS.

Change-Id: I22f8afa136b4f274423978c570fa7c9855040496

13 years agoRuntime resource overlay, iteration 1.
Mårten Kongstad [Thu, 17 Mar 2011 13:13:41 +0000 (14:13 +0100)] 
Runtime resource overlay, iteration 1.

Runtime resource overlay allows unmodified applications to appear
as if they had been compiled with additional resources defined. See
libs/utils/README for more information.

This commit is the first iteration of runtime resource overlay. It
provides the actual overlay modifications and loading of trusted overlay
packages (ie residing in /vendor) targeting framework-res.apk.

This commit loads exactly one overlay package. The overlay,
if present, must target framework-res.apk and be located at
/vendor/overlay/framework/framework-res.apk.

Change-Id: If26ee7754813004a96c043dba37fbe99fa3919db

13 years agoAdd screen layout size as one of the resource filtering axes.
Ying Wang [Mon, 14 Mar 2011 22:53:23 +0000 (15:53 -0700)] 
Add screen layout size as one of the resource filtering axes.

So that we can add screen layout size such as
"small/normal/large/xlarge" to PRODUCT_LOCALES to filter unwanted
resources. We already handle screen density this way.
Bug: 4086309

Change-Id: I0867e22a825faea0e100d8a0075f0f5cb7c0c964

13 years agoAdd notice files for aapt and aidl.
Xavier Ducrohet [Tue, 1 Mar 2011 02:36:18 +0000 (18:36 -0800)] 
Add notice files for aapt and aidl.

Change-Id: I51da138475618287760043059790aba87f4c3f35

13 years agoam ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."
Xavier Ducrohet [Mon, 28 Feb 2011 18:10:38 +0000 (10:10 -0800)] 
am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.

13 years agoam dff6b8e7: Merge "Add --non-constant-id to aapt."
Xavier Ducrohet [Mon, 28 Feb 2011 17:16:38 +0000 (09:16 -0800)] 
am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
  GpsLocationProvider: Clean up HAL initialization/cleanup sequence
  Fixed GSM encoded network initiated position request
  Ensuring thread-safe usage of DateFormat.
  Fixing infinite loop for zero duration.
  Fix for an infinite loop while scrolling lists.
  WAPPushManager, WAP Push over SMS message handler
  Add --non-constant-id to aapt.

13 years agoAdd --non-constant-id to aapt.
Xavier Ducrohet [Tue, 15 Feb 2011 00:58:00 +0000 (16:58 -0800)] 
Add --non-constant-id to aapt.

This option enbables creating resource constant in the R class
that are not actual constant, but simply static fields.

The goal is to build library projects with these types of
IDs so that the constant does not get inlined in the library
code, since the ID for the library resources only are not
the final values.

The final resource IDs, generated from the main project and
its library(ies), will have proper constant with the final
values.

This allows us to generate binary library bundle (a jar file
and associated resources) that can be distributed. Additionally,
this will let us make the library project support in Eclipse
much more robust and a better user experience overall.

Change-Id: Ibe2f08d68493fde658fc3f7606abf7446f312ad2

13 years agoam a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"
Dianne Hackborn [Sun, 30 Jan 2011 07:07:48 +0000 (23:07 -0800)] 
am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

* commit 'a1f5e82f37c77af7b1d630b5bca715d1742f1234':
  Normalize output from aapt d

13 years agoam a30063d8: am 25eb0464: Merge "Normalize output from aapt d"
Dianne Hackborn [Sun, 30 Jan 2011 07:04:50 +0000 (23:04 -0800)] 
am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

* commit 'a30063d80c08434ac3c7316f338c6d54110449ab':
  Normalize output from aapt d

13 years agoMerge "Normalize output from aapt d"
Dianne Hackborn [Sun, 30 Jan 2011 06:53:20 +0000 (22:53 -0800)] 
Merge "Normalize output from aapt d"

13 years agoam e802b592: am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept...
Dianne Hackborn [Sat, 29 Jan 2011 23:08:07 +0000 (15:08 -0800)] 
am e802b592: am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"

* commit 'e802b59280540ce24ea1db61907a0f1f22f01fad':
  Make AaptGroupEntry::getMncName accept mnc00

13 years agoam 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
Dianne Hackborn [Sat, 29 Jan 2011 23:05:30 +0000 (15:05 -0800)] 
am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"

* commit '2107757dde0b3159119edcc9084fcb9a87985e88':
  Make AaptGroupEntry::getMncName accept mnc00

13 years agoMerge "Make AaptGroupEntry::getMncName accept mnc00"
Dianne Hackborn [Sat, 29 Jan 2011 22:38:48 +0000 (14:38 -0800)] 
Merge "Make AaptGroupEntry::getMncName accept mnc00"

13 years agoam 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
Dianne Hackborn [Tue, 25 Jan 2011 18:02:46 +0000 (10:02 -0800)] 
am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

* commit '1240719ae06855d38f1fa159dd73e2109bb9586f':
  aapt: Allow raw "%" in unformatted string-arrays

13 years agomerge in honeycomb-release history after reset to honeycomb
The Android Automerger [Mon, 24 Jan 2011 15:22:28 +0000 (07:22 -0800)] 
merge in honeycomb-release history after reset to honeycomb

13 years agoaapt: Allow raw "%" in unformatted string-arrays
Josh Stone [Tue, 18 Jan 2011 02:34:11 +0000 (18:34 -0800)] 
aapt: Allow raw "%" in unformatted string-arrays

Commit 15fe2cb added format checking for translatable strings, enforcing
the use of positional args.  This check can be disabled on <string>
values with translatable="false" or formatted="false".  But they didn't
check for those attributes on <string-array>, so some of CM's strings
fail when they're not really format strings, just because they contain
percent signs.  (e.g. brightness widget's "Auto/Dim/40%/100%")

So now the formatted/translatable attributes are checked in string-array
too, and we can restore our proper percent signs.

Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080

13 years agoam bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
Dianne Hackborn [Sun, 23 Jan 2011 20:57:33 +0000 (12:57 -0800)] 
am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"

* commit 'bcf2adeb10c41becec3baa2bcb8de9212272399a':
  aapt: Allow raw "%" in unformatted string-arrays

13 years agoaapt: Allow raw "%" in unformatted string-arrays
Josh Stone [Tue, 18 Jan 2011 02:34:11 +0000 (18:34 -0800)] 
aapt: Allow raw "%" in unformatted string-arrays

Commit 15fe2cb added format checking for translatable strings, enforcing
the use of positional args.  This check can be disabled on <string>
values with translatable="false" or formatted="false".  But they didn't
check for those attributes on <string-array>, so some of CM's strings
fail when they're not really format strings, just because they contain
percent signs.  (e.g. brightness widget's "Auto/Dim/40%/100%")

So now the formatted/translatable attributes are checked in string-array
too, and we can restore our proper percent signs.

Change-Id: I3478ab7e0b939e61fe0cec20201ac55096264080

13 years agomerge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 6 Jan 2011 15:30:36 +0000 (07:30 -0800)] 
merge in honeycomb-release history after reset to honeycomb

13 years agoAdd new "animator" and "interpolator" resource directories.
Dianne Hackborn [Wed, 5 Jan 2011 05:02:48 +0000 (21:02 -0800)] 
Add new "animator" and "interpolator" resource directories.

First phase, allowing apps to move over to the new names.

Change-Id: Ia16f3e2383e4a6599a0011d0464f0aacb1ce9207

13 years agoNormalize output from aapt d
Shachar Shemesh [Mon, 20 Dec 2010 15:38:33 +0000 (17:38 +0200)] 
Normalize output from aapt d

Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed
regardless of the content of the strings.

Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf

13 years agoMake AaptGroupEntry::getMncName accept mnc00
Johan Redestig [Tue, 9 Nov 2010 13:13:31 +0000 (14:13 +0100)] 
Make AaptGroupEntry::getMncName accept mnc00

MNC 00 is a valid network code and is used by
some operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code.

Remove the test that checks if atoi returns zero.
The string is validated to contain only numbers
already.

Also discussed here:
https://code.google.com/p/android/issues/detail?id=3657

Change-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7

13 years agoMerge branch 'master' into honeycomb-release
android-merger [Wed, 15 Dec 2010 17:25:02 +0000 (09:25 -0800)] 
Merge branch 'master' into honeycomb-release

13 years agoam 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so...
Dan Morrill [Tue, 14 Dec 2010 19:31:29 +0000 (11:31 -0800)] 
am 0ccc8b73: am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread

* commit '0ccc8b7345eac0b507c221be47e55926cbda8957':
  GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).

13 years agoam 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name...
Dan Morrill [Tue, 14 Dec 2010 19:28:50 +0000 (11:28 -0800)] 
am 5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread

* commit '5441a9ff2128cf2c5088974c74b79d2d1734f755':
  GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).

13 years agoGL texture filtering changed from AND to OR, so rename tag name to match.
Dan Morrill [Tue, 14 Dec 2010 00:25:54 +0000 (16:25 -0800)] 
GL texture filtering changed from AND to OR, so rename tag name to match.
(<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs.
supports-screen).

Change-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f

13 years agoMerge branch 'master' into honeycomb-release
The Android Automerger [Thu, 9 Dec 2010 15:21:54 +0000 (07:21 -0800)] 
Merge branch 'master' into honeycomb-release

13 years agoChange assets to use 64-bit API
Kenny Root [Wed, 24 Nov 2010 20:56:06 +0000 (12:56 -0800)] 
Change assets to use 64-bit API

The asset system and supporting libraries were using off_t instead of
off64_t to access files larger than 2GB (32-bit signed). This change
replaces all off_t with off64_t and lseek64.

There is a new utils/Compat.h added for Mac OS compatibility.

Also fixed some size-related compiler warnings.

Bug: 3205336
Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e

13 years agomanual merge due to conflicts
android-build SharedAccount [Mon, 29 Nov 2010 17:22:05 +0000 (09:22 -0800)] 
manual merge due to conflicts

Change-Id: Id3901c3969111ea43ffdbfeadcf33491bb1c1114

14 years agoAdd knowledge of mipmap to aapt
Kenny Root [Tue, 23 Nov 2010 06:28:37 +0000 (22:28 -0800)] 
Add knowledge of mipmap to aapt

New mipmap drawable type that does not get filtered according to
configuration. Useful for things that get built as part of the system.

Change-Id: I556033d065e504079271dce79c23c90d3c387ce4

14 years agoAdd knowledge of mipmap to aapt
Kenny Root [Tue, 23 Nov 2010 06:28:37 +0000 (22:28 -0800)] 
Add knowledge of mipmap to aapt

New mipmap drawable type that does not get filtered according to
configuration. Useful for things that get built as part of the system.

Change-Id: I556033d065e504079271dce79c23c90d3c387ce4