21647 Commits

Author SHA1 Message Date
Doug Zongker
0001882200 am e725a963: am 4c59ca8b: Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Merge commit 'e725a9634b0cea150b29755ed94c53e621b4f273' into kraken

* commit 'e725a9634b0cea150b29755ed94c53e621b4f273':
  remove OTA packages from the old (pre-froyo) updater
2010-04-05 15:22:59 -07:00
Doug Zongker
e725a9634b 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
4c59ca8bdb Merge "remove OTA packages from the old (pre-froyo) updater" into froyo 2010-04-05 15:16:12 -07:00
Doug Zongker
944ff0b788 remove OTA packages from the old (pre-froyo) updater
The old updater ran in the system process, so only that UID can delete
its downloads.  Do this on startup in case we've just upgraded from
something before froyo and need to clean up those packages.

b/2571619 - eclair -> froyo update package not deleted

Change-Id: I0a5e7834c3ecd2cc2f6fd73052b3a38e1294b5d5
2010-04-05 15:10:31 -07:00
Wei Huang
54e93ee7ea bug 2542580: fix bad icon.
- borrow hdpi asset instead (for now), until I get a new icon from UX.

Change-Id: I6425698b02a3bcb53448db05f9939d48a2078c26
2010-04-05 15:09:52 -07:00
Dan Morrill
a03dfc0792 am ca5e7de8: am 21390f08: Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken

* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
  Adding a feature definition for touchscreens that was overlooked in the last
2010-04-05 15:03:48 -07:00
Kenny Root
6613ffb331 am 16197a24: am 0db37997: Merge "Revert to previous text selection behavior" into froyo
Merge commit '16197a246fdeff0167f9abdc6a3da5d83759993d' into kraken

* commit '16197a246fdeff0167f9abdc6a3da5d83759993d':
  Revert to previous text selection behavior
2010-04-05 15:03:45 -07:00
Dan Morrill
ca5e7de82b 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
16197a246f 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
21390f0813 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
0db3799736 Merge "Revert to previous text selection behavior" into froyo 2010-04-05 14:55:10 -07:00
Jaikumar Ganesh
dc56ced8f0 am f84207f6: am c6af69b2: Merge "Add an extra for the Disconnect Headset State." into froyo
Merge commit 'f84207f6ca90307b10d94e484baf55330d644c1d' into kraken

* commit 'f84207f6ca90307b10d94e484baf55330d644c1d':
  Add an extra for the Disconnect Headset State.
2010-04-05 14:53:41 -07:00
Jaikumar Ganesh
f84207f6ca 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
Kenny Root
8cdb684163 Revert to previous text selection behavior
There was a new behavior that starting "Select text" would allow you to
swipe from beginning to end and immediately copy that. This change
reverts to the previous behavior that "Select text" will start where
your cursor is currently and any tap will extend the selection from that
origin to the point of the tap.

Change-Id: Ib955cc8d62a652f518435953da2f54e810d9dfb0
2010-04-05 14:48:44 -07:00
Jaikumar Ganesh
c6af69b268 Merge "Add an extra for the Disconnect Headset State." into froyo 2010-04-05 14:45:27 -07:00
Wei Huang
6becff379d am d97eb7bd: am badaa778: Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Merge commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb' into kraken

* commit 'd97eb7bdd03fb4cb2c69afcfeb6d6f5c086f7fbb':
  bug #2542580: fix stat_notify_chat icon for mdpi resource.
2010-04-05 14:44:07 -07:00
Jaikumar Ganesh
c24dbdb57b Add an extra for the Disconnect Headset State.
This extra tells as to who initiated the disconnection.

Bug:2568119
Change-Id: Iea706ad69f79ae0257604dfa84d49126fb851cca
2010-04-05 14:43:59 -07:00
Dan Morrill
b0fe033ff8 Adding a feature definition for touchscreens that was overlooked in the last
round.

Change-Id: I8f30676a7b468a9868503b05f366709d5534a44e
2010-04-05 14:43:58 -07:00
Wei Huang
d97eb7bdd0 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
badaa7782d Merge "bug #2542580: fix stat_notify_chat icon for mdpi resource." into froyo 2010-04-05 14:36:47 -07:00
Amith Yamasani
c778f71d5c am 733a2f65: am 1b4c0d70: Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken

* commit '733a2f654934d452b2febf6f80cd1136830758d5':
  Fix a crash in BatteryStatsImpl, due to a previous fix.
2010-04-05 14:25:31 -07:00
Amith Yamasani
733a2f6549 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
Wei Huang
36d13c32a6 bug #2542580: fix stat_notify_chat icon for mdpi resource.
Change-Id: Id6a14f76077334ad2925aeecb04fd0f69209c91f
2010-04-05 14:18:55 -07:00
Amith Yamasani
1b4c0d7020 Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo 2010-04-05 14:17:55 -07:00
Joe Onorato
e58d1c4e4a Redo the look of the recent apps switcher.
Change-Id: Icb523e2f5949c2b502aa8003aa14b7ac98a616f2
2010-04-05 16:16:40 -05:00
Ray Chen
507748e972 am 6c935602: am 44dcf658: Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken

* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
  Make createVideoThumbnail and createImageThumbnail look consistent.
2010-04-05 13:19:39 -07:00
Ray Chen
6c9356028c 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
Ray Chen
44dcf65871 Make createVideoThumbnail and createImageThumbnail look consistent.
Change-Id: I9a4798fefe3968ac847d46100036a6dde39791c9
2010-04-05 13:06:39 -07:00
Amith Yamasani
e5795610bd Fix a crash in BatteryStatsImpl, due to a previous fix.
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.

Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
2010-04-05 12:43:44 -07:00
Cary Clark
1cab19369d am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken

* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
  check for webviewcore before reading settings
2010-04-05 12:33:03 -07:00
Mike Lockwood
edff6dbe5b Merge "Switch from hardware_legacy to new HAL GPS interface." into kraken 2010-04-05 12:30:32 -07:00
Cary Clark
6cf2c14f65 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
Cary Clark
3eefc126e5 check for webviewcore before reading settings
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.

Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
2010-04-05 15:25:26 -04:00
Mike Lockwood
b7ff4574b5 Switch from hardware_legacy to new HAL GPS interface.
Change-Id: I19b299fbcbd44d711a64ece98955d095eb9ffa2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-05 15:24:34 -04:00
Leon Scroggins
86d663faa0 am e64e090e: am f9b1a092: Only include WEB_EDIT if there are more textfields.
Merge commit 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken

* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
  Only include WEB_EDIT if there are more textfields.
2010-04-05 11:40:44 -07:00
Leon Scroggins
e64e090e0d 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
Leon Scroggins
f9b1a092b6 Only include WEB_EDIT if there are more textfields.
Fixes http://b/issue?id=2559070

Requires a change to external/webkit.

Change-Id: I411a04d260c781a91d16832704bb5c34e9751bc1
2010-04-05 14:31:37 -04:00
San Mehat
d32de7f38f am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
Merge commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7' into kraken

* commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7':
  NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
2010-04-05 10:44:45 -07:00
San Mehat
9d782f62de 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
73a8f26aef Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo 2010-04-05 10:35:56 -07:00
Christopher Tate
db4b80dda0 am 11f759cf: am 5923c971: Fix \'dumpsys backup\'
Merge commit '11f759cf9a2b585c57adf4833ba706fd94e06571' into kraken

* commit '11f759cf9a2b585c57adf4833ba706fd94e06571':
  Fix 'dumpsys backup'
2010-04-04 17:58:51 -07:00
Christopher Tate
11f759cf9a 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
Christopher Tate
5923c97183 Fix 'dumpsys backup'
"for (Type foo : mSetOfType)" doesn't work when mSetOfType is null.

Change-Id: Iac667c7309f99b12d3147830e166b542b29cba5f
2010-04-04 17:45:35 -07:00
Mike Lockwood
00b74270c9 Move files internal to LocationManagerService from framework.jar to services.jar
Change-Id: Iebbfc49b8300ab59730733efdf489ec87ea45a25
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-04 18:44:05 -04:00
Mike Lockwood
5b53244a4e GpsNetInitiatedHandler: whitespace cleanup
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-04 18:44:05 -04:00
Mike Lockwood
79e642e8ed Call LocationManager.sendNiResponse() instead of calling directly to GpsLocationProvider
Change-Id: I6a5b47abb0519f5228d29bc3340bb2490564803e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-04 18:44:05 -04:00
Dianne Hackborn
69e398bd14 Merge "Fix reporting of window visibility in WindowManagerService." 2010-04-03 15:31:54 -07:00
Christopher Tate
a9d0771377 am 5fe7b409: am 1484b6d6: Merge "Fix "incall in landscape sometimes" bug #2523942" into froyo
Merge commit '5fe7b4094791b898f8ffcc166c621a2bc5b05c1e' into kraken

* commit '5fe7b4094791b898f8ffcc166c621a2bc5b05c1e':
  Fix "incall in landscape sometimes" bug #2523942
2010-04-02 19:22:51 -07:00
Christopher Tate
5fe7b40947 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
1484b6d6b7 Merge "Fix "incall in landscape sometimes" bug #2523942" into froyo 2010-04-02 19:14:58 -07:00