10082 Commits

Author SHA1 Message Date
Megha Joshi
9f4cfc3afc Merge "Screenshots for sample syncadapter." into eclair 2010-02-03 12:24:20 -08:00
Megha Joshi
021a90dbaa Screenshots for sample syncadapter. 2010-02-03 11:21:45 -08:00
Mike Lockwood
a0460004aa Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair 2010-01-29 20:09:16 -08:00
John Wang
8deed914c2 Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair 2010-01-29 20:07:14 -08:00
John Wang
1ccc41ed93 Handle RIL_UNSOL_RESEND_INCALL_MUTE.
For bug 2400052.

Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29 20:04:39 -08:00
Jim Miller
d8a3a8957b Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Updated javadoc.
2010-01-29 17:59:33 -08:00
Scott Main
9800adf2a4 Merge "docs: update web page debugging with info about page and line numbering in the log." into eclair 2010-01-29 13:40:53 -08:00
Scott Main
7b02e924b0 docs: update web page debugging with info about page and line
numbering in the log.
2010-01-29 12:17:32 -08:00
Mike Lockwood
f1218be2d8 Ignore NTP time fixes that differ from system time by more than 5 minutes.
Change-Id: I603195f6925e25baccd18190016cf8611bb9dc1b
BUG: 2402380
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-29 09:20:06 -05:00
Dirk Dougherty
196ec566b3 Merge "SDK doc change: Increment the platform version var used in doc footer and elsewhere." into eclair 2010-01-28 17:59:24 -08:00
Dirk Dougherty
ab2c0a4fab SDK doc change: Increment the platform version var used in doc footer and elsewhere.
Bug: 2160782
Change-Id: I6e7721bca95cdc6565f3200d7609a4ea9b45cf9b
2010-01-28 17:50:10 -08:00
Dirk Dougherty
7b00a8ae71 Merge "SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features." into eclair 2010-01-28 16:40:56 -08:00
Dirk Dougherty
95b528eab5 SDK doc change: fix android:glEsVersion description, add live_wallpaper feature, indicate market filtering on features.
Bug: 2160782
Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
2010-01-28 16:26:50 -08:00
Grace Kloba
769ed21c33 Fix http://b/issue?id=2400423.
When the same page is loaded, updateRestoreState
will be false when we finish the first layout. As
we are still in the same page, we don't want to
update the current zoom/scroll. But in some cases,
like a site switch from mobile to full site and
keeps the same url, we do want to update the zoom
range as the viewport spec changed. Otherwise, user
can't zoom in the full site as the WebView thought
it is still a mobile non-scalable page.
2010-01-27 12:24:38 -08:00
Dirk Dougherty
965f4a6b4b Merge "doc change only: Update announcement and mwc redirect to point to microsite." into eclair 2010-01-26 18:00:29 -08:00
Dirk Dougherty
dc19ba8af9 doc change only: Update announcement and mwc redirect to point to microsite.
Change-Id: Icb2c9ae00a65839243912007991cd1704a543bc7
2010-01-26 16:58:33 -08:00
Jim Miller
9985867a8e Fix 2397617: Right-align carrier text in lock screen and add carrier text to PINunlock in landscape mode. 2010-01-26 12:34:25 -08:00
Robert Greenwalt
cc4b4016e4 Fix the reporting of NO_CONNECTIVITY.
A refactoring of handleDisconnect instroduced a bug - we were reporting
NO_CONNECTIVITY after any non-primary network (supl, mms, hipri) was lost.

bug:2395006

Change-Id: Ifa9e008872ec646981a35f2c316120cb9685a6a4
2010-01-25 17:54:29 -08:00
Robert Greenwalt
5381e4ef4e Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair 2010-01-25 16:50:10 -08:00
Robert Greenwalt
6e6dec2843 Refine fix I53e91db7 to apply only to wifi network
The original fix eliminated duplicate wifi connectivity changes stemming from
location provder scan's for APs.  These would generate two DISCONNECTED broadcasts every
two minutes and many apps mis-interpreted them.

The fix was to ignore notifications where the major state was the same as the previous one
for each network.  Unfortunately the state of per-apn notifications on cellular is hacky
and so the wifi fix was breaking mms (mms when you're on cellular with a common default+mms apn does
not generate a disconnect notification (apn still connected) so subsequent connect notifications
get dropped as duplicates).

This change refines the previous change so that it only applies to wifi networks.

bug:2392061
Change-Id: I05d8a46a4b55f8d28df8af12e05284e5e68bfc02
drno: ryanpc
2010-01-25 16:23:56 -08:00
Scott Main
d243bc710c Merge "docs: reference the history JS file with docRoot in order to make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair 2010-01-25 15:39:46 -08:00
Scott Main
d644edb6d8 docs: reference the history JS file with docRoot in order to
make offline doc searches work. (I think this was a regression
due to a missed merge.)
Bug: 1909300
2010-01-25 14:47:46 -08:00
Mike Reed
f904be1659 Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Mike Reed
729d8369b5 disable high-quality filtering during scrolling, until I can cached the scaled images. 2010-01-25 08:30:35 -05:00
Jim Miller
2e4e25f39e Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair 2010-01-22 20:19:12 -08:00
Jim Miller
af1b980ef1 Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
2010-01-22 19:09:50 -08:00
Dirk Dougherty
8420795633 Merge "SDK doc change: Misc small fixes." into eclair 2010-01-22 16:45:58 -08:00
Dirk Dougherty
c5de95bf25 Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 2010-01-22 16:38:59 -08:00
Dianne Hackborn
678e66a4ec Merge "Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed" into eclair 2010-01-22 15:47:08 -08:00
Dirk Dougherty
5bc32d3539 SDK doc change: Misc small fixes.
Bug:2160782
Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
2010-01-22 15:11:00 -08:00
Dianne Hackborn
e6620b2d99 Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed
We need to remove left-over .apk when cleaning up a partially installed app.

Change-Id: I94264549670a2ad01622f746c40c82c30dd3da8d
2010-01-22 14:46:21 -08:00
Dirk Dougherty
83d092573e SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
Bug: 2160782
Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
2010-01-22 14:31:47 -08:00
Dirk Dougherty
5d14cb34c0 Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 2010-01-22 14:23:39 -08:00
Dirk Dougherty
a0fc438334 doc change: add announce for developer lab at mwc. move adc to carousel.
Bug: 2160782
Change-Id: I657738d9452058a2078d81d65b5747b1676a3230
2010-01-22 13:22:42 -08:00
John Wang
098295a5a3 Merge "Updated emergency string when locale changes." into eclair 2010-01-22 13:17:25 -08:00
John Wang
670db2c696 Updated emergency string when locale changes.
For bug 2352094.
2010-01-22 13:07:58 -08:00
Grace Kloba
5ff24d5da4 DO NOT MERGE
This reverts commit 52cb3cbd6fe06e3706be1a7c2939f027106aaaf7.
2010-01-22 12:45:54 -08:00
Eric Laurent
a59551bade Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair 2010-01-22 10:14:26 -08:00
Eric Laurent
700aab67eb Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
The problem occurs if the delay between the headset removal and insertion is less than one second.
In this case, as the headset disconnection intent is broadcast with a 1 second delay to allow music to pause
before updating the route, the connection intent is broadcast before and is ignored, leaving the system
in a state where the headset is considered disconnected.

The fix consists in inserting a delay before broadcasting the connection intent if a disconnection
intent is pending broadcast.
2010-01-22 09:31:12 -08:00
John Wang
08cb002402 Handle emergency calls only status in ServiceStateTracker.
For bug 2352094, handle emergency calls only status and
pass the emergency calls only string via SPN_STRING_UPDATED intent.
2010-01-22 01:03:14 -08:00
Fred Quintana
9a400fa4d3 Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -08:00
jsh
036e21083d Fix NPE when importing from USIM.
Need to check if fileIds is empty.

b/2349232
2010-01-21 16:58:17 -08:00
Yu Shan Emily Lau
b1780474e6 Merge "Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player." into eclair 2010-01-21 15:07:51 -08:00
Eric Fischer
50adb16753 Pull in "emergency calls only" translations. 2010-01-21 13:52:09 -08:00
John Wang
7f70998dec Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Fred Quintana
44037e6c41 initialize sync adapters that get installed while the system is running
bug http://b/issue?id=2360782
2010-01-21 13:14:49 -08:00
John Wang
f936745f5a Add Emergency Calls Only String.
Prepare strings for bug 2352094.

The string is the same as the settings.R.string.radioInfo_service_emergency,
so use the same msgid and translations.
2010-01-21 12:46:01 -08:00
Yu Shan Emily Lau
f465dc0367 Instead of caputre the memory footprint before and after the test. We would like to monitor the memory trend while the test is running. This can eliminate the overhead for the frist test case in creating the player. 2010-01-21 12:38:02 -08:00
Wei Huang
495bae67ff Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair 2010-01-21 12:21:11 -08:00
Wei Huang
22149f3d4e fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.

I tested this by calling

  ContactHeaderWidget.bindFromPhoneNumber(number1);
  ContactHeaderWidget.bindFromPhoneNumber(number2);

where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.

- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.

Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
2010-01-21 12:06:43 -08:00