Merge commit '1492b96eb178631b816bdb253a1b6d1df8133e13'
* commit '1492b96eb178631b816bdb253a1b6d1df8133e13':
Remove obsolete links; start at a method to turn on fading scrollbars
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 '75ce6b103810efbc61af4b786651d9cc414107fd'
* commit '75ce6b103810efbc61af4b786651d9cc414107fd':
Add an API to request a system activity to turn on Bluetooth.
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp
* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
Add an API to request a system activity to turn on Bluetooth.
Merge commit '91d538447029330921e0d960f8616aac1929fb66'
* commit '91d538447029330921e0d960f8616aac1929fb66':
Fading scrollbars return. But you have to opt in.
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp
* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
Fading scrollbars return. But you have to opt in.
Merge commit 'c2ae2865138e8a42d49abd17542981b33a044ed4'
* commit 'c2ae2865138e8a42d49abd17542981b33a044ed4':
Handle the case where GoogleLocationSettingObserver::onChange
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp
* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
Handle the case where GoogleLocationSettingObserver::onChange
Merge commit '963cd288a5bef260d06fbfd096e6f02793b83532'
* commit '963cd288a5bef260d06fbfd096e6f02793b83532':
Before we send VIEW_SIZE_CHANGED after first layout,
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
Merge commit '858089557514424175a4bd9c89276dca1f92b95d'
* commit '858089557514424175a4bd9c89276dca1f92b95d':
WebView may get message after destroy() is called.
* 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 '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded'
* commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded':
Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0'
* commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0':
Add documentation about flash and change video-light to torch.
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
