Commit Graph

19205 Commits

Author SHA1 Message Date
Irfan Sheriff
38f3f5cd6e am e22eb863: Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread
Merge commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902' into gingerbread-plus-aosp

* commit 'e22eb863dc4419dcaf329e9e28e3dc1f71f82902':
  fix start driver for corner cases DO NOT MERGE
2010-10-12 14:59:20 -07:00
Irfan Sheriff
b7768f0fa5 Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 2010-10-12 14:55:52 -07:00
Joe Onorato
296b1d7764 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
Joe Onorato
08f64b9e27 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
27813b0a6b 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
Dirk Dougherty
4187865cf2 am 354954a0: Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread
Merge commit '354954a01c533c6789536c141cf330ddf3976e8b' into gingerbread-plus-aosp

* commit '354954a01c533c6789536c141cf330ddf3976e8b':
  Doc change: cherrypick testing changes from master. Squashed commit of the following:
2010-10-12 14:18:33 -07:00
Wink Saville
e5865c7c4c Merge "Remove some PII." into gingerbread 2010-10-12 14:17:00 -07:00
Mathias Agopian
59119e658a turn off the electron beam
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
2010-10-12 14:16:11 -07:00
Dirk Dougherty
05a1326c74 Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 2010-10-12 14:16:05 -07:00
John Wang
b6be8d662f am 844a6b3c: Turn off additional debug.
Merge commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp

* commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
  Turn off additional debug.
2010-10-12 11:55:31 -07:00
Leon Scroggins
80e3b896cc 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
3c8e66f9a4 Merge "Allow TextView to do its thing." into gingerbread 2010-10-12 10:24:48 -07:00
Brad Fitzpatrick
d87b1d92c1 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
ced4db017b Merge "StrictMode: link to designing for responsiveness ANR docs" into gingerbread 2010-10-12 08:09:55 -07:00
Jeff Brown
a2e536081e am 03aa28fb: Merge "Improve the input policy handling a bit." into gingerbread
Merge commit '03aa28fb36589a3d601be08e75c08a24c4344d6f' into gingerbread-plus-aosp

* commit '03aa28fb36589a3d601be08e75c08a24c4344d6f':
  Improve the input policy handling a bit.
2010-10-12 01:04:16 -07:00
Jeff Brown
9b0ab927e1 Merge "Improve the input policy handling a bit." into gingerbread 2010-10-12 01:01:14 -07:00
Jeff Brown
a8ed856a8a Improve the input policy handling a bit.
Fixed some issues with Monkeys turning off their own screens.  Ook ook!
Added some more comments to explain what's going on.

Change-Id: Id2bc0466161a642a73ef7ef97725d1c81e984b12
2010-10-12 00:16:14 -07:00
Chung-yih Wang
da21986003 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
Hung-ying Tyan
a13db9e61a am f5201ab7: Keep original phone number in SipConnection.
Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp

* commit 'f5201ab71ff4d104265ab126e86afc6b81da8011':
  Keep original phone number in SipConnection.
2010-10-11 20:55:56 -07:00
Jeff Brown
f0810cf085 am a28d5aff: Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread
Merge commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff' into gingerbread-plus-aosp

* commit 'a28d5aff5466a55149b9e6f9cd908fcc225c25ff':
  Fix a bug synthesizing cancelation events for motions.
2010-10-11 20:24:38 -07:00
Jeff Brown
3d3429e631 Merge "Fix a bug synthesizing cancelation events for motions." into gingerbread 2010-10-11 20:22:02 -07:00
Hung-ying Tyan
a357543d84 am ece7e11b: Merge "SipService: fix a missing switch-case break." into gingerbread
Merge commit 'ece7e11b3723140b31d28bae6ed6f1ae30e5d802' into gingerbread-plus-aosp

* commit 'ece7e11b3723140b31d28bae6ed6f1ae30e5d802':
  SipService: fix a missing switch-case break.
2010-10-11 20:04:28 -07:00
Hung-ying Tyan
e4081fec39 Merge "SipService: fix a missing switch-case break." into gingerbread 2010-10-11 20:02:05 -07:00
Dianne Hackborn
90fbd78943 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
c8b3e251c4 Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread 2010-10-11 19:13:33 -07:00
Jeff Brown
316237d554 Fix a bug synthesizing cancelation events for motions.
Change-Id: I881c0fa16c1d22c4b1b6cca24deb0105405ff5b0
2010-10-11 18:22:53 -07:00
Kenny Root
57eebe5a43 am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread
Merge commit 'de846ac659e8c14d898a3fa14bd0504b24096057' into gingerbread-plus-aosp

* commit 'de846ac659e8c14d898a3fa14bd0504b24096057':
  Change to new binder implementation for OBB
2010-10-11 17:43:05 -07:00
Kenny Root
abcb347783 Merge "Change to new binder implementation for OBB" into gingerbread 2010-10-11 17:40:53 -07:00
Kenny Root
f449d0d93d 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
Joe Onorato
437455fed5 am 1169f420: Merge "Add animation for the status bar going away." into gingerbread
Merge commit '1169f420f6df5cf5254fed883efa7e6780473c08' into gingerbread-plus-aosp

* commit '1169f420f6df5cf5254fed883efa7e6780473c08':
  Add animation for the status bar going away.
2010-10-11 17:26:59 -07:00
Jeff Brown
76deae7437 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
Joe Onorato
082299a7b1 am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread
Merge commit '44104df10660c711129fd263364afc2174f40ac2' into gingerbread-plus-aosp

* commit '44104df10660c711129fd263364afc2174f40ac2':
  Fix status bar flashing after orientation change
2010-10-11 17:26:38 -07:00
Kenny Root
27343ca1e3 am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
Merge commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e' into gingerbread-plus-aosp

* commit 'a4e95dfea4f3635d6cb845873fce0566c20cc88e':
  Grant URI permissions to the MCS
2010-10-11 17:26:07 -07:00
Kenny Root
758753c876 Merge "OBB: rearrange to be entirely asynchronous" into gingerbread 2010-10-11 17:24:54 -07:00
Joe Onorato
aa162c39ac Merge "Add animation for the status bar going away." into gingerbread 2010-10-11 16:37:41 -07:00
Jeff Brown
b6af9cc212 Merge "Fix an event injection bug when the policy is bypassed." into gingerbread 2010-10-11 16:27:36 -07:00
Joe Onorato
05cd45cab6 Merge "Fix status bar flashing after orientation change" into gingerbread 2010-10-11 16:26:36 -07:00
Jeff Brown
1fe6dec097 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
Kenny Root
86284d2965 Merge "Grant URI permissions to the MCS" into gingerbread 2010-10-11 15:49:30 -07:00
Joe Onorato
1ad3f53d7c Merge "Fix sometimes mExpandedView will appear while screen transforming." 2010-10-11 15:44:14 -07:00
Jean-Baptiste Queru
6bdd529440 am 15f7ff3c: Merge "Fix compile errors in telephony tests"
Merge commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f' into gingerbread-plus-aosp

* commit '15f7ff3c5a0a99f75b6c0babdc1d44e4b8aab39f':
  Fix compile errors in telephony tests
2010-10-11 15:32:12 -07:00
Joe Onorato
0864f77aa3 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
eaa166e233 Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread 2010-10-11 15:19:47 -07:00
Scott Main
d71f246ca4 am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp

* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
  Revert "docs: new web apps dev guides" Do not merge.
2010-10-11 15:15:09 -07:00
Jean-Baptiste Queru
956ae0d90e Merge "Fix compile errors in telephony tests" 2010-10-11 15:11:59 -07:00
Scott Main
a2e686914d am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3fd40ee692ed1d4bca40e184119b0d1368671037' into gingerbread

* commit '3fd40ee692ed1d4bca40e184119b0d1368671037':
  Revert "docs: new web apps dev guides" Do not merge.
2010-10-11 15:04:20 -07:00
Chris Tate
ae275c583d am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Merge commit '0a7892367f46e3653e9857195ec19356f848b7f8' into gingerbread-plus-aosp

* commit '0a7892367f46e3653e9857195ec19356f848b7f8':
  Temporarily turn on backup/restore debug logs
2010-10-11 14:45:22 -07:00
Chris Tate
966ae9392d Merge "Temporarily turn on backup/restore debug logs" into gingerbread 2010-10-11 14:42:00 -07:00
Mathias Agopian
c6f607dcdd am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Merge commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b' into gingerbread-plus-aosp

* commit 'cf6b2765ae7ea6305754e253264012b8f0498f7b':
  fix a bug where FLIP_H would do a 180 rotation
2010-10-11 14:40:02 -07:00
Mathias Agopian
20f29b4a2a Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread 2010-10-11 14:37:57 -07:00