summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * Fix the layoutlib Paint.set(Paint) method.Xavier Ducrohet2010-07-161-0/+2
| | | | | | | | | | | | | | | | | | It would change the text rendering info but not recompute the Java Font objects. The effect is a broken font rendering in the EditText (which use this method to copy some Paint object before using the copy for the actual drawing) Change-Id: I6d8d1bf86f0d77d088f60ad81c71dd3ebab727b0
| * am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth ↵Dan Morrill2010-06-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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 froyo-plus-aosp * commit '6b22d81aa35d9a9b32670995c002e92588b2fe09': As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
| * \ am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing ↵Joe Onorato2010-06-152-1/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an apps-only build, so don\'t try to build them." into froyo Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp * commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
| * \ \ am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-041-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into froyo-plus-aosp * commit '5474902fe9fe72c825855c4a77f99a581a9f6594': xhdpi
* | | | | Implement #2964234: Add support for <uses-package> element to aaptDianne Hackborn2010-09-021-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb381f387cab7e5a99006691e330d0e3d9d0f250
* | | | | Add a --debug-mode option to aapt.Xavier Ducrohet2010-08-313-3/+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: I6f0a7af7b7d51f26bb0ec012e6f142a6060b8618
* | | | | Merge "Add LFH offset to verbose list of APK" into gingerbreadKenny Root2010-08-252-8/+9
|\ \ \ \ \
| * | | | | Add LFH offset to verbose list of APKKenny Root2010-08-252-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Fix linux 64 buildBrian Carlstrom2010-08-242-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | git cherry-pick -e 49416bc658e37a0f4ae4f2b7b8582dd1606fba0f Change-Id: I37a689acea8aeb5d6ac92ee56b077bafe4fba170
* | | | | Fix aapt dump badging to support xlarge screens.Dianne Hackborn2010-08-201-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieeb757cd48ad9b3f46c5e4aed9d5efaeac834049
* | | | | Add OBB flags to support overlaysKenny Root2010-08-181-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add flags field in OBB footer to support overlays. * Remove unused 'crypto' and 'filesystem' fields in obbtool (could later be supported in the "flags" field of the OBB footer). * Add notes to document OBB classes before shipping. Change-Id: I386b43c32c5edef55210acb5d3322639c08010ba
* | | | | Merge "Output proguard keep flags for fragment classes." into gingerbreadYing Wang2010-08-131-18/+48
|\ \ \ \ \
| * | | | | Output proguard keep flags for fragment classes.Ying Wang2010-08-131-18/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec Bug: 2916847
* | | | | | Merge "Change aapt's warning message to suggest formatted="false", not ↵Eric Fischer2010-08-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | "true"." into gingerbread
| * | | | | | Change aapt's warning message to suggest formatted="false", not "true".Eric Fischer2010-08-131-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | True is the default and specifying it won't suppress the warning. Change-Id: I8ecc919b4059bf3321e781649cb46dd2d3807592
* | | | | | Add --max-res-version flag to aapt.Ficus Kirkpatrick2010-08-133-0/+26
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Initial tool for OBB manipulationKenny Root2010-08-112-0/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "obbtool" host command for adding, removing, and querying Opaque Binary Blob (OBB) information from a file. Change-Id: Id2ac41e687ad2a500c362616d6738a8ae7e8f5c3
* | | | | Fix the layoutlib Paint.set(Paint) method. Do not merge.Xavier Ducrohet2010-07-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would change the text rendering info but not recompute the Java Font objects. The effect is a broken font rendering in the EditText (which use this method to copy some Paint object before using the copy for the actual drawing) Change-Id: I9e7fbf9bd57b421fd793876a6de4ade1ecac372d
* | | | | Clean up some style in the makefiles.Joe Onorato2010-07-141-3/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
* | | | | am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth ↵Dan Morrill2010-06-171-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk filesDan Morrill2010-06-151-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing ↵Joe Onorato2010-06-152-1/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | The aapt and aidl tools are prebuilt when we're doing an apps-only build, so ↵Joe Onorato2010-06-102-1/+8
| | |/ | |/| | | | | | | | | | | | | don't try to build them. Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff
* | | Native input dispatch rewrite work in progress.Jeff Brown2010-06-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old dispatch mechanism has been left in place and continues to be used by default for now. To enable native input dispatch, edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy. Includes part of the new input event NDK API. Some details TBD. To wire up input dispatch, as the ViewRoot adds a window to the window session it receives an InputChannel object as an output argument. The InputChannel encapsulates the file descriptors for a shared memory region and two pipe end-points. The ViewRoot then provides the InputChannel to the InputQueue. Behind the scenes, InputQueue simply attaches handlers to the native PollLoop object that underlies the MessageQueue. This way MessageQueue doesn't need to know anything about input dispatch per-se, it just exposes (in native code) a PollLoop that other components can use to monitor file descriptor state changes. There can be zero or more targets for any given input event. Each input target is specified by its input channel and some parameters including flags, an X/Y coordinate offset, and the dispatch timeout. An input target can request either synchronous dispatch (for foreground apps) or asynchronous dispatch (fire-and-forget for wallpapers and "outside" targets). Currently, finding the appropriate input targets for an event requires a call back into the WindowManagerServer from native code. In the future this will be refactored to avoid most of these callbacks except as required to handle pending focus transitions. End-to-end event dispatch mostly works! To do: event injection, rate limiting, ANRs, testing, optimization, etc. Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
* | | am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-061-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken * commit '5474902fe9fe72c825855c4a77f99a581a9f6594': xhdpi
| * | xhdpiDianne Hackborn2010-06-041-0/+5
| | | | | | | | | | | | | | | | | | This is only a tool (aapt) change, and does not impact any current code. Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840
* | | Add error checking for translatable stringsKenny Root2010-06-033-9/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 686d9ff5: merge from open-source masterThe Android Open Source Project2010-05-101-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken * commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51': Use isLocationProviderEnabled to test for enabled providers Added WEB_URL_PATTERN for Montenegro ".me" long modifier was on the wrong argument.
| * | merge from open-source masterThe Android Open Source Project2010-05-101-1/+1
| |\ \ | | |/ | |/| | | | Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
| | * Merge "long modifier was on the wrong argument."Jean-Baptiste Queru2010-05-101-1/+1
| | |\