summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Add isPremultiplied option to Bitmap_Delegate in LayoutLibDeepanshu Gupta2013-09-042-14/+88
| | | | Change-Id: Id06921d8db2fe898fdc60ef9d05d05f8dfe3f94a
* Merge "Better aidl generated dependency" into klp-devYing Wang2013-08-261-0/+10
|\
| * Better aidl generated dependencyYing Wang2013-08-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if an imported aidl file has been deleted or moved, the generated dependency file still contains the stale file name, and make will fail with "No rule to make target <the deleted/moved file>". This change uses technique described in section "Automatic Dependency Generation", Chapter 8 of "Managing Projects with GNU Make (3d Edition)". The same technique is used by the Android platform build system to generate C/C++ header dependencies. Bug: 10459179 Change-Id: Ib0c01a4234ef1af994487fdc846cdf8d13a675f6
* | Merge "Add CancellationSignal support to file operations." into klp-devJeff Sharkey2013-08-231-3/+5
|\ \ | |/ |/|
| * Add CancellationSignal support to file operations.Jeff Sharkey2013-08-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since ContentProvider file operations can end up doing substantial network I/O before returning the file, allow clients to cancel their file requests with CancellationSignal. Ideally this would only be needed for openFile(), but ContentResolver heavily relies on openAssetFile() and openTypedAssetFile() for common cases. Also improve documentation to mention reliable ParcelFileDescriptors and encourage developers to move away from "rw" combination modes, since they restrict provider flexibility. Mention more about places where pipes or socket pairs could be returned. Improve DocumentsContract documentation. Bug: 10329944 Change-Id: I49b2825ea433eb051624c4da3b77612fe3ffc99c
* | DO NOT MERGE. Fix test breakagesatok2013-08-231-0/+6
| | | | | | | | Change-Id: I0b2b7ce4b9f50910b4795cb480aa86a662b16f7d
* | Add inPremutiplied option to BitmapFactory.Options, functionality in BitmapChris Craik2013-08-201-2/+4
|/ | | | | | bug:2248948 Change-Id: I8fdd649332667598504a1076d5a447572bd53086
* Merge "Bring along BridgeContext for the ride." into klp-devJeff Sharkey2013-08-121-0/+18
|\
| * Bring along BridgeContext for the ride.Jeff Sharkey2013-08-111-0/+18
| | | | | | | | Change-Id: Ic11c0df447c82be3922d529f18a290cfdfec6b05
* | Refactor Canvas.drawPicture() to delegate to PictureJonathan Dixon2013-08-081-8/+0
|/ | | | | | | | | Bug: 9814370 To allow WebView.capturePicture() to return a subclass, we need to ensure the subclass is always consulted when being drawn into a canvas. Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
* Reduce the transaction fee of getEnabledInputMethodSubtypeListSatoshi Kataoka2013-08-081-1/+1
| | | | | Bug: 8467480 Change-Id: If18cce8fbe567df51f29adcdcedff3f743460b8b
* am 9516ed45: am cfc23ac6: Merge "Add support for MNC=00"Wink Saville2013-07-301-0/+3
|\ | | | | | | | | * commit '9516ed4598948eea5623c57e443bce08c1f48ab6': Add support for MNC=00
| * am cfc23ac6: Merge "Add support for MNC=00"Wink Saville2013-07-301-0/+3
| |\ | | | | | | | | | | | | * commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc': Add support for MNC=00
| | * Add support for MNC=00Mattias Petersson2013-07-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for operators with MNC (Mobile Network Code) zero to add customized resources. For example, it makes it possible to add a folder called "/res/values-mnc00/" in an application. This will cause resources in that folder to be used when MNC is zero. (There is a total of 14 countries that have an operator with MNC zero.) Without this fix, the resource framework gets confused, because MNC 0 is normally used when the MNC is undefined (not set). Bug: 7170488 Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
* | | Exclude magic inner-class name from preloadKenny Root2013-07-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a magic subclass name that will exclude inner classes that are meant to prevent object instatiation but allow class preloading. This will allow classes that have undesired side-effects to delay initialization until the side-effects are no longer disruptive. Bug: 9984058 Change-Id: I46b0784760d84a2a2da1f9f41d87ee7f70a3fc16
* | | Merge "Fix home activity and user switch interactions."Craig Mautner2013-07-191-1/+1
|\ \ \
| * | | Fix home activity and user switch interactions.Craig Mautner2013-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure Home activity goes in the correct task and on the correct stack. - Do not allow different users to be in the same task. - Do not set stacks aside for each user. Fixes bug 9775492. Change-Id: I0e7954e917aac8482a1015a36923e02914e2b692
* | | | am 388f85eb: am a2f41b23: am bf8be2ee: Merge "Add orientation to ↵Deepanshu Gupta2013-07-191-0/+18
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | configuration for layoutlib." into jb-mr2-dev * commit '388f85eb451bd0b61c8f48b500de5db6bca941f1': Add orientation to configuration for layoutlib.
| * | | am a2f41b23: am bf8be2ee: Merge "Add orientation to configuration for ↵Deepanshu Gupta2013-07-191-0/+18
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | layoutlib." into jb-mr2-dev * commit 'a2f41b23b6328b0ff3bb04d4a88ccf4a84a50375': Add orientation to configuration for layoutlib.
| | * | Add orientation to configuration for layoutlib.Deepanshu Gupta2013-07-121-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Update the configuration with the device orientation before rendering. Change-Id: Icd40901204fd13f90b18353e53a15e25e5b2176c
* | | | Fix build.Jeff Brown2013-07-181-2/+2
| |_|/ |/| | | | | | | | Change-Id: Ie83f51ab4b8fddceda8d4f0ac24c532eab7458b8
* | | Move input library code to frameworks/native.Jeff Brown2013-07-013-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | No longer compile libandroidfw as a static library on the device since it already exists as a shared library. Keeping the static library would force us to provide a static library version of libinput for the device as well which doesn't make sense. Change-Id: I3517881b87b47dcc209d80dbd0ac6b5cf29a766f
* | | Switch to shared libpng/libz dependency.Stephen Hines2013-06-261-3/+5
| | | | | | | | | | | | | | | Bug: 9593270 Change-Id: I1eec2590cca046d6e030c73d31a6b400019e1ebd
* | | Fix build.Craig Mautner2013-06-241-2/+2
| | | | | | | | | | | | Change-Id: Icdfc6bcbe8603cf9bd3f8982a595336c0407e7d6
* | | Remove concept of system bar from window manager.John Spurlock2013-06-142-10/+2
| | | | | | | | | | | | | | | | | | It was already hardcoded to false, this change removes the dead code. Change-Id: I5e543344e60f69cb9882a70ba29f7c09404ad9fc
* | | Fix a bug resolving the correct icon/logo in action barsAdam Powell2013-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some abstraction-breaking magic in ActionBarView and replace it with proper resolution of the icon/logo when creating a window. The old implementation relied on the ActionBarView's context being an Activity. Bug 9171554 Change-Id: Idbbb1942622195dcb55e8119f2d64287b07bb509
* | | am fc691f9d: am 417e512b: Merge "Add missing native methods." into jb-mr2-devDeepanshu Gupta2013-05-246-36/+94
|\ \ \ | |/ / | | | | | | | | | * commit 'fc691f9df0392a661c4d1708c905f82d50c17f27': Add missing native methods.
| * | am 417e512b: Merge "Add missing native methods." into jb-mr2-devDeepanshu Gupta2013-05-246-36/+94
| |\ \ | | |/ | | | | | | | | | * commit '417e512ba1d099583c41bd7595f2124ca77c2aee': Add missing native methods.
| | * Add missing native methods.Deepanshu Gupta2013-05-236-36/+94
| | | | | | | | | | | | Change-Id: I7b34e2ec0164520efc658053a80f307791a992b1
| * | am bd1730de: Merge "Document the \'aapt dump strings\' command"Christopher Tate2013-04-291-0/+1
| |\ \ | | |/ | |/| | | | | | | * commit 'bd1730dec7356e042ee885ff4a63b40f36733062': Document the 'aapt dump strings' command
* | | Fix build.Dianne Hackborn2013-05-211-1/+1
| | | | | | | | | | | | Change-Id: I3dc503a3cd30276ac10582db44732d96b68230ee
* | | Merge "aapt: move qsort_r_compat here as it is sole client"Dima Zavin2013-05-084-2/+132
|\ \ \
| * | | aapt: move qsort_r_compat here as it is sole clientDima Zavin2013-05-074-2/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is only used on the host for MacOS X compatibility. Apparently, glibc and Apple's libc disagree on the parameter ordering. Change-Id: I214edcf2870b6ac88316306ac5af43f1dadf9b2e Signed-off-by: Dima Zavin <dima@android.com>
* | | | desperate attempt to fix linux build.Mathias Agopian2013-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | working on the assumption that the ordering in LOCAL_STATIC_LIBRARIES matters. Change-Id: Ibf5b706652049b195bd66c84c9a5fa1122454ca6
* | | | libutils clean-upMathias Agopian2013-05-077-3/+296
|/ / / | | | | | | | | | Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
* | | Merge commit 'b3f66877' into afdmergeJeff Sharkey2013-04-291-0/+1
|\ \ \ | | |/ | |/| | | | Change-Id: I319863cf23b2e6eacfa4508f7b111fba7b1cbc24
| * | Document the 'aapt dump strings' commandMårten Kongstad2013-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | | Update the usage page for aapt to mention 'strings' as a valid subcommand to 'dump'. Change-Id: Iadb2b8ce36951ff36ffbf6b5ea349ba1e2b12582
* | | am 9e69a2ce: am 03ce5b53: Fix build.Ying Wang2013-04-291-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit '9e69a2ced4e11f74ee979390c3f58ec4318a16c3': Fix build.
| * | Fix build.Ying Wang2013-04-261-1/+1
| | | | | | | | | | | | Change-Id: I1fedbbb521305e02502ddb23a96b5ee96fa43b7b
* | | am f266c6b9: am f99177f3: Merge "Update preloaded classes" into jb-mr2-devKenny Root2013-04-292-1/+12
|\ \ \ | |/ / | | | | | | | | | * commit 'f266c6b93f44fcc674d4c5686af0c1d1b782dab0': Update preloaded classes
| * | Merge "Update preloaded classes" into jb-mr2-devKenny Root2013-04-262-1/+12
| |\ \
| | * | Update preloaded classesKenny Root2013-04-262-1/+12
| | | | | | | | | | | | | | | | | | | | Bug: 5213043 Change-Id: I272500ce7f6ea6bfbc624c9705f8c8b8ef1aa0ad
* | | | Merge "Allow compiling aapt for the device"Bjorn Bringert2013-04-294-6/+167
|\ \ \ \
| * | | | Allow compiling aapt for the deviceBjorn Bringert2013-04-264-6/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - The static device version of libandroidfw now includes the extra functions needed by aapt. I could only find a few host tools that use the static library, so this is hopefully not a problem. - The pseudolocalization code is moved into aapt. It was previously in libhost, but only used by aapt. Change-Id: Ib393ebb7dcebee8abbb628cbe5255ea1679674ac
* | | | | am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aospJeff Brown2013-04-261-59/+55
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit 'eb6403e95d601b62be7b4610599e72fd329f2666': Generate SDK docs for v7 support library packages.
| * | | Generate SDK docs for v7 support library packages.Jeff Brown2013-04-261-59/+55
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change required fixing some bugs in how AAPT handles qualified symbols such as "android:layout_height" when generating JavaDoc links. The links were being generated using the package name of the generated R file rather than the package name of the referenced symbol. These broken links caused the JavaDoc build to fail. Bug: 8175766 Change-Id: I52fbef27825a25abca960cb44b59c2132267e9d6
* | | First draft of Scenes & Transitions featureChet Haase2013-04-181-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This checkin has preliminary API (in flux, definitely changes still to be made) and implementation for a new "Scenes & Transitions" feature. The current implementation allows you to define different Scenes (via layout resource IDs or callbacks) and Transitions to be used when changing to those scenes. By default, scene changes will use AutoTransition, which generally does the right thing. There are no overview docs or tutorials yet. The best way to learn how things work is to see the code for the various tests in frameworks/base/tests/TransitionTests. Expect the API to change. Expect the implementation to change (mostly to add more functionality). Expect bugs, but tell me if things do not work as expected. Change-Id: Ib025a9f565678b225afa4759325cf6d496cc7215
* | | am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final ↵Xavier Ducrohet2013-04-131-12/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | IDs for styleable." * commit 'ade20f49a1a0226c06a6ae5d8074c9c1cc14a152': Revert "Make --non-constant-id generates non final IDs for styleable."
| * | Revert "Make --non-constant-id generates non final IDs for styleable."Xavier Ducrohet2013-04-131-12/+5
| | | | | | | | | | | | This reverts commit 8730f46ae5ba9021a0e01c068ffc6b552b6c4510.
* | | am 95637018: am 629b1c4f: Merge "Make --non-constant-id generates non final ↵Xavier Ducrohet2013-04-121-5/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | IDs for styleable." into jb-mr2-dev * commit '95637018052655783a25e8123c5b6f898c4171e6': Make --non-constant-id generates non final IDs for styleable.