Merge commit '17d262f2322258ab88ba2b012c10df37d207ba99' into eclair-plus-aosp
* commit '17d262f2322258ab88ba2b012c10df37d207ba99':
Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
This introduces problems when scrolling through preference screens, due
to a clash in this cache versus the ListView's cache.
This reverts commit 01dbc2ed55.
Sometimes we might be paired but the other end might not have stored the link
key. So when we initiate connection the other end will ask for the authorization.
This was setting out Bond State to Bonding.
Change-Id: Iba6fd660ac90a3f48da62e7b6cf479054624a5af
Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp
* commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71':
Update <video> implementation after new IRC discussion with Eric Carlsson.
Merge commit '27d8514f56574011c606daedc5cabf0219b5be81' into eclair-plus-aosp
* commit '27d8514f56574011c606daedc5cabf0219b5be81':
Fix possible crash in AutoCompleteTextView.
- move poster drawing on the WebKit side
- get rid of the child views
- add prepareToPlay method to the MediaPlayer iface.
Fixes http://b/issue?id=2156592
Merge commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661' into eclair-plus-aosp
* commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661':
Handle bad lines in /proc/wakelocks : Fix for 2124260
This change makes sure that ACTV will not take action when an event is
received in a popup that just got dismissed.
This change also makes public two XML attributes of ACTV whose corresponding
Java APIs are public.
This change also fixes a couple of typos.
Change-Id: I78f113bc522d199ff3db44fc4cc3a1882afe822e
Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp
* commit '1537a25520405f384b072c58fee935a29c4e14ea':
Remove unused api in QuickContact.java and fix the build.
Merge commit '85d86af982026145aa69a4ca280d394b9ea90372' into eclair-plus-aosp
* commit '85d86af982026145aa69a4ca280d394b9ea90372':
Fix vCard composer in three points.
Merge commit '609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp
* commit '609c2c08d7d059681434ea322b551264abab8a71':
- make SyncManager get the accounts list during the constructor,
* changes:
- make SyncManager get the accounts list during the constructor, which will allow syncs to be scheduled during bootup. The providers need this so that they can potentially schedule syncs while they are starting up. - make the SyncManager message handler wait until boot has completed to start dispatching messages
Use the return value from the native parser to skip over bad lines. When
the wakelocks overflow, there could be empty or badly formatted lines.
Skip over them.
which will allow syncs to be scheduled during bootup. The
providers need this so that they can potentially schedule
syncs while they are starting up.
- make the SyncManager message handler wait until boot
has completed to start dispatching messages
Merge commit '017c5de1cf1228664da84b31012a386c2eac2232' into eclair-plus-aosp
* commit '017c5de1cf1228664da84b31012a386c2eac2232':
Query from Bluez if name is not present in cache.
- Make it allow composer users to emit Quoted-Printabled primary ("N", "FN", etc.) properties.
- Make it strictly check whether it is necessary for the composer to emit CHARSET infomation.
-- Added the logic "not vCard 3.0, or, CHARSET is not UTF-8".
- Clean up the code (again...)
Merge commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc' into eclair-plus-aosp
* commit '1935a3417e986d38b9a0d981c3dbd06acf75a9fc':
Change FasttrackBadgeWidget->QuickContactBadge and make public.
Merge commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp
* commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17':
Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
