summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am 5580e44c: Merge "Support changing style parent in overlays"Jean-Baptiste Queru2010-11-051-14/+0
|\ | | | | | | | | * commit '5580e44c250944f5cd011b2682eea5cc2de9706c': Support changing style parent in overlays
| * Merge "Support changing style parent in overlays"Jean-Baptiste Queru2010-11-041-14/+0
| |\
| | * Support changing style parent in overlaysMartin Nordholts2010-08-171-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package overlays makes it possible for vendors to tweak the look of the platform and the applications without touching any platform or application code directly. This makes package overlays an important mechanism in the Android build system. There is currently a limitation that forbids changing the parent of a style. If vendors could change the parent of e.g. ‘CalendarTheme’ from Android’s vanilla ‘Theme’ to ‘VendorTheme’, then vendor specific adjustments could be done without changing any code directly. From looking at the code it can be seen that the parent value of a style is stored temporarily in ResourceTable::Entry::mParent while overlays are gone through in buildResources(), and processed (in ResourceTable::Entry::assignResourceIds()) at first after all overlays have been handled, so there aren’t any obvious reasons why changing parent in an overlay should be forbidden. Change-Id: I5969bb8aab90df437e1967fc504cc0da79107d13
* | | am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbreadScott Main2010-11-051-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * commit '46151652b8dc562f4a3332e1d12fa799e3638ea8': fix xlarge support in aapt for gingerbread
| * | | fix xlarge support in aapt for gingerbreadScott Main2010-11-041-2/+2
| | | | | | | | | | | | | | | | Change-Id: I4d8872fb839a6eadc538055215d4455af328846c
* | | | am 63e5d07e: Merge "Fix issue with project resources overriding framework ↵Xavier Ducrohet2010-10-273-19/+22
|\ \ \ \ | |/ / / | | | | | | | | resources." into gingerbread
| * | | Fix issue with project resources overriding framework resources.Xavier Ducrohet2010-10-263-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Framework resources loaded through Drawable.createFromXml could be overriden by project resources if there were loaded through a state list drawable where the final resource name was used by a project resource (of the same type). This ensures that the XML parser knows that it's a framework resource being parsed and that the resource resolution uses that information. Change-Id: I39cf9eba755e55f1604b968637aeecff969a558d
* | | | am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse ↵Xavier Ducrohet2010-10-263-11/+104
|\ \ \ \ | |/ / / | | | | | | | | editors." into gingerbread
| * | | Fix rendering of digitalClock/Gallery in Eclipse editors.Xavier Ducrohet2010-10-263-11/+104
| | | | | | | | | | | | | | | | Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
* | | | am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"Xavier Ducrohet2010-10-222-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Make layoutlib use the prebuilt of layoutlib_apiXavier Ducrohet2010-10-212-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ie04a9e847acacf7b2aeb179589517fc75688c75b
* | | | am ba501785: Merge "Implement issue #3116702: New manifest tags for ↵Dianne Hackborn2010-10-211-9/+50
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Implement issue #3116702: New manifest tags for supported screen sizes DO ↵Dianne Hackborn2010-10-211-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE Change-Id: Iabf64d86c89d387ffbfbc39f950d308a73fe17eb
* | | | am 004f968d: Merge "Link against the static libcrypto in external/openssl." ↵Ying Wang2010-10-181-14/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '004f968d0cf60c08d7b393129ed2d6e4304041e5' into gingerbread-plus-aosp * commit '004f968d0cf60c08d7b393129ed2d6e4304041e5': Link against the static libcrypto in external/openssl.
| * | | Link against the static libcrypto in external/openssl.Ying Wang2010-10-141-14/+11
| | | | | | | | | | | | | | | | Change-Id: Iad41ec975f9b9a4aec0b8470678320f5abe03e1f
* | | | am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbreadJoe Onorato2010-10-141-7/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp * commit '3d828e62c856074334a00ce7c621050b4d7166e4': Do not build pbkdf2gen on non-Linux hosts
| * | | Do not build pbkdf2gen on non-Linux hostsKenny Root2010-10-141-7/+10
| | | | | | | | | | | | | | | | Change-Id: I9f575a2ca7d45102a4f67424ea5866cf750adb13
* | | | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-134-11/+192
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp * commit 'bdf8034c657147226b2390eef113ff841e0d6065': OBB: use PBKDF2 for key generation.
| * | | Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-134-11/+192
| |\ \ \
| | * | | OBB: use PBKDF2 for key generation.Kenny Root2010-10-134-11/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using PBKDF2 for the key generation for OBBs. Any previously generated OBBs will stop being read correctly. A small pbkdf2gen program is available to allow generation of appropriate keys with the salts. Bug: 3059950 Change-Id: If4305c989fd692fd1150eb270dbf751e09c37295
* | | | | am 3394db7d: Merge "Regenerate preloaded classes for Gingerbread." into ↵Jesse Wilson2010-10-132-1/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '3394db7d9432053e56d86b3f24e64deeb3099950' into gingerbread-plus-aosp * commit '3394db7d9432053e56d86b3f24e64deeb3099950': Regenerate preloaded classes for Gingerbread.
| * | | | Merge "Regenerate preloaded classes for Gingerbread." into gingerbreadJesse Wilson2010-10-132-1/+13
| |\ \ \ \
| | * | | | Regenerate preloaded classes for Gingerbread.Jesse Wilson2010-10-132-1/+13
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike previous releases where the set of classes-to-be-preloaded was generated on a first-generation device (G1 and MyTouch 3G), this round I used a second-generation device, a Nexus One. As a consequence, class loading is faster (win) and fewer classes hit the 1250ms threshold. Instead of sharing classes based on load time alone, classes are now shared based on the number of applications loading them. Change-Id: I18f7aa3e7e6258818871b3968b515c06314371b3 http://b/2546002
* | | | | am 5c62ab0a: Merge "Adding a new <uses-gl-texture/> tag, to be used to ↵Dan Morrill2010-10-131-0/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Adding a new <uses-gl-texture/> tag, to be used to enable apps to specifyDan Morrill2010-10-131-0/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | filtering based on support for OpenGL ES texture and texture compression formats. Change-Id: I993209a673579b296007ae2ba830d0275770dd11
| * | | Avoid pre-processing images when they won't be usedAnthony Newnam2010-10-061-1/+3
| | | | | | | | | | | | | | | | Change-Id: I24db3645c399f66dc7cc0e85909ce34b68ff829e
* | | | am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into ↵Xavier Ducrohet2010-10-071-5/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a' into gingerbread-plus-aosp * commit '656d21656ad9b33f7d7e1e4960a2f03076a5fc7a': Parser is optional in obtainStyledAttributes.
| * | | Parser is optional in obtainStyledAttributes.Xavier Ducrohet2010-10-041-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the parser is null it just means the default style/values are used. Change-Id: I5ff3d632fd5dfc5a1ce42796b2fef7b30f9fbf34
* | | | am 407f625a: Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp * commit '407f625a9b8e356e765a5ec587c443af1f3aadb5': Add new API to find out whether external storage is removable.
| * | | Add new API to find out whether external storage is removable.Dianne Hackborn2010-10-041-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbreadKenny Root2010-10-011-3/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp * commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486': Add "none" for vold and deprecate mkobb -c
| * | | Add "none" for vold and deprecate mkobb -cKenny Root2010-10-011-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If vold isn't told "none" for the key, it will try to mount it as an encrypted container. Also remove the -c option from mkobb since it can be triggered by including a key as well. Change-Id: I40a8ff3f778bfda682312630e6687ecc14b51844
* | | | am 735de3b3: Hash keys with MD5; track IBinders not IInterfaceKenny Root2010-09-301-9/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '735de3b38abbd6564082a819377673ee593744a6' into gingerbread-plus-aosp * commit '735de3b38abbd6564082a819377673ee593744a6': Hash keys with MD5; track IBinders not IInterface
| * | | Hash keys with MD5; track IBinders not IInterfaceKenny Root2010-09-301-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a plaintext password doesn't work unless it's a certain length, so just hash the plaintext password with MD5 to make it the right length for the twofish encryption. Tracking the IInterface doesn't make much sense since it's different each time, so track the IBinder instead. That way we can unlinkToDeath the binder when the last thing it's holding onto goes away. Change-Id: Id828d25b4d74f27e9d8b4bfb3909c964469cc473
* | | | am 292c246b: Merge "Call functions to calculate deps and classes.jar" into ↵Ying Wang2010-09-281-8/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '292c246b27319bc2195e2b3dbc3c3adea22db672' into gingerbread-plus-aosp * commit '292c246b27319bc2195e2b3dbc3c3adea22db672': Call functions to calculate deps and classes.jar
| * | | Call functions to calculate deps and classes.jarYing Wang2010-09-281-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | Instead of hard-coding them. Change-Id: Ia5818a1a69efb0964d5aa7de7e8d30ef04dfeccc
* | | | am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into ↵Dianne Hackborn2010-09-271-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp * commit 'd8691d73d158acd9ffc63748126e822afd656707': Allow all apps to call ContentResolver.getType().
| * | | Allow all apps to call ContentResolver.getType().Dianne Hackborn2010-09-261-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't find the bug number for this, but it is needed for some things we are doing where the app building an intent may not have access to the URI in the data field. This is for HC, but doing in GB to avoid introducing integration issues. Change-Id: I0cac971854198b18775d2a73deb80f23431bfbe2
* | | | am 91512f57: Layoutlib_create: Unittest for ClassHasNativeVisitor.Raphael2010-09-244-3/+196
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '91512f579e7a1bf91d23254471ee47d3a88d342f' into gingerbread-plus-aosp * commit '91512f579e7a1bf91d23254471ee47d3a88d342f': Layoutlib_create: Unittest for ClassHasNativeVisitor.
| * | | Layoutlib_create: Unittest for ClassHasNativeVisitor.Raphael2010-09-244-3/+196
| | | | | | | | | | | | | | | | Change-Id: Id101bb3fc2644e450847e73c933cb6f616982f24
* | | | am 37cedce1: Merge "Add an aapt option to allow string variations for ↵Eric Fischer2010-09-233-5/+95
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | different devices." into gingerbread Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp * commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed': Add an aapt option to allow string variations for different devices.
| * | | Add an aapt option to allow string variations for different devices.Eric Fischer2010-09-233-5/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am f2960b8d: Refresh the layoutlib_create doc.Raphael Moll2010-09-211-36/+164
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24' into gingerbread-plus-aosp * commit 'f2960b8d66d7a20f590716f5e51160e77d0d1b24': Refresh the layoutlib_create doc.
| * | | Refresh the layoutlib_create doc.Raphael Moll2010-09-211-36/+164
| | | | | | | | | | | | | | | | Change-Id: I43e92c33d824ace9edd77d90a1b36a5f69d85e7f
* | | | am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbreadKenny Root2010-09-211-0/+260
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Merge commit '34d3aeaf7f5dd744f46220f7730913468256ae9c' into gingerbread-plus-aosp * commit '34d3aeaf7f5dd744f46220f7730913468256ae9c': Add image creator helper script for OBBs
| * | | Add image creator helper script for OBBsKenny Root2010-09-211-0/+260
| | | | | | | | | | | | | | | | Change-Id: Id3f2b158077e8d104582e0ac720c2428c3ba4d97
* | | | am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"Xavier Ducrohet2010-09-101-1/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | Merge commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9' into gingerbread-plus-aosp * commit '89fef4183a3c58aebbbf66e894bbdc1ae9f634e9': Avoid pre-processing images when they won't be used
| * | Avoid pre-processing images when they won't be usedAnthony Newnam2010-09-031-1/+3
| | | | | | | | | | | | Change-Id: Iffa31228ca95a2e29ccc0aa81bda0fc66922d577
| * | Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-2/+18
| |/ | | | | | | | | | | | | | | | | | | | | 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
| * Fix build on some linux machineshmepas2010-08-112-2/+2
| | | | | | | | | | | | | | 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>
generated by cgit v1.1 at 2025-11-26 18:45:29 +0000