Gilles Debunne
37bcebbd9e
am 18b43119: Merge "Bug 5281947: add to dictionnary option promoted in suggestions."
...
* commit '18b43119229e5cd72952fdb71b7676de6e853c23':
Bug 5281947: add to dictionnary option promoted in suggestions.
2011-09-13 12:39:25 -07:00
Gilles Debunne
18b4311922
Merge "Bug 5281947: add to dictionnary option promoted in suggestions."
2011-09-13 12:38:03 -07:00
Costin Manolache
8d9750be71
am 5d42a7df: Merge "For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow"
...
* commit '5d42a7df1dffa5e7e4077e40348790e94411093d':
For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow
2011-09-13 11:23:02 -07:00
Costin Manolache
5d42a7df1d
Merge "For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow"
2011-09-13 11:21:16 -07:00
Adam Powell
8074d016f7
am 66d46f1d: Merge "Fix bug 5296851 - Silly monkeys."
...
* commit '66d46f1db8d37c60faca1a4e189ce0b4146bf5a6':
Fix bug 5296851 - Silly monkeys.
2011-09-12 19:21:41 -07:00
Adam Powell
66d46f1db8
Merge "Fix bug 5296851 - Silly monkeys."
2011-09-12 19:19:33 -07:00
Adam Powell
b844011046
Fix bug 5296851 - Silly monkeys.
...
Change-Id: Idae81d426051c2e1b00a1d1b62b505effd0a2a68
2011-09-12 19:14:11 -07:00
Jeff Sharkey
bd75cfa9c4
am 883adec7: Merge "Handle data changed during FlingRunnable."
...
* commit '883adec77118bdaa0984f157a13e2263f6419595':
Handle data changed during FlingRunnable.
2011-09-12 18:30:43 -07:00
Jeff Sharkey
883adec771
Merge "Handle data changed during FlingRunnable."
2011-09-12 18:28:15 -07:00
Jeff Sharkey
7f2202b0bd
Handle data changed during FlingRunnable.
...
Bug: 5297171
Change-Id: I733ed978bb1d237c992f5d003b212baeac102a3d
2011-09-12 18:20:56 -07:00
Adam Powell
852579f98c
am 413ce9dd: Merge "Pause WebKit drawing when WebView loses window focus."
...
* commit '413ce9ddab86d5e2f4818859e974db04335b8d26':
Pause WebKit drawing when WebView loses window focus.
2011-09-12 18:16:37 -07:00
Adam Powell
413ce9ddab
Merge "Pause WebKit drawing when WebView loses window focus."
2011-09-12 18:15:37 -07:00
Adam Powell
e00e8a7837
Pause WebKit drawing when WebView loses window focus.
...
This prevents animations and other live page content from consuming
too many resources while the user is interacting with a popup window.
Bug 5300522
Change-Id: I40fb6d16d56b540c431172052a1ae7fead7109be
2011-09-12 18:04:00 -07:00
Dianne Hackborn
2cef70aa32
am f0ec2dd3: Merge "Fix problems where we were allocating TypedArray when not needed."
...
* commit 'f0ec2dd3270b60b1516293190757de298f187957':
Fix problems where we were allocating TypedArray when not needed.
2011-09-12 17:54:27 -07:00
Dianne Hackborn
f0ec2dd327
Merge "Fix problems where we were allocating TypedArray when not needed."
2011-09-12 17:52:54 -07:00
Svetoslav Ganov
2638b99b88
am 8a6d7323: Merge "CheckedTextView is missing onInitializeAccessibilityNodeInfo() implementation."
...
* commit '8a6d732360c9dbcdf1d2b4da93d150f16af8507b':
CheckedTextView is missing onInitializeAccessibilityNodeInfo() implementation.
2011-09-12 17:07:10 -07:00
Svetoslav Ganov
8a6d732360
Merge "CheckedTextView is missing onInitializeAccessibilityNodeInfo() implementation."
2011-09-12 17:05:44 -07:00
Dianne Hackborn
ab0f485e64
Fix problems where we were allocating TypedArray when not needed.
...
Fixes up some recycling of TypedArray objects to reduce the
number we need to allocate during inflation etc.
Change-Id: I948dccc052997779001eaa99db2a710b04be01ae
2011-09-12 17:04:32 -07:00
Svetoslav Ganov
222de674ab
am bd5c9768: Merge "Adding accessibility delegate mechanism for backwards compatibility support."
...
* commit 'bd5c9768c4432c6cb2bfa5f521d49ff03c087ff8':
Adding accessibility delegate mechanism for backwards compatibility support.
2011-09-12 17:00:31 -07:00
Svetoslav Ganov
bd5c9768c4
Merge "Adding accessibility delegate mechanism for backwards compatibility support."
2011-09-12 16:58:13 -07:00
Jeff Sharkey
e4c7ed4292
am e44365b5: Merge "Data usage structure optimizations."
...
* commit 'e44365b539056b84a3ab57f5a9338d182eb10033':
Data usage structure optimizations.
2011-09-12 16:53:50 -07:00
Jeff Sharkey
e44365b539
Merge "Data usage structure optimizations."
2011-09-12 16:50:34 -07:00
Svetoslav Ganov
34ffaabc30
CheckedTextView is missing onInitializeAccessibilityNodeInfo() implementation.
...
bug:5160586
Change-Id: I3861cfc398566805cdf3c551cbf20dc7b5c208d9
2011-09-12 16:19:37 -07:00
Jeff Sharkey
69b0f63af2
Data usage structure optimizations.
...
Driven by traceview hotspots found in Settings UI.
Change-Id: I614a049523c526b7fcd12fffdf53a3e4723623e4
2011-09-12 16:13:20 -07:00
Svetoslav Ganov
031d9c1389
Adding accessibility delegate mechanism for backwards compatibility support.
...
1. Added an AccessibilityDelegate class in View which can be set by
a client that wants to cutomize accessibility behavior via
composition as opposed to inheritance. Insead overriding a new method in
View thus being bound to the API version that introduced this
method a developer can conditionally inject the accessibility
customization if the platform API version is heigh enough. The
developer will have to override the method of interest of the
delegate. The default implementation of the delegate methods is
the same as that of View in the case that there is no delegate
set. If a delegate is set calling an accessibility related method
on View will be handed off to the corresponsing method of the
delegate.
bug:5259555
Change-Id: I00e750e22e5e7164a1b571cb3d12ecaf4ab93db4
2011-09-12 15:42:19 -07:00
Dianne Hackborn
b73f3175a7
am 83f9dfe0: Merge "Add boot mode where only "core apps" are started."
...
* commit '83f9dfe0f085a01ebaa9f3ba6205af20e20bbe78':
Add boot mode where only "core apps" are started.
2011-09-12 15:09:14 -07:00
Dianne Hackborn
83f9dfe0f0
Merge "Add boot mode where only "core apps" are started."
2011-09-12 15:07:51 -07:00
Gilles Debunne
d6fe256ae4
am fc7a8081: Merge "If suggestion span is not enable, removes the suggestion span (so no underline is displayed), and do not try to display the suggestion pop-up."
...
* commit 'fc7a8081f8d9ca3c2891d3c2d748dc26f8139ed6':
If suggestion span is not enable, removes the suggestion span (so no underline is displayed), and do not try to display the suggestion pop-up.
2011-09-12 13:32:40 -07:00
Gilles Debunne
fc7a8081f8
Merge "If suggestion span is not enable, removes the suggestion span (so no underline is displayed), and do not try to display the suggestion pop-up."
2011-09-12 13:30:26 -07:00
Dianne Hackborn
d2509fd835
Add boot mode where only "core apps" are started.
...
A core app is one that has coreApp="true" in its manifest tag.
The system can successfully boot (though a little painfully) with
only framework-res.apk, SettingsProvider.apk, SystemUI.apk,
DefaultContainerService.apk, and Launcher2.apk set as core apps.
Currently this boot mode is always turned off.
Change-Id: Ieaa4a8031c2c391a12996aa8d8b1d65fc2b09d6b
2011-09-12 12:29:43 -07:00
Fred Quintana
efac6e1902
am 76eb1a25: Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""
...
* commit '76eb1a251808438771a237a92a0ab0903baeea7e':
Revert "Make the SyncManager timeout syncs if it takes too long to bind to them."
2011-09-12 12:19:55 -07:00
Fred Quintana
76eb1a2518
Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""
2011-09-12 12:17:54 -07:00
Costin Manolache
b61e8fbabe
For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow
...
b/5278759 API changes to pass package, options
b/5249018 consistent/customized add account UI
b/5270079 tag who adds the account
Change-Id: I1ee211d751b565c725c89aa1a429ef2f5bebe34a
2011-09-12 12:11:24 -07:00
Jeff Brown
eab3f9de49
am 6515f50d: Merge "Handle DOWN/MOVE/UP gestures with fling. Bug: 5265814"
...
* commit '6515f50d0c759cfff163aaf7f42a970019d93923':
Handle DOWN/MOVE/UP gestures with fling. Bug: 5265814
2011-09-12 11:28:21 -07:00
Jeff Brown
6515f50d0c
Merge "Handle DOWN/MOVE/UP gestures with fling. Bug: 5265814"
2011-09-12 11:26:58 -07:00
Gilles Debunne
f9d99d5338
am e9a9dbe7: Merge "The back key stops selection mode in extracted text mode."
...
* commit 'e9a9dbe729f4e4d4a54a7783e9768b9742240e25':
The back key stops selection mode in extracted text mode.
2011-09-12 11:21:03 -07:00
Gilles Debunne
e9a9dbe729
Merge "The back key stops selection mode in extracted text mode."
2011-09-12 11:19:06 -07:00
Fred Quintana
87b146625a
Revert "Make the SyncManager timeout syncs if it takes too long to bind to them."
...
This reverts commit bf3c634dc5
Bug: 5290505
Change-Id: I11a681b48360f5c200a0602c4daf30ae82b4209c
2011-09-12 10:50:53 -07:00
Luca Zanolin
e076045f10
If suggestion span is not enable, removes the suggestion span (so no underline is displayed),
...
and do not try to display the suggestion pop-up.
Bug: 5267093
Change-Id: Ia6f2596d0c62885ef9affeb478e00d3b92d76aac
2011-09-12 18:07:31 +01:00
Mangesh Ghiware
c031597180
am fa0d2316: Merge "On zoom to overview, reflow text, if necessary."
...
* commit 'fa0d2316f98ab787ff26383ff651dc31aac60ffd':
On zoom to overview, reflow text, if necessary.
2011-09-12 09:50:06 -07:00
Jaikumar Ganesh
44c828e7ca
am 049f5cc3: Merge "Don\'t override the hash code for the channel."
...
* commit '049f5cc3de8e30d05a26e135ab0978b3e1fe62b4':
Don't override the hash code for the channel.
2011-09-12 09:48:06 -07:00
Mangesh Ghiware
fa0d2316f9
Merge "On zoom to overview, reflow text, if necessary."
2011-09-12 09:46:49 -07:00
Jaikumar Ganesh
049f5cc3de
Merge "Don't override the hash code for the channel."
2011-09-12 09:45:20 -07:00
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