summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Replace LruCache implementation for layoutlib. do not merge.Xavier Ducrohet2012-07-105-19/+428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The android version depends on a custom version of LinkedHashMap which is not present on desktop VMs. This new implementation is done in a way that minimizes the difference between the two. Also some minor fixes. (cherry picked from commit 01b6c755dbcf24e71192dc44757e2eea2a426091) Change-Id: Idc7bca820e472e281a3024a5b610fd55606cf428
* | | | Removing a workaround for incorrect window position on window move.Svetoslav Ganov2012-07-161-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The window manager was not notifying a window when the latter has been moved. This was causing incorrect coordinates of the nodes reported to accessibility services. To workaround that we have carried the correct window location when making a call from the accessibility layer into a window. Now the window manager notifies the window when it is moved and the workaround is no longer needed. This change takes it out. 2. The left and right in the attach info were not updated properly after a report that the window has moved. 3. The accessibility manager service was calling directly methods on the window manager service without going through the interface of the latter. This leads to unnecessary coupling and in the long rung increases system complexity and reduces maintability. bug:6623031 Change-Id: Iacb734b1bf337a47fad02c827ece45bb2f53a79d
* | | | Add missing interface method.Craig Mautner2012-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix broken build. Change-Id: I6644df218e11a35330a985bdcb9ace33723330f5
* | | | Replace LruCache implementation for layoutlib.Xavier Ducrohet2012-07-105-19/+428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The android version depends on a custom version of LinkedHashMap which is not present on desktop VMs. This new implementation is done in a way that minimizes the difference between the two. Also some minor fixes. Change-Id: Ib27b0419f9d0e6ba4d4abb26b2ccd968af59eba8
* | | | Use two fingers to work some magic...Dianne Hackborn2012-06-251-0/+6
| | | | | | | | | | | | | | | | Change-Id: Ibcb3dbd3d158c22da8277e544d81fb47eadccd49
* | | | am cc6cf51b: am 8c71784e: Merge "Initialize mJunkPath to false"Jean-Baptiste Queru2012-06-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cc6cf51b80eabd199f797f40b76f7980c343962b': Initialize mJunkPath to false
| * | | am 8c71784e: Merge "Initialize mJunkPath to false"Jean-Baptiste Queru2012-06-221-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '8c71784e9e83e914135e996591aa7903edd2fd96': Initialize mJunkPath to false
| | * | Initialize mJunkPath to falseHaitao Feng2012-06-221-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib48bb1d91736d27f055528c3ba275237ff5ada07
* | | | am 58a8d8d2: am 0e302bc8: Merge "Disable debug output in SDK layoutlib." ↵Xavier Ducrohet2012-06-191-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '58a8d8d2d4b15cd4abf010680181359823ebfda4': Disable debug output in SDK layoutlib.
| * | | am 0e302bc8: Merge "Disable debug output in SDK layoutlib." into jb-devXavier Ducrohet2012-06-191-1/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '0e302bc884fa4b25eb391d625f2fb0eddc25d9b7': Disable debug output in SDK layoutlib.
| | * | Disable debug output in SDK layoutlib.Xavier Ducrohet2012-06-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 6697442 Change-Id: I9741761342ea220c158aa124089430b0db80bf7e
* | | | am bce1011d: resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aospRaphael Moll2012-06-143-11/+846
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bce1011dd2a371c587d2e39ad8c3d446b63049d0': Layoutlib Create: Find dependencies.
| * | | resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aospRaphael Moll2012-06-143-11/+846
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I06608e3c122b8f321429d457c51aa2213dd238b4
| | * \ \ am 0f160c95: Merge "Layoutlib Create: Find dependencies."Raphael Moll2012-06-144-52/+790
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '0f160c95122276c40ca84afe6fcd2b9cd800e35c': Layoutlib Create: Find dependencies.
| | | * | Layoutlib Create: Find dependencies.Raphael Moll2012-06-134-52/+790
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage: layoutlib_create --list-deps /path/to/layoutlib.jar Prints: - all classes found in the Jar and the types they use (the dependencies). - all the dependencies missing from the Jar and what uses them. Change-Id: I8b2674df127e1494feed7a653282e88e4d2f5494
* | | | | am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" ↵Dianne Hackborn2012-06-121-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '6892f1ec9670432f1cab71813592077bea991a8b': Fix issue #6641368: can't launch gallery
| * | | | am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-devDianne Hackborn2012-06-121-1/+3
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '0f6471ace77387560988964ed0679f843bba6f1f': Fix issue #6641368: can't launch gallery
| | * | | Fix issue #6641368: can't launch galleryDianne Hackborn2012-06-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627, but with comments added so I don't make this mistake again. :) Change-Id: I053216279e3721f08f32f561bb989736ef619f82
| * | | | am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt ↵Jean-Baptiste Queru2012-06-051-0/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | built with Mac OS X SDK 10.6." * commit 'c9fe6568f3e7e4d9dc6da072afc929b9a81001ed': Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
| | * | | am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac ↵Jean-Baptiste Queru2012-06-051-0/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | OS X SDK 10.6." * commit '9e22d9c514457c4b163d03b9241e4e28b1698368': Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
| | | * | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.Ying Wang2012-06-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SDK 10.6 without _DARWIN_UNLIMITED_STREAMS aapt sometimes fails right away with the error "Too many open files" when calling fopen(). Change-Id: Ifa7bd8a9530d706aa47f98be8186f1aefe943d76
* | | | | Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."Ying Wang2012-06-051-0/+4
|\ \ \ \ \
| * | | | | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.Ying Wang2012-05-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SDK 10.6 without _DARWIN_UNLIMITED_STREAMS aapt sometimes fails right away with the error "Too many open files" when calling fopen(). Change-Id: Ifa7bd8a9530d706aa47f98be8186f1aefe943d76
* | | | | | am 9f374b9d: am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '9f374b9de5a557a7977b24d41f45c3464cfff8c1': Tweak default ignore-assets path
| * | | | | am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '44ff9b8f9294e015031fc9293974604771e5efdd': Tweak default ignore-assets path
| | * | | | am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '36ac43ba9982a78b4a047c8970776505a3fab4da': Tweak default ignore-assets path
| | | * | | Tweak default ignore-assets pathTor Norbye2012-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .DS_Store to the list of ignored files that are silently ignored (other dot-files are ignored but aapt emits a "(skipping <x>)" message.) Also, add a "!" prefix to the *~ pattern for Emacs/Vim/Gedit backup files. Finally, move the !*.scc pattern up in front of the .* pattern, such that it doesn't match the earlier .* pattern (which is verbose, unlike !*.scc). Change-Id: Id3e96490f1802486aea8c58366d43e9d413971b8
| | * | | | am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '0748a5698776d1a9693a5449ffc983af26cc533b': aapt: Remove terminal pointer incrementaion
| | | * | | Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| | | |\ \ \
| | | | * | | aapt: Remove terminal pointer incrementaionNobuhiro Hayashi2012-03-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When initialization, 'end' pointer refers terminal character in a string. But it is incremented in while loop. It occurs the access to non-secure memory. Issue detail http://code.google.com/p/android/issues/detail?id=24896 Change-Id: I751d1154d797738c87a66374a66933528c045be5
| | | * | | | Merge "Fix length of pattern." DO NOT MERGE.Ying Wang2012-05-241-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After skipping * with "token++", the length should decrease by 1 as well. (merged from 996b073e813ba1a22a13282ccdebb664f14ba898) Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
* | | | | | am fcd73824: am dd251cab: Merge "Fix build." into jb-devDianne Hackborn2012-06-041-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | * commit 'fcd738240a7d716e21721514202caa5bfb2dcb98': Fix build.
| * | | | am dd251cab: Merge "Fix build." into jb-devDianne Hackborn2012-06-041-2/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'dd251cab5b6e5b590cc0aeae8be8f885a7794e72': Fix build.
| | * | | Fix build.Dianne Hackborn2012-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I41415fed99d98406bc033289428bde59475c2917
* | | | | am f3b4c93e: am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition ↵Dianne Hackborn2012-05-291-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | between retrieving a..." into jb-dev * commit 'f3b4c93e0da9af2db9e16864faa734cf70fecfe3': Fix (mostly) issue #5109947: Race condition between retrieving a...
| * | | | am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between ↵Dianne Hackborn2012-05-291-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | retrieving a..." into jb-dev * commit 'ae5811c71405878b09eace395ec2b28e54eeb427': Fix (mostly) issue #5109947: Race condition between retrieving a...
| | * | | Fix (mostly) issue #5109947: Race condition between retrieving a...Dianne Hackborn2012-05-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...content provider and updating its oom adj This introduces the concept of an "unstable" reference on a content provider. When holding such a reference (and no normal stable ref), the content provider dying will not cause the client process to be killed. This is used in ContentResolver.query(), .openAssetFileDescriptor(), and .openTypedAssetFileDescriptor() to first access the provider with an unstable reference, and if at the point of calling into the provider we find it is dead then acquiring a new stable reference and doing the operation again. Thus if the provider process dies at any point until we get the result back, our own process will not be killed and we can safely retry the operation. Arguably there is still the potential for a race -- if somehow the provider is killed way late by the OOM killer after the query or open has returned -- but this should now be *extremely* unlikely. We also continue to have the issue with the other calls, but these are much less critical, and the same model can't be used there (we wouldn't want to execute two insert operations for example). The implementation of this required some significant changes to the underlying plumbing of content providers, now keeping track of the two different reference counts, and managing them appropriately. To facilitate this, the activity manager now has a formal connection object for a client reference on a content provider, which hands to the application when opening the provider. These changes have allowed a lot of the code to be cleaned up and subtle issues closed. For example, when a process is crashing, we now have a much better idea of the state of content provider clients (olding a stable ref, unstable ref, or waiting for it to launch), so that we can correctly handle each of these. The client side code is also a fair amount cleaner, though in the future there is more than should be done. In particular, the two ProviderClientRecord and ProviderRefCount classes should be combined into one, part of which is exposed to the ContentResolver internal API as a reference on a content provider with methods for updating reference counts and such. Some day we'll do that. Change-Id: I87b10d1b67573ab899e09ca428f1b556fd669c8c
* | | | | am 9d98a089: Check result handler is not nullManuel Roman2012-05-231-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d98a089756b692eefeae7f92cca15e121196e0c': Check result handler is not null
| * | | | | Check result handler is not nullManuel Roman2012-05-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If caller passes a null result handler to the proxy methods, we need to check it when getting the result. Otherwise we try to invoke a method on a null object Change-Id: Ic2f456c36cb542b782b6a6d0d4d607ccf0987496
| * | | | | am 44e63a21: Support rendering layout that use the new res-auto namespace.Xavier Ducrohet2012-02-242-3/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b': Support rendering layout that use the new res-auto namespace.
| * \ \ \ \ \ am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-241-5/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5786f5cf1b248b79f938b3fa3c5d534159261f09': Fix build.
| * \ \ \ \ \ \ am 816b873d: Move the automatic namespace outside of the res namespace. do ↵Xavier Ducrohet2012-02-231-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not merge. * commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85': Move the automatic namespace outside of the res namespace. do not merge.
| * \ \ \ \ \ \ \ am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android ↵inazaruk2012-02-231-3/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libraries. do not merge. * commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd': Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
| * \ \ \ \ \ \ \ \ am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1Xavier Ducrohet2012-02-222-19/+176
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '503247f213ef2894324a22e7608101e90a7fe8fb': Make sure resource references are resolved.
| * \ \ \ \ \ \ \ \ \ am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does ↵Xavier Ducrohet2012-02-064-21/+57
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it. do not merge. * commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2': Setup ActionBars in layoutlib the same way the platform does it. do not merge.
| * \ \ \ \ \ \ \ \ \ \ am f8aea993: Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b': Make aapt ignore tools-related data.
| * \ \ \ \ \ \ \ \ \ \ \ am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." ↵Jim Miller2012-01-181-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '230a709285abc5dfd92f05d91a8997d52a59d3c7': Fix 5863053: Add method to lock screen immediately.
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes" ↵Jason Simmons2012-01-111-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-aah
| | * | | | | | | | | | | | | Add a getEndpointInfo accessor to AIDL-generated RPC proxy classesJason Simmons2011-12-161-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1de957db3eceebc466d8ce23e2a80a0fcf4c917c
| * | | | | | | | | | | | | | Merge "Modified the constructor of EndpointBase" into ics-aahManuel Roman2012-01-041-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \