Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp
* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
Do not die when printing empty prefs.
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp
* commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3':
API to combine LOOKUP_KEY and Contacts._ID together.
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
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.
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
Merge commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c' into eclair-plus-aosp
* commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c':
Make the hardkeyboard long press dialog look the same as that of soft keyboard.
Merge commit 'b752098e8d12d6e7925d97458078dbb896ca8a05' into eclair-plus-aosp
* commit 'b752098e8d12d6e7925d97458078dbb896ca8a05':
Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
Merge commit '33b69050b2074c1768c45895418f0454e52e279a' into eclair-plus-aosp
* commit '33b69050b2074c1768c45895418f0454e52e279a':
Add javadoc to explain which permissions are required for Public BT API's.
Merge commit 'c3a30a00333910268e2b93c58f14214b074aa929' into eclair-plus-aosp
* commit 'c3a30a00333910268e2b93c58f14214b074aa929':
adding support for webkit plugins to use the java view system
Merge commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86' into eclair-plus-aosp
* commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86':
don't fling if there's nowhere to go
Merge commit 'f8d4964e45f7e671f4b333386b4269b23ced4750' into eclair-plus-aosp
* commit 'f8d4964e45f7e671f4b333386b4269b23ced4750':
default overview mode to false in webkit
Merge commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a' into eclair-plus-aosp
* commit '377c5c15f8fea14b575b6b0f14ac7fd3a4d44b3a':
Revert "Adding classes to enable plugins to use the java view system."
Merge commit '67dffd93e045e08e446df11e370597a9463f010c' into eclair-plus-aosp
* commit '67dffd93e045e08e446df11e370597a9463f010c':
Adding classes to enable plugins to use the java view system.
Merge commit '7390c5af7a0c2379fa72218ea63a714f843edf0f' into eclair-plus-aosp
* commit '7390c5af7a0c2379fa72218ea63a714f843edf0f':
Fix small bugs in VCardComposer.java.
Merge commit 'eb034652c2037a47ebfd99779e8383bb8bb528af' into eclair-plus-aosp
* commit 'eb034652c2037a47ebfd99779e8383bb8bb528af':
Implement all of the infrastructure for configuring wallpapers.
Merge commit 'c916c04495292c86051a2c31e90cca26a9bd99c1' into eclair-plus-aosp
* commit 'c916c04495292c86051a2c31e90cca26a9bd99c1':
Fix issue #2095422: Some fades from opaque to transparent don't work
Merge commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b' into eclair-plus-aosp
* commit 'd4344ba9ba5091c7f10c927c3ca8917ee496e87b':
Open some methods on PrefereneManager to allow others use the inflater.
Merge commit '88e625795943dea84b2e7c32f37e71303143b728' into eclair-plus-aosp
* commit '88e625795943dea84b2e7c32f37e71303143b728':
Integrated the profiler into the framework. We run it all the time if the persist.sampling_profiler
Add a test to doFling() to return quickly if the fling has
no effect. For simplicity, only test for horizontal or vertical
flings.
The man purpose is to avoid suspending webkit until the fling
animation is complete when the purpose of the touch drag is
to activate a touch event, like a swipe in superpudu.
fixes http://b/issue?id=2052852
Browser defaults overview mode to true in BrowserSettings.java,
but a WebView should default overview mode to false. This permits
applications without zoom interfaces, such as HTMLViewer, to
have the same interface as before.
