Ben Komalo
4b2efcb26f
am 6c048260: Merge "Revert encryption mapping for device wipes."
...
* commit '6c048260f30d9bba1a83c4f79388cd6b3109be7d':
Revert encryption mapping for device wipes.
2011-09-11 16:53:00 -07:00
Ben Komalo
6c048260f3
Merge "Revert encryption mapping for device wipes."
2011-09-11 16:48:32 -07:00
Dianne Hackborn
54869071db
am fe75cb34: Merge "Fix inflating of animations."
...
* commit 'fe75cb342e33e7c465709bb34ab7abae9e9871f6':
Fix inflating of animations.
2011-09-11 13:09:40 -07:00
Dianne Hackborn
fe75cb342e
Merge "Fix inflating of animations."
2011-09-11 13:07:24 -07:00
Chet Haase
245b919119
am 6a6977e8: Merge "Fix 5266335: bad DIRTY/invalidation logic"
...
* commit '6a6977e8728f3a3d209daadf587079dc7369050b':
Fix 5266335: bad DIRTY/invalidation logic
2011-09-11 13:00:38 -07:00
Chet Haase
6a6977e872
Merge "Fix 5266335: bad DIRTY/invalidation logic"
2011-09-11 12:58:45 -07:00
Dianne Hackborn
8962028b6e
Fix inflating of animations.
...
Need to define attributes for animation set, to have correct indices.
Also small fixes elsewhere.
Change-Id: If596147e8aee4ebffe4e184872070341eff6df73
2011-09-11 12:47:45 -07:00
Chet Haase
f186f30a7c
Fix 5266335: bad DIRTY/invalidation logic
...
The DIRTY flag is used to track which elements of the view hierarchy need
to be redrawn on the next drawing operation. This flag is set on the parent
hierarchy of a view when that view is invalidated. There is an optimization for
opaque views that tells the parent that it is dirty, but that it need not
redraw its own content because the view will cover it (since it is opaque).
This dirty-opaque logic breaks down in the current code because we only set
these dirty flags on the parent hierarchy, not on the view itself. In the situation
raised by this bug, we would invalidate the parent container directly (which does
not case the dirty flag to be set), then we would invalidate a child of that view.
Because the child is opaque, the DIRTY_OPAQUE flag would be set on the parent
container. This would cause us, in the later rendering process, to skip the
drawing on that parent container, assuming that it was only asked to be redrawn
because of its opaque child's invalidation.
The fix is to now set the DIRTY flag on an invalidated view, not just on its parent
hierarchy. The DIRTY_OPAQUE logic will avoid setting the opaque flag on views/parents
that are already marked DIRTY, thus an invalidated parent will be correctly drawn
during the drawing process.
Change-Id: Ib5e014a125a4f5168f6a5a3166e941474659aca5
2011-09-11 11:06:06 -07:00
Svetoslav Ganov
a008efb8f7
am fd19906b: Merge "Inter process interrogation ocassionally gets stuck."
...
* commit 'fd19906b50927834787403ca984f6fda93b53410':
Inter process interrogation ocassionally gets stuck.
2011-09-09 18:59:26 -07:00
Svetoslav Ganov
fd19906b50
Merge "Inter process interrogation ocassionally gets stuck."
2011-09-09 18:57:35 -07:00
Svetoslav Ganov
6bc5e53001
Inter process interrogation ocassionally gets stuck.
...
1. There was a bug that was not handling correctly the
case for which the interrogator requests an accessibility
node info and the message describing how to fetch the
latter for the same process case was delivered after the
code that checks whether the message is there in order to
dispatch it is executed. Now the message handling is done
correctly - the caller checks if the message is present and
if so processes it, otherwise the caller sleeps and is
interrupted if such a message arrives.
bug:5138933
Change-Id: I4c2940b46c9a52a51c5ee48b83ca6811489765d6
2011-09-09 18:52:26 -07:00
Adam Powell
eb65673d04
am 81cca039: Merge "Fix metrics on Holo progress dialogs"
...
* commit '81cca039bdbc7f9fe8aefd68ce2cf22978678b01':
Fix metrics on Holo progress dialogs
2011-09-09 17:49:40 -07:00
Adam Powell
81cca039bd
Merge "Fix metrics on Holo progress dialogs"
2011-09-09 17:47:23 -07:00
Adam Powell
ba3c377ba4
Fix metrics on Holo progress dialogs
...
Change-Id: I8818d002dcee0ca6d6deead9e0403c07e8ef4460
2011-09-09 17:40:06 -07:00
Romain Guy
ebb10b0a37
am 3593fc4c: Merge "Go faster!!!!"
...
* commit '3593fc4c3fac8d957db0171387472e7b812c9073':
Go faster!!!!
2011-09-09 17:37:12 -07:00
Romain Guy
3593fc4c3f
Merge "Go faster!!!!"
2011-09-09 17:35:02 -07:00
Gilles Debunne
d091186b12
am 51322732: Hide method to fix the build
...
* commit '51322732739b355dd842abc9cef34df8613b2626':
Hide method to fix the build
2011-09-09 17:01:18 -07:00
Gilles Debunne
5132273273
Hide method to fix the build
...
Change-Id: I5a556454a722bf037932632fa7e6ee6a2832a68d
2011-09-09 16:46:42 -07:00
Ben Murdoch
3cd142c78d
am a3809b34: Merge "Relax form autocomplete conditions"
...
* commit 'a3809b344c9f528c5c510dfc48ed9049a17cb64b':
Relax form autocomplete conditions
2011-09-09 16:16:03 -07:00
Ben Murdoch
a3809b344c
Merge "Relax form autocomplete conditions"
2011-09-09 16:14:20 -07:00
Gilles Debunne
a1cd52fbd6
am 2bfc75a6: Merge "Bug 5255124: Move cursor to the end of a word after correction popup alternates selection"
...
* commit '2bfc75a6d9217d20e6fb17b484424935aa55a575':
Bug 5255124: Move cursor to the end of a word after correction popup alternates selection
2011-09-09 16:03:11 -07:00
Gilles Debunne
2bfc75a6d9
Merge "Bug 5255124: Move cursor to the end of a word after correction popup alternates selection"
2011-09-09 16:01:08 -07:00
Gilles Debunne
12b19f97a3
am 4f2b0dc5: Merge "Bug 5278456: text highlight color depends on the type of suggestion spans."
...
* commit '4f2b0dc552dbce06ae6825d099e959b40e6bf0e6':
Bug 5278456: text highlight color depends on the type of suggestion spans.
2011-09-09 15:54:34 -07:00
Gilles Debunne
4f2b0dc552
Merge "Bug 5278456: text highlight color depends on the type of suggestion spans."
2011-09-09 15:52:09 -07:00
Romain Guy
1ef3fdbe04
Go faster!!!!
...
The less we do, the faster we draw.
Change-Id: I7bbc3908b36d8ae295ea3e61ef71fd9ee2187970
2011-09-09 15:34:49 -07:00
Dianne Hackborn
318c6cf6e8
am 7b8d7cb5: Merge "Pull animation attributes out of main view class."
...
* commit '7b8d7cb59cfdc492df920b0c48960a691994f598':
Pull animation attributes out of main view class.
2011-09-09 15:29:27 -07:00
Dianne Hackborn
7b8d7cb59c
Merge "Pull animation attributes out of main view class."
2011-09-09 15:27:44 -07:00
Jaikumar Ganesh
a5465057f6
am 6d172e60: Merge "Add error codes for channel disconnection / connection."
...
* commit '6d172e60bb5c7dcaf1558e875bfbfe8cfe24b073':
Add error codes for channel disconnection / connection.
2011-09-09 15:21:53 -07:00
Jaikumar Ganesh
6d172e60bb
Merge "Add error codes for channel disconnection / connection."
2011-09-09 15:19:43 -07:00
Gilles Debunne
1a87ba4636
Bug 5255124: Move cursor to the end of a word after correction popup alternates selection
...
Change-Id: Idd3edc72edf864f256df173bcf643163192ecbde
2011-09-09 15:02:10 -07:00
Ben Komalo
13c7197da8
Revert encryption mapping for device wipes.
...
External storage volumes that were emulated+encrypted needed to have
their encryption mapping removed so that it doesn't try to encrypt the
volume after formatting them.
This just wires through an argument through vold, and assumes that vold
will do the right thing even if there is no encryption mapping set.
Bug: 5017638
Change-Id: I858fae3d12cb415bc34637f520f71220ad9daaad
2011-09-09 14:44:40 -07:00
Dianne Hackborn
ddb715b238
Pull animation attributes out of main view class.
...
These are now in a separate class that is only allocated when
needed by the view.
Change-Id: I9601bb43b3b4bfdabd982b02f7cd7534437b8ac3
2011-09-09 14:43:39 -07:00
Ben Murdoch
2376f8253f
Relax form autocomplete conditions
...
Use the URL host and path rather than the complete url to store
form autocomplete data. This helps in the situation that a site
uses some dynamic query string on the page that contains the form.
Also set the autoocmplete threshold to 1 so that we don't flick the
autocomplete options up and down as you type the first few characters.
Bug: 5265606
Change-Id: I7b372400062ae34f70a78b786007910dc179b101
2011-09-09 22:38:39 +01:00
Dianne Hackborn
e4347ba6b1
am 104f6a07: Merge "Fix issue #5273986 : The power usage of the mp3 background playback..."
...
* commit '104f6a07c9b0613c8a8332eba91e3f93dcb6f083':
Fix issue #5273986 : The power usage of the mp3 background playback...
2011-09-09 14:29:54 -07:00
Dianne Hackborn
104f6a07c9
Merge "Fix issue #5273986 : The power usage of the mp3 background playback..."
2011-09-09 14:28:05 -07:00
Dianne Hackborn
9fe6cb5cc2
Fix issue #5273986 : The power usage of the mp3 background playback...
...
...increased from ~50mA to 260mA
Change-Id: I24d7188185f4ec5ff9e1f29c15472ae56c851e5e
2011-09-09 13:02:43 -07:00
Svetoslav Ganov
b30ed1fc87
am 99e10991: Merge "The time and data pickers did not support IME editor action correctly."
...
* commit '99e109915e2fe08179f6a64c607ef56a91fb1dfa':
The time and data pickers did not support IME editor action correctly.
2011-09-09 11:26:59 -07:00
Svetoslav Ganov
99e109915e
Merge "The time and data pickers did not support IME editor action correctly."
2011-09-09 11:24:24 -07:00
Svetoslav Ganov
c11da87053
am 5b60d38a: Merge "Update the sharing UI according to latest UX specs."
...
* commit '5b60d38a8a9f506e32987911d34e94f9e167f099':
Update the sharing UI according to latest UX specs.
2011-09-09 11:20:36 -07:00
Svetoslav Ganov
5b60d38a8a
Merge "Update the sharing UI according to latest UX specs."
2011-09-09 11:18:40 -07:00
Jeff Brown
deb5882b2e
am 1d50a2c0: Merge "Adjust layers for system overlays."
...
* commit '1d50a2c0682926f783f9acab5c4bdeca1d3cb9cd':
Adjust layers for system overlays.
2011-09-09 11:08:21 -07:00
Jeff Brown
1d50a2c068
Merge "Adjust layers for system overlays."
2011-09-09 11:06:25 -07:00
Subir Jhanb
0676104c6f
am 37f8b51b: Merge "NPE check in the SyncStateContract BUG:5196483"
...
* commit '37f8b51b43c5f5c90062d504608edc8e79c0a5d6':
NPE check in the SyncStateContract BUG:5196483
2011-09-09 10:37:59 -07:00
Subir Jhanb
37f8b51b43
Merge "NPE check in the SyncStateContract BUG:5196483"
2011-09-09 10:36:09 -07:00
Fred Quintana
95df5a2c6d
am 7cbfa977: Merge "Add a form of getAuthToken that both accepts an options Bundle and doesn\'t accepts an activity."
...
* commit '7cbfa977ecb2a7330b372ab59233aa4392c101bd':
Add a form of getAuthToken that both accepts an options Bundle and doesn't accepts an activity.
2011-09-09 09:56:20 -07:00
Fred Quintana
7cbfa977ec
Merge "Add a form of getAuthToken that both accepts an options Bundle and doesn't accepts an activity."
2011-09-09 09:52:45 -07:00
Ken Wakasa
2f060bf268
am 8b83a729: Fix a bug in InputMethodSubtype constructor
...
* commit '8b83a7297680911d666546ee0b3a464514dc2c27':
Fix a bug in InputMethodSubtype constructor
2011-09-09 09:07:27 -07:00
Jim Miller
06cd5ec976
am 4f4ed38a: Merge "Fix 5185505: Add support for weak biometric sensors to lockscreen."
...
* commit '4f4ed38a8852bcf45fbec460ab61256fe98b2b40':
Fix 5185505: Add support for weak biometric sensors to lockscreen.
2011-09-09 09:06:58 -07:00
Michael Jurka
33761ede90
am 6c0d41a4: Merge "Fix FrameLayout padding when foreground drawable is set"
...
* commit '6c0d41a4ea56a8da79ee3ded62706ec983a39c0b':
Fix FrameLayout padding when foreground drawable is set
2011-09-09 09:06:11 -07:00
Fabrice Di Meglio
f7c05c0927
am 2295cc77: Merge "Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field"
...
* commit '2295cc77c72d451e7a1c9ec48f120a8e73651b6d':
Fix bug #2246815 Error popups on EditText should span the width of the screen instead of the width of the EditText field
2011-09-09 09:05:43 -07:00