Gilles Debunne
47a4b78eb7
am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
...
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
Prevent NPE in SuggestionSpan
2011-12-09 14:25:53 -08:00
Jeff Tinker
aac2f9c66c
am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
...
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
2011-12-09 14:25:49 -08:00
Jeff Brown
bdc18b28eb
am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
...
* commit '03e634270d880407316b51fac2278e604fc82703':
Shortcut keys should be handled on down, not up.
2011-12-09 14:25:41 -08:00
Jeff Brown
fa7fa9a5ba
am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
...
* commit '944c985b4199e6e029568ea87004c9727e469cc0':
Fix system hotkey handling.
2011-12-09 14:25:38 -08:00
Jack Palevich
ec3a88dee2
Merge "Fix convert8To4, convert8To5"
2011-12-09 14:19:39 -08:00
Jack Palevich
0501f8a913
Fix convert8To4, convert8To5
...
See b/5680952 "Compilation warnings in etc1.cpp" for discussion.
Fixes b/5680952
Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
2011-12-09 14:06:07 -08:00
Romain Guy
24edca8b52
Code cleanup
...
Change-Id: If92e3addfc4d8546a60edcdea60a1fc89c27b680
2011-12-09 13:08:06 -08:00
Romain Guy
05bbde70fd
Free up resources by deleting shaders early on
...
Change-Id: I29a39775732c0a48d3e6823f7afa3e741cae8541
2011-12-09 12:55:37 -08:00
Irfan Sheriff
1108e8ddad
Merge "Change RSSI notification levels to 5 in framework"
2011-12-09 12:43:28 -08:00
Irfan Sheriff
ea933cb3fd
Change RSSI notification levels to 5 in framework
...
At some point the system UI switched to using 5 rssi levels
while the framework only broadcasts a change for 4 levels.
Hence RSSI change can be slow to be displayed on the UI, fix this
Bug: 5732700
Change-Id: I21700f96ba7a8dd678fb2ccfff8ef59f9b696666
2011-12-09 12:40:35 -08:00
Romain Guy
3f7be830f0
Merge "Enable dirty regions on newly created EGL surfaces"
2011-12-09 12:28:46 -08:00
Romain Guy
9477c6e658
Enable dirty regions on newly created EGL surfaces
...
This change fixes an issue on some tiler architectures that do not
enable the swap buffer behavior by default on EGL surfaces.
Change-Id: Ibda1ae582da1a20afad3be9c3361080e72df5206
2011-12-09 12:27:21 -08:00
Jeff Tinker
dc44e06ef3
am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
...
* commit 'ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
2011-12-09 11:13:39 -08:00
Jeff Tinker
ef664f62a1
Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
2011-12-09 11:11:56 -08:00
Joe Fernandez
a4f49ac528
am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
...
* commit '4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
2011-12-09 10:47:59 -08:00
Joe Fernandez
4b3227de17
am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
...
* commit '89c3bc38421a3f01b39f0246e53884bdf8b14415':
docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
2011-12-09 10:45:44 -08:00
Joe Fernandez
89c3bc3842
Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0
2011-12-09 10:43:32 -08:00
Kristian Monsen
5aa2136ddf
Merge "Update string lengths, fix for bug 5732776"
2011-12-09 10:12:41 -08:00
Alex Sakhartchouk
f8c1f1c17c
Merge "Making UI a bit more responsive."
2011-12-09 10:04:27 -08:00
Kristian Monsen
ed4ea72879
Update string lengths, fix for bug 5732776
...
Change-Id: Id668689085f542dae331eca197289ba45c5e4a5f
2011-12-09 17:56:43 +00:00
Gilles Debunne
f107abec56
am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1
...
* commit 'caf4ead320499cc9a7a2e3eb17beaaf92b391212':
Blinking cursor in Talk
2011-12-09 09:36:23 -08:00
Gilles Debunne
caf4ead320
Merge "Blinking cursor in Talk" into ics-mr1
2011-12-09 09:34:04 -08:00
Jeff Tinker
9f704f6c46
Fix drm flag setting missed in false drm recognition fix.
...
Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
2011-12-09 09:09:08 -08:00
The Android Open Source Project
175d5d76b0
Reconcile with ics-mr1-release
...
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
2011-12-09 07:11:10 -08:00
The Android Automerger
1cc6131f6e
merge in ics-mr1-release history after reset to ics-mr1
2011-12-09 06:58:10 -08:00
Narayan Kamath
e61fd281a8
Merge "Remove BlockingMediaPlayer."
2011-12-09 06:30:14 -08:00
Steven Ross
ebc6fb46c2
Checking whether screen is on in constructor fixes 5658742
...
Change-Id: Ic96c8dd9ee9e86000b0cbe22a7d068a8ee424448
2011-12-09 09:28:29 -05:00
James Dong
406dd5d1e4
am aadbd80b: Fixed the false drm recognition.
...
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
2011-12-09 00:17:56 -08:00
James Dong
aadbd80b30
Fixed the false drm recognition.
...
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1
related-to-bug: 5732033
2011-12-08 21:01:31 -08:00
Romain Guy
d3209c1bb2
Merge "GenerationCache::get would return a random value instead of NULL Bug #5401917 "
2011-12-08 18:51:03 -08:00
Romain Guy
46b9f7cc20
GenerationCache::get would return a random value instead of NULL
...
Bug #5401917
This was causing a ton of random crashes in apps.
Change-Id: I9069a060824ec89115cd3bcd38beaeb9ecc4488e
2011-12-08 18:50:27 -08:00
Gilles Debunne
17994a1d04
Blinking cursor in Talk
...
I verified that this fixes the unblinking cursor problem in Talk.
Change-Id: I5e3e5c8ad5cf3d8479462495107bf93e5e4fb956
2011-12-08 18:40:27 -08:00
Gilles Debunne
1742f20c66
am be5f49fb: Performance improvements for long text edition.
...
* commit 'be5f49fb6e17e0b9588d3b94022b7e3eb6d47317':
Performance improvements for long text edition.
2011-12-08 18:35:22 -08:00
Gilles Debunne
be5f49fb6e
Performance improvements for long text edition.
...
Limit each parse to batches of a few words, to keep the UI thread
responsive.
Possible optimizations for the future:
- SpellCheck in a thread, but that requires some locking mecanism
- Only spell check what is visible on screen. Will require additional
spans to tag the pieces of text.
This is a cherry pick of 145656 into ICS-MR1
Patch Set 2: Make the Runnable shared and stop it when detached.
Change-Id: Ibf8e98274bda84b7176aac181ff267fc1f1fa4cb
2011-12-08 18:26:49 -08:00
Gilles Debunne
afa0a714ac
am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
...
* commit 'df3722895172e03c81787f62d922daabaad3e20b':
Fixed SpellCheckerSessions leak in TextView
2011-12-08 18:19:57 -08:00
Gilles Debunne
df37228951
Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
2011-12-08 18:18:25 -08:00
Gilles Debunne
e912a16ba2
am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
...
* commit '316ca5059ebd7270a04da5649d25653c355e158d':
Re-use SpanSets in TextLine
2011-12-08 18:00:12 -08:00
Gilles Debunne
316ca5059e
Merge "Re-use SpanSets in TextLine" into ics-mr1
2011-12-08 17:58:24 -08:00
Joe Malin
8e94d912c6
am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
...
* commit '556e4ca54161be17333ec98fadc113485120a6e8':
DOC CHANGE: Package text and Formatter javadoc
2011-12-08 17:46:44 -08:00
Joe Malin
556e4ca541
am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
...
* commit '0a9005ed58d3a6173e8fffbd72933f7646c6fdba':
DOC CHANGE: Package text and Formatter javadoc
2011-12-08 17:44:34 -08:00
Joe Malin
0a9005ed58
Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
2011-12-08 17:42:36 -08:00
The Android Automerger
3f4eac0367
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 17:35:27 -08:00
Chia-chi Yeh
fa71962fe4
am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
...
* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
VPN: delete the "abort" file before starting VPN daemons.
2011-12-08 17:24:16 -08:00
Chia-chi Yeh
46a4e81dbd
Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
2011-12-08 17:22:16 -08:00
Mangesh Ghiware
66b2ff818b
Update computation of reading level scale.
...
Fixes bug 5726043 (Extra double-tap needed to zoom out to overview mode
on nytimes.com on a Stingray)
Change-Id: I54dc303f4aa81ddc38c234228adc915b9f6749dc
2011-12-08 17:11:16 -08:00
Amith Yamasani
8df9609768
Show the current stream's volume in the volume panel.
...
Bug: 5409969
If the current stream being displayed is different from the
stream being adjusted, rearrange the sliders, unless multiple
sliders are being shown.
Change-Id: Ia48986c1046305d7fee7a32177d78d8ffd84a11b
2011-12-08 17:03:54 -08:00
Chia-chi Yeh
c187273292
VPN: delete the "abort" file before starting VPN daemons.
...
Bug: 5714296
Change-Id: Idba41b9f3907747a84387ea4f3e930b3a185a06e
2011-12-08 16:51:41 -08:00
Gilles Debunne
c1f4483080
Re-use SpanSets in TextLine
...
TextLine objects are already stored in a pool to limit allocation.
Associate SpanSet objects to each TextLine to further limit the
allocation of these and re-use their internal arrays (re-sized if needed).
Drastically reduces new objects allocation during rendering.
Priority code removed in init: priorities are already handled by getSpans.
This is a duplicate of the already accepted
https://android-git.corp.google.com/g/#/c/153970/
but without the dependency on an other CL.
Change-Id: Iaa7e2f7a8ea4337c8d60c3a9a620e9e3e60caf12
2011-12-08 16:03:00 -08:00
Irfan Sheriff
c34306e46e
am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1
...
* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
Fix wifi bring up at boot up
2011-12-08 16:01:59 -08:00
Irfan Sheriff
97ff789332
Merge "Fix wifi bring up at boot up" into ics-mr1
2011-12-08 15:59:26 -08:00