summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am 8cfd3c01: am e05184f2: Merge "Output proguard keep flags for fragment ↵Ying Wang2010-08-161-18/+48
|\ | | | | | | | | | | | | | | | | classes." into gingerbread Merge commit '8cfd3c01e4582a587765588c02234527e7808ca0' * commit '8cfd3c01e4582a587765588c02234527e7808ca0': Output proguard keep flags for fragment classes.
| * am e05184f2: Merge "Output proguard keep flags for fragment classes." into ↵Ying Wang2010-08-131-18/+48
| |\ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'e05184f271f9882a5bf828e353aea40e0c06ff69' into gingerbread-plus-aosp * commit 'e05184f271f9882a5bf828e353aea40e0c06ff69': Output proguard keep flags for fragment classes.
| | * 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
* | | | am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest ↵Eric Fischer2010-08-161-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | formatted="false", not "true"." into gingerbread Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79' * commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79': Change aapt's warning message to suggest formatted="false", not "true".
| * | | am 244152bf: Merge "Change aapt\'s warning message to suggest ↵Eric Fischer2010-08-131-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
| | * | 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
| * | | am 7525c2cf: Merge "Add --max-res-version flag to aapt." into gingerbreadFicus Kirkpatrick2010-08-133-0/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '7525c2cfbbaa5c947c029008ef490e93a50c064f' into gingerbread-plus-aosp * commit '7525c2cfbbaa5c947c029008ef490e93a50c064f': Add --max-res-version flag to aapt.
| | * | 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
* | | 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 gingerbread. Change-Id: I71b889540380cb10bafb40f72582d3af785ae33a
* | | am 80328ba0: am 8ea71511: Merge "Initial tool for OBB manipulation" into ↵Kenny Root2010-08-112-0/+255
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a' * commit '80328ba09606bd0825d7d4c9a4f213d1de09e53a': Initial tool for OBB manipulation
| * | am 8ea71511: Merge "Initial tool for OBB manipulation" into gingerbreadKenny Root2010-08-112-0/+255
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '8ea71511c64e61fe23004889ff7032f991a751c8' into gingerbread-plus-aosp * commit '8ea71511c64e61fe23004889ff7032f991a751c8': Initial tool for OBB manipulation
| | * 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
* | | am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"Jean-Baptiste Queru2010-08-112-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3' * commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3': Fix build on some linux machines
| * | am e37ab632: Merge "Fix build on some linux machines"Jean-Baptiste Queru2010-08-112-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e37ab63221af94d69437741a3645fc0e14a680bc' into gingerbread-plus-aosp * commit 'e37ab63221af94d69437741a3645fc0e14a680bc': Fix build on some linux machines
| | * | 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>
* | | | Make libhwui entirely optional.Romain Guy2010-08-081-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The makefile variable USE_OPENGL_RENDERER must be set to true to compile libhwui and the related code in the JNI layer. This change also removes obsolete APIs from Canvas that must not be used and would be confusing if left in. These APIs were remnants of our first attempt at an OpenGL renderer for the view hierarchy and had not been taken out before Android 1.0 was released. Change-Id: I2475ff1307212bab26c926724f3c508681c7dae1
* | | | am 3d02b48b: merge from open-source masterThe Android Open Source Project2010-07-191-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '3d02b48bd95293c767563729264f007dbcff82b3' * commit '3d02b48bd95293c767563729264f007dbcff82b3': Fix the layoutlib Paint.set(Paint) method.
| * | | merge from open-source masterThe Android Open Source Project2010-07-191-0/+2
| |\ \ \ | | |/ / | | | / | | |/ | |/| Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
| | * 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
* | | \ \ \ am 92a47ea3: am 562124e8: Merge "Clean up some style in the makefiles." into ↵Joe Onorato2010-07-151-3/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07' * commit '92a47ea3a7b82708e46c9d1710355f5e5fdd4f07': Clean up some style in the makefiles.
| * | | | | Clean up some style in the makefiles.Joe Onorato2010-07-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
* | | | | | Fixes a few minor problems with AAPTSteve Block2010-06-257-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier ↵Dan Morrill2010-06-171-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are ↵Joe Onorato2010-06-152-1/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | 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
* | | | resolved conflicts for merge of 9e660c82 to masterJeff Brown2010-06-131-1/+10
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
| * | | 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 fc15bd94: am 168585ed: am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-061-0/+5
|\ \ \ \ | |/ / /
| * | | 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
* | | | new API in Context. on openDatabase, new param DatabaseErrorHandlerVasu Nori2010-06-031-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add new method openOrCreateDatabase in Context.java to allow callers specify a DatabaseErrorHandler object to be used when database corruption occurs. add new constructor in SQLiteOpenHelper to accept DatabaseErrorHandler as an additional param to be used when SQLiteDatabase instance is created. Change-Id: I912a0202a74510f9ca0206dd8101c4abab9102ae
* | | | am 5095232d: am 15fe2cb7: Add error checking for translatable stringsKenny Root2010-06-033-9/+139
|\ \ \ \ | |/ / /
| * | | 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 cee6300c: am 38a410f1: am 686d9ff5: merge from open-source masterThe Android Open Source Project2010-05-101-1/+1
|\ \ \ \ | |/ / /
| * | | 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
| | | |\
| | | | * long modifier was on the wrong argument.Scott Turner2010-01-141-1/+1
| | | | |
| | | | * merge from eclairJean-Baptiste Queru2009-11-1552-823/+4890
| | | | |\
| | | | | * eclair snapshotJean-Baptiste Queru2009-11-1363-843/+4907
| | | | | |
| | | * | | am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" ↵Xavier Ducrohet2010-02-124-7/+17
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp * commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a': Add --auto-add-overlay option to aapt. DO NOT MERGE
generated by cgit v1.1 at 2025-11-26 18:45:54 +0000