| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
in fragment." into jb-dev
* commit 'be925017201ad547a72e8d1e333dbc7eae3fc76f':
Fix aapt -G to properly support class attr in fragment.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
into jb-dev
* commit 'b71393bd34a48eeb622292e78f43b99e374a5e3a':
Fix aapt -G to properly support class attr in fragment.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The code added attributes android:name and class to a
KeyedVector under the same key (fragment) so the 2nd
add (android:name) removed class with was never checked.
This replace the value type in the KeyedVector to be
Vector<NamespaceAttributePair> instead of just
NamespaceAttributePair.
Change-Id: I009b8a8cca878191661c2a63bb14c967d230498d
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
merge." into jb-dev
* commit '15c15eaac51c0c375d18fb70cd1bd066d87b034e':
Replace LruCache implementation for layoutlib. do not merge.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | | |
Fix broken build.
Change-Id: I6644df218e11a35330a985bdcb9ace33723330f5
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Change-Id: Ibcb3dbd3d158c22da8277e544d81fb47eadccd49
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* commit 'cc6cf51b80eabd199f797f40b76f7980c343962b':
Initialize mJunkPath to false
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* commit '8c71784e9e83e914135e996591aa7903edd2fd96':
Initialize mJunkPath to false
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ib48bb1d91736d27f055528c3ba275237ff5ada07
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
into jb-dev
* commit '58a8d8d2d4b15cd4abf010680181359823ebfda4':
Disable debug output in SDK layoutlib.
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit '0e302bc884fa4b25eb391d625f2fb0eddc25d9b7':
Disable debug output in SDK layoutlib.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 6697442
Change-Id: I9741761342ea220c158aa124089430b0db80bf7e
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
* commit 'bce1011dd2a371c587d2e39ad8c3d446b63049d0':
Layoutlib Create: Find dependencies.
|
| |\ \ \
| | | | |
| | | | |
| | | | | |
Change-Id: I06608e3c122b8f321429d457c51aa2213dd238b4
|
| | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | | |
* commit '0f160c95122276c40ca84afe6fcd2b9cd800e35c':
Layoutlib Create: Find dependencies.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into jb-dev
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
Fix issue #6641368: can't launch gallery
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | | |
* commit '0f6471ace77387560988964ed0679f843bba6f1f':
Fix issue #6641368: can't launch gallery
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is a revert of 1db36528b12395b9ed9bf8a1005a6d4ace737627,
but with comments added so I don't make this mistake again. :)
Change-Id: I053216279e3721f08f32f561bb989736ef619f82
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | |\ \ \
| | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | | |
OS X SDK 10.6."
* commit '9e22d9c514457c4b163d03b9241e4e28b1698368':
Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
|\ \ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
|\ \ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
* commit '9f374b9de5a557a7977b24d41f45c3464cfff8c1':
Tweak default ignore-assets path
|
| |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
* commit '44ff9b8f9294e015031fc9293974604771e5efdd':
Tweak default ignore-assets path
|
| | |\ \ \ \
| | | | |/ /
| | | |/| |
| | | | | |
| | | | | | |
* commit '36ac43ba9982a78b4a047c8970776505a3fab4da':
Tweak default ignore-assets path
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | | |
* commit '0748a5698776d1a9693a5449ffc983af26cc533b':
aapt: Remove terminal pointer incrementaion
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
After skipping * with "token++", the length should decrease by 1 as
well.
(merged from 996b073e813ba1a22a13282ccdebb664f14ba898)
Change-Id: Ie6232ef603bb31e25e03b926e6c1bb92ac34902d
|
|\ \ \ \ \ \
| |/ / / / /
| | | | / /
| |_|_|/ /
|/| | | | |
* commit 'fcd738240a7d716e21721514202caa5bfb2dcb98':
Fix build.
|
| |\ \ \ \
| | | |_|/
| | |/| |
| | | | |
| | | | | |
* commit 'dd251cab5b6e5b590cc0aeae8be8f885a7794e72':
Fix build.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I41415fed99d98406bc033289428bde59475c2917
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
between retrieving a..." into jb-dev
* commit 'f3b4c93e0da9af2db9e16864faa734cf70fecfe3':
Fix (mostly) issue #5109947: Race condition between retrieving a...
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
retrieving a..." into jb-dev
* commit 'ae5811c71405878b09eace395ec2b28e54eeb427':
Fix (mostly) issue #5109947: Race condition between retrieving a...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
...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
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '9d98a089756b692eefeae7f92cca15e121196e0c':
Check result handler is not null
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
|
| |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
not merge.
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Libraries. do not merge.
* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* commit '503247f213ef2894324a22e7608101e90a7fe8fb':
Make sure resource references are resolved.
|
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
it. do not merge.
* commit '331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* commit 'f8aea99385df8373b6edd6d5dd1d15b7b36b525b':
Make aapt ignore tools-related data.
|