Romain Guy
f1383763f0
am 80122c2a: Merge "Prevent crash in VPN settings Bug #5217245 "
...
* commit '80122c2a7a2cb25dbd80b3d193cbf593c0589e12':
Prevent crash in VPN settings Bug #5217245
2011-08-26 13:38:56 -07:00
Romain Guy
80122c2a7a
Merge "Prevent crash in VPN settings Bug #5217245 "
2011-08-26 13:37:35 -07:00
Romain Guy
eca9b1f53c
Prevent crash in VPN settings
...
Bug #5217245
Change-Id: Ibacf4cbd40537cd417f1518b5ac4367a3f3d7d03
2011-08-26 13:36:37 -07:00
Gilles Debunne
9684f5ea90
am 87a4d87e: Merge "Bug 5218421. Spell check crash with Japanese characters"
...
* commit '87a4d87ecf156affc23a5e2591d28ff5d5986fe0':
Bug 5218421. Spell check crash with Japanese characters
2011-08-26 13:30:54 -07:00
Gilles Debunne
87a4d87ecf
Merge "Bug 5218421. Spell check crash with Japanese characters"
2011-08-26 13:28:28 -07:00
John Reck
9f725654c7
am f4565a91: Merge "After calling loadData invalidate the content"
...
* commit 'f4565a91a514dc9e1105b6955a4c9aa3bc3e7a7b':
After calling loadData invalidate the content
2011-08-26 11:17:04 -07:00
John Reck
f4565a91a5
Merge "After calling loadData invalidate the content"
2011-08-26 11:15:29 -07:00
Gilles Debunne
d6e3494421
Bug 5218421. Spell check crash with Japanese characters
...
The word iterator returns no word in that case, and this is not
supported by TextInfo.
Change-Id: Iaf31c58638c02d3cdc7b88bc0d1201e793e84f17
2011-08-26 10:13:18 -07:00
satok
1984869df9
am 7926f62a: Fix newSpellCheckerSession
...
* commit '7926f62a073ed3a27d870cfa88ade33013d8010b':
Fix newSpellCheckerSession
2011-08-26 05:17:53 -07:00
satok
7926f62a07
Fix newSpellCheckerSession
...
Change-Id: Ia862dba70666c69b81d18836561b7e9a1c2d81b3
2011-08-26 21:13:35 +09:00
satok
185b1debd8
am ca6d29da: Merge "Support system locale as the locale of the spell checkers"
...
* commit 'ca6d29da777cffd40d9f3e38f95663ba1a2002c5':
Support system locale as the locale of the spell checkers
2011-08-26 02:56:53 -07:00
satok
b387954a92
Support system locale as the locale of the spell checkers
...
Bug: 5212035
Change-Id: I18d27e54b936cc7f4d6cc3c7100bce57f77f8f9f
2011-08-26 18:35:58 +09:00
satok
f92aed9295
am fbedf1a3: Fix NPE in setCurrentSpellCheckerSubtype
...
* commit 'fbedf1a3978d5dfc4a886e4c7107d4bc1923f740':
Fix NPE in setCurrentSpellCheckerSubtype
2011-08-26 00:15:34 -07:00
satok
fbedf1a397
Fix NPE in setCurrentSpellCheckerSubtype
...
Change-Id: I9fce999f91dcccd2f877a0326c4f2e3ac9024f85
2011-08-26 16:00:23 +09:00
satok
6981cc7622
am 2388a7ba: Add getServiceInfo to SpellCheckerInfo
...
* commit '2388a7ba6218f44400ee78016282cb96c02dfc54':
Add getServiceInfo to SpellCheckerInfo
2011-08-25 22:58:34 -07:00
satok
2388a7ba62
Add getServiceInfo to SpellCheckerInfo
...
Change-Id: I11634b88cf65182465869b131cfdcc8815e74965
2011-08-26 14:35:09 +09:00
satok
0f1162e3ff
am c7145319: Add getDisplayName to SpellCheckerSubtype
...
* commit 'c714531952fe1c22cae77631aa25dc7441b2b878':
Add getDisplayName to SpellCheckerSubtype
2011-08-25 22:18:05 -07:00
satok
c714531952
Add getDisplayName to SpellCheckerSubtype
...
Change-Id: Ic4d1f494a1fb67eda73ffc8e3be1caf690a602ce
2011-08-26 14:04:46 +09:00
satok
a08651734d
am 4bc554b3: Merge "Fix setCurrentSpellCheckerSubtype"
...
* commit '4bc554b37165dbee8d805a6f73ac5e946f2769ae':
Fix setCurrentSpellCheckerSubtype
2011-08-25 21:36:17 -07:00
satok
4bc554b371
Merge "Fix setCurrentSpellCheckerSubtype"
2011-08-25 21:34:44 -07:00
satok
3cb5b39a0e
Fix setCurrentSpellCheckerSubtype
...
Change-Id: Ib42a3b4377b8700ceaf4b7e13150848464d073c1
2011-08-26 12:39:42 +09:00
Mathias Agopian
d24434784f
am 3efc794f: Merge "fix logging of eglMakeCurrent() errors"
...
* commit '3efc794f8563558b9792cc8ffa1ab9e81a0129ea':
fix logging of eglMakeCurrent() errors
2011-08-25 18:42:29 -07:00
Mathias Agopian
3efc794f85
Merge "fix logging of eglMakeCurrent() errors"
2011-08-25 18:40:31 -07:00
Mathias Agopian
ca07e34f13
fix logging of eglMakeCurrent() errors
...
Change-Id: Ie22cabff822a8fb3186f082491234b9503b431c3
2011-08-25 18:38:24 -07:00
Fred Quintana
fe569e8420
am d912ec64: Merge "add a way for the sync adapter to specify the activity that should be invoked to reach a settings screen for that sync adapter"
...
* commit 'd912ec64d2c49fb796e376a0592d3315fc2d369f':
add a way for the sync adapter to specify the activity that should be invoked to reach a settings screen for that sync adapter
2011-08-25 17:31:51 -07:00
Fred Quintana
d912ec64d2
Merge "add a way for the sync adapter to specify the activity that should be invoked to reach a settings screen for that sync adapter"
2011-08-25 17:30:03 -07:00
Fred Quintana
e6d60ecdf6
add a way for the sync adapter to specify the activity that should
...
be invoked to reach a settings screen for that sync adapter
Bug: 5204776
Change-Id: I4641067c1f0710c51f2633241a8c87bc4d568af2
2011-08-25 17:23:42 -07:00
John Reck
fb2b9b2695
After calling loadData invalidate the content
...
Bug: 5205296
Change-Id: I7470faf0b71a769926c007b964987e8bc7a61efb
2011-08-25 15:38:33 -07:00
Adam Powell
6f4fb19a75
am ba5fe923: Merge "Fix bug 5199326 - ListView\'s fast scroller is out of sync with contents"
...
* commit 'ba5fe92361f717899e4b1e37a79f9f0547624487':
Fix bug 5199326 - ListView's fast scroller is out of sync with contents
2011-08-25 15:27:51 -07:00
Adam Powell
ba5fe92361
Merge "Fix bug 5199326 - ListView's fast scroller is out of sync with contents"
2011-08-25 15:26:36 -07:00
Chris Craik
585e4cd48b
am 412be650: Merge "actually pause webkit thread, remove costly invalidate"
...
* commit '412be650371f63da229eb5ba4045e8e35bd59afb':
actually pause webkit thread, remove costly invalidate
2011-08-25 15:14:56 -07:00
Chris Craik
412be65037
Merge "actually pause webkit thread, remove costly invalidate"
2011-08-25 15:13:39 -07:00
Chris Craik
58d94af539
actually pause webkit thread, remove costly invalidate
...
pass isScrolling info to glwebviewstate
pause webkit in a way that doesn't require full inval on resume
depends on change https://android-git.corp.google.com/g/#/c/130210/
bug:5106313
Change-Id: Icbe57e3a163c17c99bd1ea49ab42e40f9d41cc6d
2011-08-25 14:27:44 -07:00
Adam Powell
35948b7ed5
Fix bug 5199326 - ListView's fast scroller is out of sync with contents
...
Also fix a bug where the fast scroll track was not being properly
invalidated while animating out.
Change-Id: Ie90568a993699d5d061985985e3d93165d1d2219
2011-08-25 14:17:12 -07:00
Romain Guy
16a317f141
am 27bf1913: Merge "Optimize display lists"
...
* commit '27bf191327cd509daf52e3ebea2385ce66545093':
Optimize display lists
2011-08-25 14:09:13 -07:00
Romain Guy
27bf191327
Merge "Optimize display lists"
2011-08-25 14:08:13 -07:00
Romain Guy
04c9d8c2ff
Optimize display lists
...
Remove redundant or useless operations
Change-Id: If989b4eaa9143eef4254c38b39959aeed1f2b9ab
2011-08-25 14:01:48 -07:00
Gilles Debunne
bc3df2109f
am 8e7e95f2: Merge "Bug 5166707: NPE fixed in getFocusedRect"
...
* commit '8e7e95f22f700fae6926d87b25c388bf9b509389':
Bug 5166707: NPE fixed in getFocusedRect
2011-08-25 13:46:32 -07:00
Gilles Debunne
8e7e95f22f
Merge "Bug 5166707: NPE fixed in getFocusedRect"
2011-08-25 13:45:11 -07:00
Romain Guy
92e33bd7cb
am 8d8533a9: Merge "Implement saveLayer*() correctly"
...
* commit '8d8533a9f0d2ed1955f548e7d255de747e01b8cf':
Implement saveLayer*() correctly
2011-08-25 13:24:23 -07:00
Gilles Debunne
ef7d2d16b9
am 01d4755f: Merge "Remove spell log that exposes typed text in the logs"
...
* commit '01d4755fafa882ae639d47d84235f5f45eddfdf1':
Remove spell log that exposes typed text in the logs
2011-08-25 13:24:14 -07:00
Daniel Lehmann
8d7c910405
am 0d8627be: Merge "Add Contact ID to StreamItem-Fields"
...
* commit '0d8627be88a1ce4ee5c9076f484afb6006e32900':
Add Contact ID to StreamItem-Fields
2011-08-25 13:24:06 -07:00
Jeff Sharkey
bc0c990689
am ed191e1f: Merge "Data usage buckets active time, parsing ISE."
...
* commit 'ed191e1fae0f860323f6ed76ea982287c42ec83e':
Data usage buckets active time, parsing ISE.
2011-08-25 13:23:37 -07:00
Jeff Sharkey
8bb898f1e3
am 235c47ff: Merge "Register for kernel global data usage alerts."
...
* commit '235c47ff3edc9228609e82d2201275e70889921f':
Register for kernel global data usage alerts.
2011-08-25 13:23:32 -07:00
Svetoslav Ganov
0a1dc8689d
am 12bde60b: Merge "Intra-process view hierarchy interrogation does not work."
...
* commit '12bde60b39affbfdcb7ef6317e0a5f99c3f41b10':
Intra-process view hierarchy interrogation does not work.
2011-08-25 13:22:27 -07:00
Narayan Kamath
063c5c294e
am 978ed469: Merge "Deprecate old TTS settings that are no longer in use."
...
* commit '978ed4693bced95f6d3261f2ed230cd776cffc99':
Deprecate old TTS settings that are no longer in use.
2011-08-25 13:20:34 -07:00
satok
3d9e56b19e
am 1e3fac8b: Merge "Add functions to enable / disable spell checker"
...
* commit '1e3fac8bc62a2495eb9bb79cc208573b5782cedc':
Add functions to enable / disable spell checker
2011-08-25 13:20:00 -07:00
Michael Chan
faaf49b822
am 7420f133: Added new extra for creating an all-day event by default
...
* commit '7420f1339446cd76723d57b3c5c1bbc92f15f4f0':
Added new extra for creating an all-day event by default
2011-08-25 13:19:53 -07:00
Chet Haase
19ac9aa5b4
am c93fcdce: Merge "Fix issue with views becoming visible with stale content."
...
* commit 'c93fcdce226ff7cfbbc5a63d7d8848e7ba07badb':
Fix issue with views becoming visible with stale content.
2011-08-25 13:19:39 -07:00
Dianne Hackborn
a3e1ccc5ee
am 6ff00377: Merge "Fix to show the correct HW accel background in the preview window."
...
* commit '6ff0037792619c4441d9d3caa4f9ab4f45c11236':
Fix to show the correct HW accel background in the preview window.
2011-08-25 13:18:29 -07:00