Merge commit 'ff18bbf83562b8a827a37c19cdc27e520786119e' into eclair-plus-aosp
* commit 'ff18bbf83562b8a827a37c19cdc27e520786119e':
Separate API for vCards through openAssetFileDescriptor().
Merge commit '13a90abcae224b85d128ded8e59398a3fc1ce4e1' into eclair-plus-aosp
* commit '13a90abcae224b85d128ded8e59398a3fc1ce4e1':
Adding status update attribution to ContactHeaderWidget
Merge commit 'f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp
* commit 'f36a2bb59b846545946124124d3290bd3eec44f0':
Call the proper variant of markAsContacted.
Merge commit '1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp
* commit '1cff74761798eba8349a3b9824ae4b11072c11d1':
Modify the "active chats" uri to not overlap with other uris.
Merge commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d' into eclair-plus-aosp
* commit 'ee25eb58aac8fded3927c0343eaa367f66c8b79d':
Print out all available EGL configurations.
Merge commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35' into eclair-plus-aosp
* commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35':
Do not crash appwdiget host when a pending intent send fails.
Merge commit '733fdf34b6a8a8e3983ff7663828a928d3c19944' into eclair-plus-aosp
* commit '733fdf34b6a8a8e3983ff7663828a928d3c19944':
Disable keyguard while docked when the lock screen is insecure.
Merge commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef' into eclair-plus-aosp
* commit 'ebd45e5ca9690110ecb50c26b0b791054ee4c0ef':
Fix issue #2149145: Safe Mode does not work on Sholes device
Merge commit 'fe81d386a818b386ffc0d5a789236531ab4e264f' into eclair-plus-aosp
* commit 'fe81d386a818b386ffc0d5a789236531ab4e264f':
Remove obsolete links; start at a method to turn on fading scrollbars
Merge commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f' into eclair-plus-aosp
* commit 'b4c547a56caebb5900c132ec9d5ce953f89de14f':
Fix possible NPE in AbsListView.positionSelector().
Merge commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc' into eclair-plus-aosp
* commit '2dfa6edcd086bb9ce4fbb3b979f3afec93f6cddc':
Pass limit=50 to all suggestion sources.
Merge commit '9d686c9384cad2bccb3db27eb19bb089bf05041c' into eclair-plus-aosp
* commit '9d686c9384cad2bccb3db27eb19bb089bf05041c':
Don't crash search when getKeyDispatcherState() is null
Merge commit '14f65ff9451747d6bb802e1b754afae1110ad759' into eclair-plus-aosp
* commit '14f65ff9451747d6bb802e1b754afae1110ad759':
Add drop shadow to contact name in ContactHeaderWidget
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp
* commit '99638e747251929191f7773d2a81bbea223f1e09':
Turn on thubmnail capture unit test for media metadata retriever
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp
* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
Add an API to request a system activity to turn on Bluetooth.
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp
* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
Fading scrollbars return. But you have to opt in.
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp
* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
Handle the case where GoogleLocationSettingObserver::onChange
Merge commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1' into eclair-plus-aosp
* commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1':
Before we send VIEW_SIZE_CHANGED after first layout,
Merge commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3' into eclair-plus-aosp
* commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3':
Cache inflated view to avoid inflation of layouts in preferences
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp
* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
Added code style fix that actually did not get submitted in 2nd patch of previous change.
* changes:
Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
Merge commit '207308a781621c427acccbd9983c2511a65e9137' into eclair-plus-aosp
* commit '207308a781621c427acccbd9983c2511a65e9137':
WebView may get message after destroy() is called.
