Commit Graph

6737 Commits

Author SHA1 Message Date
Jackson Fan
9abcf0982e Use correct UUID to authorize AVRCP 2009-08-24 19:02:58 -07:00
Derek Sollenberger
df8a3f31d8 adding harness for plugin testing to be built upon 2009-08-24 15:10:48 -04:00
Android (Google) Code Review
840b856d2a Merge change 22452 into eclair
* changes:
  don't center zoom on size change if zoom is in progress
2009-08-24 11:47:53 -07:00
Cary Clark
a91874d1f9 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
2009-08-24 14:08:43 -04:00
Android (Google) Code Review
d507ff2129 Merge change 22449 into eclair
* changes:
  Check for a null history item to avoid crashing.
2009-08-24 11:00:30 -07:00
Patrick Scott
af31c3a42d Check for a null history item to avoid crashing.
The history item may be null if this page is loaded through loadDataWithBaseURL
so we cannot count on the item being non-null.

Bug: 2073490
2009-08-24 13:59:55 -04:00
Android (Google) Code Review
ba9f5f3f6b Merge change 22440 into eclair
* changes:
  Java-side changes to persist Geolocation permissions between browser sessions.
2009-08-24 10:56:10 -07:00
Android (Google) Code Review
b321625b85 Merge change 22430 into eclair
* changes:
  Remove frameworks/base/im since these stuff are only used by IM app
2009-08-24 10:34:32 -07:00
Yu Shan Emily Lau
b91c52f773 am 8c937a17: Merge change 22379 into donut
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:14:25 -07:00
Android (Google) Code Review
8c937a1766 Merge change 22379 into donut
* changes:
  	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
2009-08-24 10:11:00 -07:00
Patrick Scott
4e9718d6ae Fix synchronous xml requests with ssl errors.
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.
2009-08-24 12:02:51 -04:00
Android (Google) Code Review
7fdab7f967 Merge change 22377 into eclair
* 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.
2009-08-24 08:45:06 -07:00
Steve Block
9d3273f622 Java-side changes to persist Geolocation permissions between browser sessions.
This fixes bug http://b/issue?id=2054365.
2009-08-24 11:59:42 +01:00
Android (Google) Code Review
8a2000df6d Merge change 22262 into eclair
* changes:
  Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
2009-08-24 03:07:15 -07:00
Steve Block
06cd751b05 Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
This fixes bug http://b/issue?id=2067559.
2009-08-24 10:59:57 +01:00
Android (Google) Code Review
25131299aa Merge change 21978 into eclair
* changes:
  Adds the ability to set Geolocation permissions from DumpRenderTree on Android.
2009-08-24 02:28:23 -07:00
Scott Su
6965666d34 Remove frameworks/base/im since these stuff are only used by IM app 2009-08-23 23:41:50 -07:00
Jeff Sharkey
84235ee923 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.
2009-08-23 14:11:00 -07:00
Jeff Sharkey
06a0323a54 Add fields to pass ungrouped counts to UI. 2009-08-23 00:17:44 -07:00
Android (Google) Code Review
f03733e7a1 Merge change 22160 into eclair
* changes:
  Add dither XML flag to StateListDrawable.
2009-08-22 22:57:30 -07:00
Wink Saville
55c6f8881f Fix missing break statement found by Motorola. 2009-08-22 22:48:46 -07:00
Jeff Sharkey
6afa16feb3 Add dither XML flag to StateListDrawable.
We currently allow the dither="true" flag to be set on
individual <bitmap> and <nine-patch> objects, but that flag
is overridden when they are included in a <selector>.  This
change adds the dither="true" flag to StateListDrawable so
they can be dithered when desired.

Fixes http://b/issue?id=2068024
2009-08-22 22:44:00 -07:00
Android (Google) Code Review
a5fa36481c Merge change 22383 into eclair
* 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
2009-08-22 11:07:20 -07:00
Scott Su
527f015b9a 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
2009-08-22 10:48:23 -07:00
Eric Fischer
688b0f1235 am 36d5aaec: Merge change 22322 into donut
Merge commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d' into eclair

* commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d':
  Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
2009-08-22 07:43:44 -07:00
Yu Shan Emily Lau
051d8d6692 modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.

	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-21 19:20:42 -07:00
Grace Kloba
c3fa098ff6 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.
2009-08-21 17:31:11 -07:00
Ken Shirriff
5f5989de7c Add tests for RecurrenceSet.
Tests only cover populateContentValues.  See bug 1594638
2009-08-21 17:09:33 -07:00
Android (Google) Code Review
7b0cdc8890 Merge change 22362 into eclair
* changes:
  Fix +NANP issue and cleanup plus code conversion.
2009-08-21 17:05:24 -07:00
Guo-Bin Zhang
1cef22890d Disable data call in emergency call
Same change as 79ef673d56 rebased
2009-08-21 17:02:49 -07:00
Android (Google) Code Review
6f89172b6e Merge change 22352 into eclair
* changes:
  Fix FallRS by keeping a reference to the mesh.
2009-08-21 16:30:13 -07:00
Romain Guy
1965610f3b Fix FallRS by keeping a reference to the mesh. 2009-08-21 16:29:42 -07:00
Android (Google) Code Review
426ac065d0 Merge change 22328 into eclair
* changes:
  Fix recurrence parsing for all-day events.
2009-08-21 15:58:43 -07:00
Android (Google) Code Review
7a1c20ad4b Merge change 22344 into eclair
* changes:
  fix [2070341] [FAST BLOCKER] can't successfully setup erc52
2009-08-21 15:45:22 -07:00
Mathias Agopian
9e2be20cc5 fix [2070341] [FAST BLOCKER] can't successfully setup erc52 2009-08-21 15:44:17 -07:00
Android (Google) Code Review
d3d7945309 Merge change 22331 into eclair
* 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.
2009-08-21 15:20:31 -07:00
Alex Gruenstein
f1b64f64ab do not merge. Remove voicesearch-specific functionality from framework. 2009-08-21 14:59:26 -07:00
Android (Google) Code Review
36d5aaec2e Merge change 22322 into donut
* changes:
  Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
2009-08-21 14:47:41 -07:00
Ken Shirriff
1ce2e2e78d Fix recurrence parsing for all-day events.
The doozer server requires P1D instead of P86400S for all-day events.

bug=1594638
2009-08-21 14:37:25 -07:00
Wei Huang
1abf498e7f 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. 2009-08-21 14:21:43 -07:00
Android (Google) Code Review
00ddbcaa2e Merge change 22314 into eclair
* changes:
  Purge cache
2009-08-21 14:10:12 -07:00
Android (Google) Code Review
4178b9bd8e Merge change 22316 into eclair
* changes:
  Cleaning up Presence API
2009-08-21 13:45:22 -07:00
Dmitri Plotnikov
31f5dd3cdc Cleaning up Presence API 2009-08-21 13:44:47 -07:00
Android (Google) Code Review
6c6d822f7b Merge change 22318 into eclair
* changes:
  Framework changes to support HSDPA/HSUPA/HSPA HSDPA: High-Speed Downlink Packet Access HSUPA: High-Speend Uplink Packet Access HSPA:  High-Speed Packet Access
2009-08-21 13:43:01 -07:00
Li Zhe
ebe66345e7 Framework changes to support HSDPA/HSUPA/HSPA
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
2009-08-21 13:41:05 -07:00
Android (Google) Code Review
358e6e3c12 Merge change 22292 into eclair
* changes:
  Adding a "Photo" directory under Contacts.
2009-08-21 13:40:40 -07:00
Android (Google) Code Review
cc0a17cb08 Merge change 22290 into eclair
* changes:
  Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:36:30 -07:00
Eric Fischer
cc5dfa9ed0 Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Without this, the runtime would restart when you tried to add a word
from the search widget.

Bug 2069689
2009-08-21 13:31:54 -07:00
Android (Google) Code Review
51afbd308d Merge change 22308 into eclair
* changes:
  Replace fullHeight support by fullSize (height and width)
2009-08-21 13:26:19 -07:00
Tom Taylor
4ddacd014b Purge cache
When persisting a PDU, make sure we purge any old instances of the
PDU from the cache.
2009-08-21 13:09:55 -07:00