Merge commit '38a1081cad9385073d80d358decf04f6b2fd5723' into eclair-plus-aosp
* commit '38a1081cad9385073d80d358decf04f6b2fd5723':
Add smallIcon and accountPreferences references to AuthenticatorDescription. Update after path conflict.
Mark cellular variants with the same availability, regardless of which are currently in use.
Availability just means the radio is enabled and sees the network, but has no guarantees that
we could connect to an APN if requested.
Fix the requestRouteToHost logic to support apn switches without WIFI.
bug:2093841
Some more tweaks and fixes to wallpapers. Make sure wallpapers are
told they are not visible when the screen is off. Add some new animations
for transitions across tasks, and fiddle with many of the existing
animations. Clean up the relationship between translucent activities
and animations. Add new API to start a PendingIntent from an
activity.
Change-Id: Ie0bf45fe44081bb6982c75361257a55d9cd9d863
Merge commit 'a1e3c40ce9a9647e3355b0343c38690ae0465752'
* commit 'a1e3c40ce9a9647e3355b0343c38690ae0465752':
Add timestamp support for call history vcard
Merge commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd' into eclair-plus-aosp
* commit '2d3f9c559366ede6aefe9bcff554ef9c4eac21dd':
Add timestamp support for call history vcard
Merge commit 'd43252a7b27a5a6966a51e8b35f5003f92c207fa'
* commit 'd43252a7b27a5a6966a51e8b35f5003f92c207fa':
Modify android.syncml.pim so that no one is going to use.
Merge commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda'
* commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda':
Handle cases where TYPE can be undefined, such as EAS.
Merge commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa' into eclair-plus-aosp
* commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa':
Modify android.syncml.pim so that no one is going to use.
- Remove android.syncml.pim.vcalendar since no one is using it.
-- We have android.pim.ICalendar.java, so handling vCalendar (== ICalendar) is possble without android.syncml.pim
- Mark android.syncml.pim.vcard and related code as obsolete.
-- Refactored version is in android.pim.vcard, which supports new Contacts database schema.
Related issue: 2110530
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp
* commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017':
Handle cases where TYPE can be undefined, such as EAS.
Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp
* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
Do not die when printing empty prefs.
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
Merge commit '100f08613392c225b8dff3f1e1d586f981884e29' into eclair-plus-aosp
* commit '100f08613392c225b8dff3f1e1d586f981884e29':
Query for all properties if a property change is received and cache is empty.
