Commit Graph

14074 Commits

Author SHA1 Message Date
Andreas Huber
5bf9232cf2 Merge "Report the requested seek time while seek is in progress." into froyo 2010-04-07 10:58:05 -07:00
Xia Wang
9a3965f1f8 Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo 2010-04-07 10:30:19 -07:00
Leon Scroggins
e5794f17df Merge "Show the microphone when the search box is opened from browser" into froyo 2010-04-07 10:04:50 -07:00
Adam Powell
6d1f97872e Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo 2010-04-07 09:48:48 -07:00
Scott Main
befda9c6ad Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo 2010-04-07 09:02:59 -07:00
The Android Automerger
163f0f2358 Merge branch 'froyo' into froyo-release 2010-04-07 08:12:03 -07:00
Daniel Sandler
b033f112e5 Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:40:26 -07:00
Dan Egnor
86acf64c14 Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 20:50:25 -07:00
Brett Chabot
34bff4887a Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 16:31:14 -07:00
Andreas Huber
dfbd07c3a4 Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 2010-04-06 14:43:05 -07:00
Kenny Root
eb21758490 Merge "Fix last character of password field being visible after rotation" into froyo 2010-04-06 14:33:24 -07:00
Daniel Lehmann
d8172858f3 Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 2010-04-06 14:10:04 -07:00
Christopher Tate
baf3790f49 Merge "Fix 'bmgr restore'" into froyo 2010-04-06 12:19:11 -07:00
Grace Kloba
a4a76d55d7 Merge "Update the Webkit version." into froyo 2010-04-06 11:50:32 -07:00
Romain Guy
59527c4cf0 Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 2010-04-06 11:25:43 -07:00
Dianne Hackborn
eb00f8f722 Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo 2010-04-06 11:18:01 -07:00
Suchi Amalapurapu
0a97468698 Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 10:50:56 -07:00
Bjorn Bringert
660557de27 Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 08:53:12 -07:00
Joe Onorato
07c0f3cebe Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
The Android Automerger
df4f6cc0a7 Merge branch 'froyo' into froyo-release 2010-04-06 08:07:31 -07:00
Dianne Hackborn
a388fe0a27 Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo 2010-04-05 18:35:11 -07:00
Jim Miller
3abdeafc34 Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo 2010-04-05 17:16:00 -07:00
Dirk Dougherty
95d321284e Merge "docs: add manifest documentation for installLocation" into froyo 2010-04-05 16:37:07 -07:00
Wei Huang
86698b3ed3 Merge "bug 2542580: fix bad icon." into froyo 2010-04-05 15:36:40 -07:00
Doug Zongker
98303300fc Merge "remove OTA packages from the old (pre-froyo) updater" into froyo 2010-04-05 15:16:12 -07:00
Dan Morrill
536267981d Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo 2010-04-05 14:56:03 -07:00
Kenny Root
5a58300e87 Merge "Revert to previous text selection behavior" into froyo 2010-04-05 14:55:10 -07:00
Jaikumar Ganesh
0c0aa74138 Merge "Add an extra for the Disconnect Headset State." into froyo 2010-04-05 14:45:27 -07:00
Wei Huang
16d235537b Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo 2010-04-05 14:36:47 -07:00
Amith Yamasani
68e9e237c9 Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 2010-04-05 14:17:55 -07:00
The Android Automerger
32ccf25023 Merge branch 'froyo' into froyo-release 2010-04-05 12:26:26 -07:00
San Mehat
70bd7b1dbf Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 2010-04-05 10:35:56 -07:00
The Android Automerger
9a0f74f9e5 Merge branch 'froyo' into froyo-release 2010-04-05 08:02:51 -07:00
Christopher Tate
0625ebc727 Merge "Fix "incall in landscape sometimes" bug #2523942" into froyo 2010-04-02 19:14:58 -07:00
Dirk Dougherty
f0f3904bb8 Merge "doc change: miscellaneous small fixes." into froyo 2010-04-02 18:37:10 -07:00
Amith Yamasani
1a77a91711 Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo 2010-04-02 17:20:53 -07:00
Grace Kloba
ee62d8b26e Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo 2010-04-02 16:41:13 -07:00
Andreas Huber
4b3bf35b0a Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo 2010-04-02 14:03:46 -07:00
Dianne Hackborn
f57216f124 Merge "Add a new intent category used for activities running in carmode." into froyo 2010-04-02 13:35:59 -07:00
Irfan Sheriff
5cbb4dc9f7 Merge "Dont start wifi if in airplane mode" into froyo 2010-04-02 12:47:45 -07:00
Suchi Amalapurapu
eeb2f83f02 Merge "Handle exceptions when doing dexopt." into froyo 2010-04-02 12:46:38 -07:00
Andreas Huber
c8eafefc59 Merge "Support another kind of iso mpeg4 file." into froyo 2010-04-02 11:18:32 -07:00
Adam Powell
0538289113 Merge "Fix AbsListView scrolling behavior at edges." into froyo 2010-04-02 11:02:21 -07:00
Daniel Sandler
9e2cd9a4c0 Merge "Make desk mode work again." into froyo 2010-04-02 10:54:57 -07:00
Fred Quintana
51eeb54714 Merge "revert the stripping of System Group: from the names of google system groups" into froyo 2010-04-02 10:47:11 -07:00
Brett Chabot
c4a82edf66 Merge "Add test annotations to frameworks common tests." into froyo 2010-04-02 10:24:00 -07:00
Grace Kloba
4443e6ce77 Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo 2010-04-02 09:14:39 -07:00
Jean-Michel Trivi
4c9bf79786 Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo 2010-04-02 08:53:42 -07:00
Brett Chabot
49b35b5f9c Add test annotations to frameworks common tests.
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
2010-04-02 08:53:22 -07:00
Dave Sparks
8421672e2e Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo 2010-04-02 07:56:44 -07:00