If the icon is precomposed or the icon IS null, set the touch icon url. This
ensures there will be a touch icon set if either precomposed or regular is
specified. Precomposed icons take precedence.
Bug: 2546984
Change-Id: Id9291006ecda8659b823ab9629eb98a6f8d45f5e
Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp
* commit 'd4610977d9217cbd70dd59f61914c74d1ca61036':
framework: Hide StorageManager for froyo - DO NOT MERGE
Merge commit '772391402f26f418eee70039e89c0b6a8a9d69eb' into kraken
* commit '772391402f26f418eee70039e89c0b6a8a9d69eb':
Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '0e09030977aea8b40fd177139528d4b5637c9771' into froyo-plus-aosp
* commit '0e09030977aea8b40fd177139528d4b5637c9771':
Relax the requirement of making a DBUS call for creating the Bluez Device.
Bug: 2136464
When the bluez device is created, we get the onDeviceCreated signal.
We add it to our cache when that happens. We can have a device created
even when its not bonded - as a result of OPP. So use this cache to avoid
a DBUS call to Bluez.
Change-Id: I9465da7d72a12a6888128ff40ac1fe598cbae3c3
Merge commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2' into kraken
* commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2':
Clean up SearchableInfo API, JavaDoc and formatting
Merge commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp
* commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
Clean up SearchableInfo API, JavaDoc and formatting
This change cleans up the JavaDoc in SearchableInfo,
removes trailing whitespace, fixes an if-statement
style violoation, and re-hides some things that were
exposed for Froyo that query deprecated or discouraged
attributes:
SearchableInfo.getSearchButtonText()
SearchableInfo.getLabelId()
SearchableInfo.getIconlId()
class SearchableInfo.ActionKeyInfo
SearchableInfo.findActionKey()
Bug http://b/issue?id=2553524
Change-Id: Iee5521c844f74137166730e523d29ba07ef1856b
Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken
* commit '629d03f12251220daf26abc5be86d4649318a331':
Fix for bug 2548048 - it was impossible for applications to discover
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp
* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
Fix for bug 2548048 - it was impossible for applications to discover
Merge commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken
* commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
Fix preloaded classes for API rename of BackupAgentHelper
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp
* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
Fix preloaded classes for API rename of BackupAgentHelper
Merge commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken
* commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp
* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Bug #2553187
Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.
Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
