Merge commit '1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp
* commit '1cff74761798eba8349a3b9824ae4b11072c11d1':
Modify the "active chats" uri to not overlap with other uris.
- Add FOR_EXPORT_ONLY to Data column.
- Make VCardComposer use Contacts instead of RawContacts.
- Make VCardComposer honor FOR_CONTACT_ONLY regardless of
the intention of any caller, which makes composer unable to
compose any contact with "is_restricted" flag, which is unseen
from outside the contacts provider.
Internal Issue number: 2147248, 2143207
Merge commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35' into eclair-plus-aosp
* commit '5d259d3bfd4ea79b8cb3e5aeeb3768f769e48a35':
Do not crash appwdiget host when a pending intent send fails.
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().
The APIs for checking whether keys are held down now also look
at virtual keys.
However it turns out there is less than a second between the time we
start the input thread and check for safe mode, so there is not enough
time to actually open all of the devices and get the data from them
about the finger being down to determine if a virtual key is down.
So now you can also hold DPAD center, trackball center, or s to
enter safe mode. Also give some vibrator feedback.
Change-Id: I55edce63bc0c375813bd3751766b8070beeb0153
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 '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
we should remove VIEW_SIZE_CHANGED in the queue if
there is any as we are going to send the message in
the front of the queue.
Fix http://b/issue?id=2133222
* 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.
* Microsoft Office common extensions
* .xml -> text/xml
* Change existing mapping of ".pot"->"text/plain" to ".po"
Note: We already had a definition for .pot to text/plain. Per the
information found at <http://www.fileinfo.com/extension/pot> this is the
rarely seen "portable object file", and is often named ".po" to avoid
this same conflict.
Addresses bug # 2097457
Change-Id: I964b853fdeae77d742f627c535a8b32e0e53516a
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 '879664e3e2e0169aba53d88f6c30c8b15858315d' into eclair-plus-aosp
* commit '879664e3e2e0169aba53d88f6c30c8b15858315d':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
