Merge commit 'decbc3dbc4d4d3c368319ae0784307b5182bd2fe'
* commit 'decbc3dbc4d4d3c368319ae0784307b5182bd2fe':
don't center zoom on size change if zoom is in progress
The onSizeChange code is called when the device is rotated and
when the title bar is hidden. In the latter case, it is in response
to the zooming transition from overview mode to reading mode, and
the zoom center should not be recomputed.
http://b/issue?id=2060720
Merge commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab'
* commit 'ab3803bd8db8c4d73ae2566764408f9c4a0d24ab':
Check for a null history item to avoid crashing.
Use the in-memory ssl preference table before posting a message to the WebCore
thread. Since the WebCore thread is blocked waiting for the ssl resource, we
cannot query the user for their preference. If the table does not contain the
user's decision, bail on the request to avoid a deadlock.
Also mark a few of the ssl handler's method's as synchronized. This was reported
by findbugs.
Merge commit '92bd45f9444d3b1fca7bf687b73b46ccc7d8fcec'
* commit '92bd45f9444d3b1fca7bf687b73b46ccc7d8fcec':
The new webkit won't keep RAM cache if http header has "no-store". So remove
* changes:
The new webkit won't keep RAM cache if http header has "no-store". So remove it from StreamLoader. And fix the code where we only want to cache network result.
Merge commit 'a711fadb07328ec625e1bed3121093ef28b43fe0'
* commit 'a711fadb07328ec625e1bed3121093ef28b43fe0':
Add extra to exclude specific MIME-types from Fast-Track.
Also added ContactHeaderWidget accessor for passing along
this list when triggering Fast-Track. This is used so that
the header widget can hide the profile icon when launched
while already looking at the profile.
Merge commit '9d11ef2b4a39f8e881e315a322c4990d7e20fcae'
* commit '9d11ef2b4a39f8e881e315a322c4990d7e20fcae':
Remove the decleration of com.android.im.plugin.jar in platform.xml
* changes:
Remove the decleration of com.android.im.plugin.jar in platform.xml Add a column definition for keep_signed_in when query the active account with a given provider
Merge commit 'a3598d9acdc1de1cf63e40cc08e29fcbe1cdc041'
* commit 'a3598d9acdc1de1cf63e40cc08e29fcbe1cdc041':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Merge commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d' into eclair
* commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Merge commit '0949f652ee2e84ef46d12ac692620286925ded6e'
* commit '0949f652ee2e84ef46d12ac692620286925ded6e':
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
* changes:
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA: High-Speed Packet Access
Add support for HSDPA/HSUPA/HSPA:
1) extend TelephonyManager.NETWORK_TYPE for HSDPA/HSUPA/HSPA
2) extend ServiceState.RADIO_TECHNOLOGY for HSDPA/HSUPA/HSPA
3) set radioTechnology into ServiceState in GsmServiceStateTracker
4) change the implementation of TelephonyManager.getNetworkType to
solve the competition timing issue between the time of setting
system property and the time of receiving notification through
PhoneStateListener
4.1) add a getNetworkType interface in ITelephony.aidl
5) add icons resources for HSDPA/HSUPA/HSPA
6) make use of HSDPA/HSUPA/HSPA icons in StatusBarPolicy
- @hides relevant APIs
- removes relevant javadoc
- enforces that only system apps can participate
note: general support is still there, will be easy to reenable when we are ready.
Merge commit 'e97c2006bf7c391c933307e520a392e532aa5d6a' into eclair
* commit 'e97c2006bf7c391c933307e520a392e532aa5d6a':
Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
