Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp
* commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5':
Add a test for vCard composer.
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-plus-aosp
* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
Sample hierarchial URL, from my ContactsProvider test case:
content://com.android.contacts/data?account_name=braddroid%40gmail.com&account_type=com.google.GAIA&caller_is_syncadapter=true
Without this patch: (fetching the "account_name" parameter)
10000 iters: 0.5293 ms average
10000 iters: 0.5119 ms average
10000 iters: 0.5158 ms average
With this patch, rewriting it to not allocate memory (no implicit
StringBuilder), but still no caching:
1) when it needs to decode something (i.e account_name above;
allocates memory)
50000 iters: 0.28724 ms average
50000 iters: 0.31774 ms average
50000 iters: 0.28764 ms average
2) when it doesn't need to decode (and thus allocate memory,
i.e. account_type above)
50000 iters: 0.0954 ms average
50000 iters: 0.09124 ms average
50000 iters: 0.09088 ms average
Use auth type to setup data connection.
This value defaults to -1 (unset) to maintain compatibility.
When the value is -1, the auth type gets set to 0 (if no user is specified)
or 3.
Bug: 181700
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-plus-aosp
* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
Bluetooth A2DP suspend-resume improvements.
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.
More robust suspend/resume logic.
Use only the suspend request to audio hardware to avoid having two concurent suspend resume control paths.
Merge commit '75d562696e709b6d9e61a23fc86f0cfba15e655e'
* commit '75d562696e709b6d9e61a23fc86f0cfba15e655e':
don't turn off filtering/dithering when we scroll.
Merge commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218' into eclair-mr2-plus-aosp
* commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218':
don't turn off filtering/dithering when we scroll.
Merge commit 'adddd24f31291f733cd5f72898b92f13f37ae37c' into eclair-mr2-plus-aosp
* commit 'adddd24f31291f733cd5f72898b92f13f37ae37c':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-mr2
* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-plus-aosp
* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit 'b81199b3eed6f6079e5dc7bedeaa50712f3d9b11' into eclair-mr2-plus-aosp
* commit 'b81199b3eed6f6079e5dc7bedeaa50712f3d9b11':
make the password-clearing algorithm smarter
Merge commit '40c995a704141c4b245ba422f26dc4046ed3538b'
* commit '40c995a704141c4b245ba422f26dc4046ed3538b':
Add a method to clear info about a contact
Merge commit 'baf4ca1bba6a93e20614d605a1232b3f34057723' into eclair-mr2-plus-aosp
* commit 'baf4ca1bba6a93e20614d605a1232b3f34057723':
Add a method to clear info about a contact
Merge commit '246978b8dc89562dda47fea9a7aee61949101242' into eclair-mr2
* commit '246978b8dc89562dda47fea9a7aee61949101242':
Add a method to clear info about a contact
Merge commit '246978b8dc89562dda47fea9a7aee61949101242' into eclair-plus-aosp
* commit '246978b8dc89562dda47fea9a7aee61949101242':
Add a method to clear info about a contact
Add a method so the ContactInfoWidget will throw away the cached
info it has on a contact (e.g. picture and uri).
Change-Id: Ia8f376e356c6bcf246bbd72239c5ca2a3b7c9574
Merge commit '79b609722ef2121368b2f40a0e67ac9fecc23b7c'
* commit '79b609722ef2121368b2f40a0e67ac9fecc23b7c':
Show the soft keyboard when pressing center key/trackball on input field
Merge commit 'f0990646d505ec06d400debe5fd5c895fcb02f13' into eclair-mr2-plus-aosp
* commit 'f0990646d505ec06d400debe5fd5c895fcb02f13':
Show the soft keyboard when pressing center key/trackball on input field
Merge commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa'
* commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa':
Do not hide the cursor ring when clicking on an input field.
Fixes http://b/issue?id=2210234
Consolidate center key/trackball presses on input fields, and show
soft keyboard if the field is not readonly. Also rename the method
for a center press, and pass a click rather than a touch. Requires
a change in external/webkit.
Merge commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f' into eclair-mr2-plus-aosp
* commit '1d60c5c16b92ddc64d10f13da8af7faaae22cd2f':
Do not hide the cursor ring when clicking on an input field.
When pressing the trackball on a text input field, do not call
setFollowedLink, which results in the cursor ring disappearing and
the WebTextView being torn down. Fixes http://b/issue?id=2210127
Merge commit '5c73c3bce410aa84bc0c57eee5b394c044035e33'
* commit '5c73c3bce410aa84bc0c57eee5b394c044035e33':
Make the VideoView go away automatically at the end of playback.
Merge commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9' into eclair-mr2-plus-aosp
* commit '46a83b4ead517b9fc13b4bee4c59c3eaf4d3fdd9':
Make the VideoView go away automatically at the end of playback.
Merge commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce' into eclair-mr2-plus-aosp
* commit 'c6bead14fe6fe70bcfd8802ee9f0259476a074ce':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-plus-aosp
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
