Commit Graph

13942 Commits

Author SHA1 Message Date
Dianne Hackborn
475a487185 am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp

* commit '48bce4515d948971a122a1e17fd1919f81297d77':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
2010-04-06 12:38:22 -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
bed12215d0 am fede9aed: Merge "Forcibly unmount the sdcard after N retries." into froyo
Merge commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c' into froyo-plus-aosp

* commit 'fede9aed2b1f0b6316e18cbfa58be593fa7eb14c':
  Forcibly unmount the sdcard after N retries.
2010-04-06 10:55:43 -07:00
Suchi Amalapurapu
0a97468698 Merge "Forcibly unmount the sdcard after N retries." into froyo 2010-04-06 10:50:56 -07:00
Irfan Sheriff
9a2a50bed3 am b2e6c01f: Disable tethering when airplane mode is enabled
Merge commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6' into froyo-plus-aosp

* commit 'b2e6c01f449f3fd4effee7029518684deb4e98f6':
  Disable tethering when airplane mode is enabled
2010-04-06 10:48:46 -07:00
Bjorn Bringert
caefc0739c am 7d2511b7: Merge "Guard against NPE in SearchManagerService" into froyo
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp

* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
  Guard against NPE in SearchManagerService
2010-04-06 08:57:01 -07:00
Bjorn Bringert
660557de27 Merge "Guard against NPE in SearchManagerService" into froyo 2010-04-06 08:53:12 -07:00
Joe Onorato
28b00ca814 am fa588fc3: Merge "Redo the look of the recent apps switcher" into froyo
Merge commit 'fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp

* commit 'fa588fc37420a1a4d287e6307700ca310897308a':
  Redo the look of the recent apps switcher
2010-04-06 08:36:05 -07:00
Joe Onorato
07c0f3cebe Merge "Redo the look of the recent apps switcher" into froyo 2010-04-06 08:32:07 -07:00
Dianne Hackborn
3abb362c29 am 6e52b5d7: 2568467 System crash when installing corrupt APK
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp

* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
  2568467 System crash when installing corrupt APK
2010-04-05 18:45:50 -07:00
Dianne Hackborn
6b007324e9 am 01f6b75b: Merge "Fix issue #2564479: Favorite Recipes App Installation Fail" into froyo
Merge commit '01f6b75baa3b9144240fa8c9772859ab4ac948bd' into froyo-plus-aosp

* commit '01f6b75baa3b9144240fa8c9772859ab4ac948bd':
  Fix issue #2564479: Favorite Recipes App Installation Fail
2010-04-05 18:39:04 -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
5047c0841d am a6cce790: Merge "Fix 2325549: Allow up to 4 lines of summary text in Settings" into froyo
Merge commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1' into froyo-plus-aosp

* commit 'a6cce790b24debae49f1df9f039e83e3e29e5cd1':
  Fix 2325549: Allow up to 4 lines of summary text in Settings
2010-04-05 17:21:20 -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
73b2cd72c4 am bcbb7b27: Merge "docs: add manifest documentation for installLocation" into froyo
Merge commit 'bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1' into froyo-plus-aosp

* commit 'bcbb7b2765e47c52b6b84f01ac7e7c56f740e2a1':
  docs: add manifest documentation for installLocation
2010-04-05 16:44:58 -07:00
Dirk Dougherty
95d321284e Merge "docs: add manifest documentation for installLocation" into froyo 2010-04-05 16:37:07 -07:00
Wei Huang
9d2687587d am 0abdf03d: Merge "bug 2542580: fix bad icon." into froyo
Merge commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f' into froyo-plus-aosp

* commit '0abdf03d9dba2f42fd457b63c8b7e8b03d3ee84f':
  bug 2542580: fix bad icon.
2010-04-05 15:42:30 -07:00
Wei Huang
86698b3ed3 Merge "bug 2542580: fix bad icon." into froyo 2010-04-05 15:36:40 -07:00
Doug Zongker
1044401a77 am 4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Merge commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0' into froyo-plus-aosp

* commit '4c59ca8bdb02bf0ca0bb090ecb39d94e260ab2f0':
  remove OTA packages from the old (pre-froyo) updater
2010-04-05 15:19:49 -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
316aaaf564 am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp

* commit '21390f08138801f9e008917c0c0149839a80d002':
  Adding a feature definition for touchscreens that was overlooked in the last
2010-04-05 14:59:47 -07:00
Kenny Root
72bb32ad7d am 0db37997: Merge "Revert to previous text selection behavior" into froyo
Merge commit '0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp

* commit '0db37997366a4d781af48be758a9d90b6d07d7d5':
  Revert to previous text selection behavior
2010-04-05 14:59:44 -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
1508e13302 am c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo
Merge commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp

* commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12':
  Add an extra for the Disconnect Headset State.
2010-04-05 14:50:46 -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
958f7eaf25 am badaa778: Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Merge commit 'badaa7782d76115154a63d47d02caec15832fcb9' into froyo-plus-aosp

* commit 'badaa7782d76115154a63d47d02caec15832fcb9':
  bug #2542580: fix stat_notify_chat icon for mdpi resource.
2010-04-05 14:40:23 -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
7f5e6620e5 am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp

* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
2010-04-05 14:20:57 -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
Ray Chen
24b5b5d7b4 am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp

* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
  Make createVideoThumbnail and createImageThumbnail look consistent.
2010-04-05 13:16:19 -07:00
Cary Clark
7024369f91 am 3eefc126: check for webviewcore before reading settings
Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp

* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
  check for webviewcore before reading settings
2010-04-05 12:30:12 -07:00
Leon Scroggins
85e6d535c7 am f9b1a092: Only include WEB_EDIT if there are more textfields.
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp

* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
  Only include WEB_EDIT if there are more textfields.
2010-04-05 11:38:05 -07:00
San Mehat
da3af713fb am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
Merge commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386' into froyo-plus-aosp

* commit '73a8f26aef40184d9d5dfe9dabcfbd345deb6386':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
2010-04-05 10:41:19 -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
Christopher Tate
8e3a597359 am 5923c971: Fix \'dumpsys backup\'
Merge commit '5923c9718390bf6d50c52661263f15c1f863012b' into froyo-plus-aosp

* commit '5923c9718390bf6d50c52661263f15c1f863012b':
  Fix 'dumpsys backup'
2010-04-04 17:56:35 -07:00
Dianne Hackborn
be0807b343 Merge "Fix reporting of window visibility in WindowManagerService." 2010-04-03 15:31:54 -07:00
Christopher Tate
197c42b553 am 1484b6d6: Merge "Fix "incall in landscape sometimes" bug #2523942" into froyo
Merge commit '1484b6d6b75e13dd96b0f47158926d7989808272' into froyo-plus-aosp

* commit '1484b6d6b75e13dd96b0f47158926d7989808272':
  Fix "incall in landscape sometimes" bug #2523942
2010-04-02 19:18:09 -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
159e0fab20 am fc5aa9cf: Merge "doc change: miscellaneous small fixes." into froyo
Merge commit 'fc5aa9cfd103258c45fe1d6c072e93f227a044d8' into froyo-plus-aosp

* commit 'fc5aa9cfd103258c45fe1d6c072e93f227a044d8':
  doc change: miscellaneous small fixes.
2010-04-02 18:40:50 -07:00
Dirk Dougherty
f0f3904bb8 Merge "doc change: miscellaneous small fixes." into froyo 2010-04-02 18:37:10 -07:00
Amith Yamasani
425edcc517 am 0913ce95: Merge "Potential fix for bug: 2564824 : Device runtime restart in BatteryService" into froyo
Merge commit '0913ce95c29371cb7b58e294a8d60262bc7f4329' into froyo-plus-aosp

* commit '0913ce95c29371cb7b58e294a8d60262bc7f4329':
  Potential fix for bug: 2564824 : Device runtime restart in BatteryService
2010-04-02 17:24:49 -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
5febcc24e9 am b2ade4a7: 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
Merge commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0' into froyo-plus-aosp

* commit 'b2ade4a7e60bed95a25714fbfaeb1a8d8f734dc0':
  Make sure when WebView modified mScrollX/Y directly,
2010-04-02 16:46:39 -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
Adam Powell
a38453fbcb am 6024ca5c: Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp

* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
  Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
2010-04-02 16:20:54 -07:00
Chih-Wei Huang
e5f56fb1b4 Add keycodes PageUp and PageDown
This is useful for applications like web browser.

Change-Id: Ie9262d5b75de87ecd0971407a7c3ce9aa6e4998e
2010-04-02 14:39:20 -07:00