summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-02-23Revert "Fix issue 2459650."android-2.1_r2.1p2android-2.1_r2.1peclair-passion-releaseandroid-build SharedAccount
This reverts commit 699f7ce33d715f49a89f584034436b85e9d7a6e7.
2010-02-22Fix issue 2459650.Eric Laurent
This change fixes a problem where an unwanted tone is generated by audio policy manager when a MT call is answered. This is because of a policy that replaces high visibility system sounds (ringtones, alarms...) by a beep when in call. There is a transitory phase while the call is being answered where the phone state is changed to IN_CALL but the ringtone is still playing. The audio policy manager then mutes the end of the ringtone and starts playing a beep in replacement because the ringtone is categorized as high visibility. The fix consists in changing the ringtone stream type from high visibility to low visibility. This is not a problem as the only actual use case where a ringtone would be generated while in call is if another call is received. But in this case, the phone system does not generate a ringtone but a call waiting tone instead. It is therefore not required to handle a ringtone as a high visibiltiy tone that must be somehow signaled to the user while in call.
2010-02-22Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.Romain Guy
Prevent infinite loop in the Phone UI.
2010-02-22Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGERomain Guy
Fix the lock screen.
2010-02-22Manual merge of 40080 DO NOT MERGERomain Guy
Properly notifies listener when an animation is cancelled. Bug: #2428005.
2010-02-22Cleanup fixes for ScaleGestureDetectorAdam Powell
2010-02-11Revert "Add null checks when scanning a package."android-build SharedAccount
This reverts commit 9e7ac3ba8405f22c11629091449ff35a06b72055.
2010-02-10Add null checks when scanning a package.Suchi Amalapurapu
Delete packages whose code and resource paths haven't been set correctly.
2010-02-10Merge "DO NOT MERGE" into eclairBart Sears
2010-02-10Merge "DO NOT MERGE" into eclairBart Sears
2010-02-03Merge branch 'eclair' into eclair-releaseThe Android Automerger
2010-02-03Merge "Screenshots for sample syncadapter." into eclairMegha Joshi
2010-02-03Screenshots for sample syncadapter.Megha Joshi
2010-01-29Merge "Ignore NTP time fixes that differ from system time by more than 5 ↵Mike Lockwood
minutes." into eclair
2010-01-29Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclairJohn Wang
2010-01-29Handle RIL_UNSOL_RESEND_INCALL_MUTE.John Wang
For bug 2400052. Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we ↵Jim Miller
get an incoming call. Updated javadoc.
2010-01-29Merge "docs: update web page debugging with info about page and line ↵Scott Main
numbering in the log." into eclair
2010-01-29Merge branch 'eclair' into eclair-releaseThe Android Automerger
2010-01-29docs: update web page debugging with info about page and lineScott Main
numbering in the log.
2010-01-29Ignore NTP time fixes that differ from system time by more than 5 minutes.Mike Lockwood
Change-Id: I603195f6925e25baccd18190016cf8611bb9dc1b BUG: 2402380 Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-28Merge "SDK doc change: Increment the platform version var used in doc footer ↵Dirk Dougherty
and elsewhere." into eclair
2010-01-28SDK doc change: Increment the platform version var used in doc footer and ↵Dirk Dougherty
elsewhere. Bug: 2160782 Change-Id: I6e7721bca95cdc6565f3200d7609a4ea9b45cf9b
2010-01-28Merge "SDK doc change: fix android:glEsVersion description, add ↵Dirk Dougherty
live_wallpaper feature, indicate market filtering on features." into eclair
2010-01-28SDK doc change: fix android:glEsVersion description, add live_wallpaper ↵Dirk Dougherty
feature, indicate market filtering on features. Bug: 2160782 Change-Id: I8560f32b04a4044f58b8f7dd678aec781d56b9d9
2010-01-27Merge branch 'eclair' into eclair-releaseandroid-2.1_r2eclair-releaseThe Android Automerger
2010-01-27Fix http://b/issue?id=2400423.Grace Kloba
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-26Merge "doc change only: Update announcement and mwc redirect to point to ↵Dirk Dougherty
microsite." into eclair
2010-01-26doc change only: Update announcement and mwc redirect to point to microsite.Dirk Dougherty
Change-Id: Icb2c9ae00a65839243912007991cd1704a543bc7
2010-01-26Merge branch 'eclair' into eclair-releaseThe Android Automerger
2010-01-26Fix 2397617: Right-align carrier text in lock screen and add carrier text to ↵Jim Miller
PINunlock in landscape mode.
2010-01-25Merge branch 'eclair' into eclair-releaseThe Android Automerger
2010-01-25Fix the reporting of NO_CONNECTIVITY.Robert Greenwalt
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-25Merge "Refine fix I53e91db7 to apply only to wifi network" into eclairRobert Greenwalt
2010-01-25Refine fix I53e91db7 to apply only to wifi networkRobert Greenwalt
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-25Merge "docs: reference the history JS file with docRoot in order to make ↵Scott Main
offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300" into eclair
2010-01-25Merge branch 'eclair' into eclair-releaseThe Android Automerger
2010-01-25docs: reference the history JS file with docRoot in order toScott Main
make offline doc searches work. (I think this was a regression due to a missed merge.) Bug: 1909300
2010-01-25Merge "disable high-quality filtering during scrolling, until I can cached ↵Mike Reed
the scaled images." into eclair
2010-01-25disable high-quality filtering during scrolling, until I can cached the ↵Mike Reed
scaled images.
2010-01-22Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text ↵Jim Miller
is too long." into eclair
2010-01-22Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too ↵Jim Miller
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-22Merge "SDK doc change: Misc small fixes." into eclairDirk Dougherty
2010-01-22Merge "SDK doc change: Add "fetch by http" workaround for connection ↵Dirk Dougherty
problems in SDK Manager." into eclair
2010-01-22Merge "Fix issue #2391429: Crash during boot if fwd locked app is ↵Dianne Hackborn
incompletely installed" into eclair
2010-01-22SDK doc change: Misc small fixes.Dirk Dougherty
Bug:2160782 Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
2010-01-22Fix issue #2391429: Crash during boot if fwd locked app is incompletely ↵Dianne Hackborn
installed We need to remove left-over .apk when cleaning up a partially installed app. Change-Id: I94264549670a2ad01622f746c40c82c30dd3da8d
2010-01-22SDK doc change: Add "fetch by http" workaround for connection problems in ↵Dirk Dougherty
SDK Manager. Bug: 2160782 Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
2010-01-22Merge "doc change: add announce for developer lab at mwc. move adc to ↵Dirk Dougherty
carousel." into eclair
2010-01-22Merge branch 'eclair' into eclair-releaseThe Android Automerger
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 07:06:18 +0000