Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp
* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
Do not die when printing empty prefs.
Merge commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f' into eclair-plus-aosp
* commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f':
Fixed the fastscroll thumb asset in hdpi.
Merge commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a'
* commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a':
API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp
* commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3':
API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265'
* commit 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265':
Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185'
* commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185':
Adjust the WebTextView's text size according to density.
Merge commit 'b962208d8ec529b8cc07c3bc44732603010bd691'
* commit 'b962208d8ec529b8cc07c3bc44732603010bd691':
Query for all properties if a property change is received and cache is empty.
Merge commit '0faff7b0cc06ffb933763a9494056a8ec132183a'
* commit '0faff7b0cc06ffb933763a9494056a8ec132183a':
Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit 'b84214a329963be9e156f771c3c8d142280882d7'
* commit 'b84214a329963be9e156f771c3c8d142280882d7':
Do not cache POST response as Cache is indexed with url.
Merge commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6' into eclair-plus-aosp
* commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6':
Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87' into eclair-plus-aosp
* commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87':
Adjust the WebTextView's text size according to density.
Fix for http://b/issue?id=2063143 . Use TypedValue's
types to set the text size properly for the screen's
density.
Change-Id: I3772035157e2a9a8a2dba00ebddbf967c42bfa99
Make a few methods and member variables protected so behavior can be
overridden. In this case, Messaging app uses the control and doesn't
want wrap-around behavior.
Change-Id: Iceb34743b7d17e933400750a5de56b9ecfe8f146
Merge commit '100f08613392c225b8dff3f1e1d586f981884e29' into eclair-plus-aosp
* commit '100f08613392c225b8dff3f1e1d586f981884e29':
Query for all properties if a property change is received and cache is empty.
Deprecate BluetoothError.java.
I spent a lot of time experimenting with a class BluetoothError to enumerate
the many error codes returned by the Bluetooth API. But at the end of the day
they were never used. The vast majority of method calls only really need a
true/false error value, and often not even that.
Methods which do need more detailed error enumeration (for example, bonding
failures) can have there own enumerated error codes. But there is no need
for a common set of error codes.
Also change the IPC failed warnings in BluetoothA2dp to Log.e. These indicate
a very serious error.
Introduce BluetoothAdapter.ERROR and BluetoothDevice.ERROR as helper sentinel
values.
Merge commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd' into eclair-plus-aosp
* commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd':
Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6' into eclair-plus-aosp
* commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6':
Do not cache POST response as Cache is indexed with url.
Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
mRequestHandle is only set from Network. So we can skip checking whether url is Network url if mRequestHandle is not null.
Fix http://b/issue?id=1980031