12206 Commits

Author SHA1 Message Date
Jaikumar Ganesh
373a69614e am 64f42803: Merge "Bluez doesn\'t handle disconnect while connecting well. Defer the message." into gingerbread
Merge commit '64f4280313c5b498a3238d174c4d14ca2187604b' into gingerbread-plus-aosp

* commit '64f4280313c5b498a3238d174c4d14ca2187604b':
  Bluez doesn't handle disconnect while connecting well.
2010-10-12 19:06:13 -07:00
Jaikumar Ganesh
64f4280313 Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread 2010-10-12 19:02:46 -07:00
Nick Pelly
6066da89a4 am 590b73bc: NFC API revision round 2.
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.
2010-10-12 19:00:54 -07:00
Nick Pelly
590b73bc5b NFC API revision round 2.
- Add the second half of the new NFC API: NfcAdapter, Tag, NdefTag,
  RawTagConnection, NdefTagConnection.
- Add implementations for all of the new NFC API.

Change-Id: I8da9fd1d2971ed2c8b76f2a93f207fa9e305b0f6
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-12 18:37:26 -07:00
Justin Ho
dfd37a4748 am 45738f67: Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread
Merge commit '45738f6700cff689eacda7c8192b76939ba20591' into gingerbread-plus-aosp

* commit '45738f6700cff689eacda7c8192b76939ba20591':
  Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
2010-10-12 17:40:47 -07:00
Justin Ho
45738f6700 Merge "Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)" into gingerbread 2010-10-12 17:38:44 -07:00
Justin Ho
a78c85482e Updated GPS on (hdpi and mdpi), text select handles (mdpi), removing unused text_select_handle.png (mdpi)
Change-Id: Ic7089d0277582506b745cfa73d1a7bb311c600a7
2010-10-12 17:29:06 -07:00
Adam Powell
2b87dbc3b8 am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread
Merge commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6' into gingerbread-plus-aosp

* commit 'c417612a1abb6281697a9738a1a19eb8814ae8a6':
  Fix bug 3083631 - Links no longer get tapped during scale gestures
2010-10-12 17:11:51 -07:00
Adam Powell
c417612a1a Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread 2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
adbda6f094 Bluez doesn't handle disconnect while connecting well.
Defer the message.

Bug: 3076404
Change-Id: Id62e1008346f492a85e714240a832a061def1786
2010-10-12 16:58:06 -07:00
Jaikumar Ganesh
79a5307ac2 am 1bc3a407: Merge "Fix auto connection priority handling." into gingerbread
Merge commit '1bc3a407ceb380e35e894f405f544b5b87e980d4' into gingerbread-plus-aosp

* commit '1bc3a407ceb380e35e894f405f544b5b87e980d4':
  Fix auto connection priority handling.
2010-10-12 16:50:45 -07:00
Jaikumar Ganesh
1bc3a407ce Merge "Fix auto connection priority handling." into gingerbread 2010-10-12 16:46:50 -07:00
Jaikumar Ganesh
bcf5cf47ed Fix auto connection priority handling.
Bug: 3027023
1. user is connected to a headset. Headset is turned off.
2. User connects to another device. The priority of the first
   headset must be set to ON. We only have 1 device set at AUTO_CONNECT
   priority.

1. A remote headset sends an incoming connection. Don't set
   AUTO_CONNECT till its gets connected.
2. For outgoing connections, set it to AUTO_CONNECT in Connecting state
   since the user initated this connection.

Change-Id: Iaa211bf22b1fd99850875f7eda686c47142173ba
2010-10-12 16:42:45 -07:00
Jeff Brown
7eb67fb440 am fa3d9557: Merge "Add text selection handles to preloaded drawables." into gingerbread
Merge commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551' into gingerbread-plus-aosp

* commit 'fa3d9557c8178e9c4b9471a76edcf4d48a5b3551':
  Add text selection handles to preloaded drawables.
2010-10-12 16:12:34 -07:00
Jeff Brown
fa3d9557c8 Merge "Add text selection handles to preloaded drawables." into gingerbread 2010-10-12 16:08:59 -07:00
Adam Powell
d7bd2eb032 Fix bug 3083631 - Links no longer get tapped during scale gestures
Change-Id: I57bf740c5063f30d763fc720a3ad77edff20f867
2010-10-12 15:56:31 -07:00
Jeff Brown
b0061549a2 Add text selection handles to preloaded drawables.
Change-Id: Iad48388ada7a555681290998f4cb6f8390aa05d4
2010-10-12 15:22:13 -07:00
Adam Powell
4af1de39ab am fb6431c0: Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread
Merge commit 'fb6431c0298747d240fcdc025575e5f46db95132' into gingerbread-plus-aosp

* commit 'fb6431c0298747d240fcdc025575e5f46db95132':
  Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
2010-10-12 15:03:29 -07:00
Adam Powell
fb6431c029 Merge "Fix bug 3064135 - do not allow text handles on TextViews in sub windows." into gingerbread 2010-10-12 15:00:30 -07:00
Joe Onorato
9a12a3c8d4 am ba799098: Merge changes I76513387,I335fb671 into gingerbread
Merge commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e' into gingerbread-plus-aosp

* commit 'ba799098608c7be8ff1e18adfa7dc1f452205a7e':
  Remove dead code, and make the animation a setting.
  turn off the electron beam
2010-10-12 14:46:23 -07:00
Adam Powell
8c8293bc4d Fix bug 3064135 - do not allow text handles on TextViews in sub windows.
Change-Id: I35db64d0a5c92c8ad184b36d243e45c91d4ac46e
2010-10-12 14:45:55 -07:00
Joe Onorato
ba79909860 Merge changes I76513387,I335fb671 into gingerbread
* changes:
  Remove dead code, and make the animation a setting.
  turn off the electron beam
2010-10-12 14:43:24 -07:00
Wink Saville
090ac9f7dd am a3100314: Merge "Remove some PII." into gingerbread
Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
  Remove some PII.
2010-10-12 14:21:10 -07:00
Joe Onorato
b08a1af667 Remove dead code, and make the animation a setting.
When we don't do the brightness fade, turn off the electron beam instead.

Change-Id: I76513387c4fb420a67e59e005f6e8c3bc72f7f08
2010-10-12 14:16:11 -07:00
Wink Saville
a42880749b Remove some PII.
Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
2010-10-12 12:36:38 -07:00
Leon Scroggins
00c50b2e49 am f348502c: Merge "Allow TextView to do its thing." into gingerbread
Merge commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59' into gingerbread-plus-aosp

* commit 'f348502c70ae2f3c90bf75d8c4b4402d5e8e4d59':
  Allow TextView to do its thing.
2010-10-12 11:23:12 -07:00
Leon Scroggins
f348502c70 Merge "Allow TextView to do its thing." into gingerbread 2010-10-12 10:24:48 -07:00
Brad Fitzpatrick
4711d21a55 am 9facd2d0: Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread
Merge commit '9facd2d0847691ae46108713d6a7dc9f51a62135' into gingerbread-plus-aosp

* commit '9facd2d0847691ae46108713d6a7dc9f51a62135':
  StrictMode: link to designing for responsiveness ANR docs
2010-10-12 08:23:40 -07:00
Brad Fitzpatrick
9facd2d084 Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread 2010-10-12 08:09:55 -07:00
Leon Scroggins
23cb86a47d Allow TextView to do its thing.
Bug:3085639

Call super.onTouchEvent for ACTION_UP and ACTION_CANCEL.
This removes the old selection as appropriate.

Bug:3085587

Make the cursor visible so that the insertion handle
appears when tapping on the field.

Change-Id: If5ea6219de9ca351667021743b2e63edc6c47250
2010-10-12 09:52:56 -04:00
Chung-yih Wang
b99db0c70e am 4367ab00: Set the wifi-only for SIP service as the default config.
Merge commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551' into gingerbread-plus-aosp

* commit '4367ab00edb59f95703e4a8a0f9a1a73dbf13551':
  Set the wifi-only for SIP service as the default config.
2010-10-11 21:49:26 -07:00
Chung-yih Wang
4367ab00ed Set the wifi-only for SIP service as the default config.
Change-Id: I90d2d14b5d9c953e45f85d3d5128d096ea17b22e
bug-id: http://b/3068006
2010-10-12 12:39:50 +08:00
Dianne Hackborn
a007ab294d am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread
Merge commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83' into gingerbread-plus-aosp

* commit 'ffbc4b948d0214c28df382f9eb209ea8f5ceef83':
  Fix SD card mounting issues #3074555 and #3072332
2010-10-11 19:17:05 -07:00
Dianne Hackborn
ffbc4b948d Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread 2010-10-11 19:13:33 -07:00
Dianne Hackborn
d39d515b91 Fix SD card mounting issues #3074555 and #3072332
Change-Id: I79572bb4e92d2546abd97512a119ae74f0d72019
3074555: Kill "Shared storage safe to remove" notification
3072332: "blank shared storage" notification doesn't go anywhere
2010-10-11 19:12:21 -07:00
Kenny Root
8bb7a1dfbb am b4de3dca: Merge "OBB: rearrange to be entirely asynchronous" into gingerbread
Merge commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45' into gingerbread-plus-aosp

* commit 'b4de3dca96b9ff18562062e181dcd8b83e641e45':
  OBB: rearrange to be entirely asynchronous
2010-10-11 17:31:06 -07:00
Jeff Brown
f2e0681ada am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp

* commit '1da8d4d1697cec871dea8c30dad67e90db10bde6':
  Fix an event injection bug when the policy is bypassed.
2010-10-11 17:26:51 -07:00
Kenny Root
b4de3dca96 Merge "OBB: rearrange to be entirely asynchronous" into gingerbread 2010-10-11 17:24:54 -07:00
Kenny Root
af9d667ccf OBB: rearrange to be entirely asynchronous
Rearrange structure of MountService handling of OBBs to be entirely
asynchronous so we don't rely on locking as much. We still need the
locking to support dumpsys which has been improved to output all the
data structures for OBBs.

Added more tests to cover more of the error return codes.

Oh and fix a logic inversion bug.

Change-Id: I34f541192dbbb1903b24825889b8fa8f43e6e2a9
2010-10-11 17:22:03 -07:00
Jeff Brown
1da8d4d169 Merge "Fix an event injection bug when the policy is bypassed." into gingerbread 2010-10-11 16:27:36 -07:00
Jeff Brown
b931a1b418 Fix an event injection bug when the policy is bypassed.
Added the concept of a "trusted" event to distinguish between events from
attached input devices or trusted injectors vs. other applications.
This change enables us to move certain policy decisions out of the
dispatcher and into the policy itself where they can be handled more
systematically.

Change-Id: I4d56fdcdd31aaa675d452088af39a70c4e039970
2010-10-11 16:26:13 -07:00
Joe Onorato
14854820ea am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3' into gingerbread-plus-aosp

* commit 'c0ad216c8ebc74b59074a7538533605eebfd65c3':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-11 15:22:30 -07:00
Joe Onorato
6d74765662 Add a configuration option to turn on the screen when you unplug the device.
Bug: 3068624
Change-Id: I7366ece2528b31feee920f4600a475e81a0f3709
2010-10-11 15:16:28 -07:00
Brad Fitzpatrick
9fc2fc5757 StrictMode: link to designing for responsiveness ANR docs
Change-Id: If65849aaa8317e7e40b2837b640a5cdb95fe7b0e
2010-10-11 13:17:48 -07:00
Brad Fitzpatrick
3a4b7dfdda am 5804b4fd: Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread
Merge commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0' into gingerbread-plus-aosp

* commit '5804b4fd47bbeda55d12bd7dd6ae3bde72fb40a0':
  StrictMode: check max-offenses-per-loop earlier, before allocations
2010-10-11 12:05:14 -07:00
Brad Fitzpatrick
5804b4fd47 Merge "StrictMode: check max-offenses-per-loop earlier, before allocations" into gingerbread 2010-10-11 11:56:40 -07:00
Brad Fitzpatrick
191cdf023c StrictMode: check max-offenses-per-loop earlier, before allocations
Previously a tight loop of StrictMode violations would still allocate
Exception objects and populate their stack frames, just to orphan them
later when checking the max-10-violations-per-loop constraint.

With this patch, we do that check _before_ allocating any memory.

Change-Id: Iae96aba33f8fcc6a8ec5838a231aecc08e95122d
2010-10-11 11:31:15 -07:00
Jean-Baptiste Queru
e69f1f1a74 resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
2010-10-11 09:38:10 -07:00
Jean-Baptiste Queru
e3cfd35bf4 Merge "Dismissing AlertDialog before destroying WebView." 2010-10-11 09:15:50 -07:00
Jean-Baptiste Queru
c43189e769 am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep"
Merge commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c' into gingerbread-plus-aosp

* commit '2aaa1ce1768d3425c07e55d43aaa400282424f8c':
  Hold partial wakelock during shutdown to avoid entering sleep
2010-10-10 18:51:43 -07:00