Commit Graph

38903 Commits

Author SHA1 Message Date
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
Chris Tate
048691cfac Don't stomp on the drag-focus bookkeeping inadvertently.
Also don't update the focus tracking redundantly.
Fixes bug 3076468

Change-Id: I021e1bb91134d5226735d9510ad7f9a7b650f93f
2010-10-12 17:39:18 -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
Hung-ying Tyan
06e559779e am 907f6f1d: Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread
Merge commit '907f6f1d7d13531015b545861b93e1607d253cfd' into gingerbread-plus-aosp

* commit '907f6f1d7d13531015b545861b93e1607d253cfd':
  Fix SipSessionGroup from throwing ConcurrentModificationException
2010-10-12 17:37:38 -07:00
Hung-ying Tyan
907f6f1d7d Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread 2010-10-12 17:33:27 -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
Scott Main
5249ad0345 docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage
bug: 3088494

Change-Id: I9da318efb3d05d52eb8c2677e96da1bcf1cd542a
2010-10-12 17:10:31 -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
Irfan Sheriff
68825ac32d state machine fixes
- When supplicant dies, restart it
- When wifimonitor fails to connect in time, restart
  supplicant
- fix dhcp counter reset
- defer all load/unload actions when waiting for supplicant
  control connection
- we dont need to disconnect & reconnect at start with the
  faster monitor connection and handling of failures

Bug: 2973023
Bug: 3090725
Change-Id: I5c834ddd08e6300e2b29da0941a24633825b4d3b
2010-10-12 16:47:51 -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
Kenny Root
ab275bb637 am 1c67b7af: am a4e95dfe: Merge "Grant URI permissions to the MCS" into gingerbread
Merge commit '1c67b7af0147080de807db3cc564899db85b43a8'

* commit '1c67b7af0147080de807db3cc564899db85b43a8':
  Grant URI permissions to the MCS
2010-10-12 16:40:47 -07:00
Jean-Baptiste Queru
77b9c89f83 am cf88cf87: (-s ours) am 15f7ff3c: Merge "Fix compile errors in telephony tests"
Merge commit 'cf88cf878be96a564b38f428c161cc864dfad56d'

* commit 'cf88cf878be96a564b38f428c161cc864dfad56d':
  Fix compile errors in telephony tests
2010-10-12 16:37:44 -07:00
Joe Onorato
c88a1f955c am 14854820: am c0ad216c: Merge "Add a configuration option to turn on the screen when you unplug the device." into gingerbread
Merge commit '14854820eac895a925791fb41ccd330447fd4f02'

* commit '14854820eac895a925791fb41ccd330447fd4f02':
  Add a configuration option to turn on the screen when you unplug the device.
2010-10-12 16:27:22 -07:00
Scott Main
5e850b70dc am ad9a559c: (-s ours) am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit 'ad9a559c611a2901a490c887f03d9622695beba2'

* commit 'ad9a559c611a2901a490c887f03d9622695beba2':
  Revert "docs: new web apps dev guides" Do not merge.
2010-10-12 16:26:53 -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
Andreas Huber
9adf466021 Support for writing to MPEG2 transport stream files.
Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
2010-10-12 16:05:23 -07:00
Romain Guy
84349e3ef7 Merge "Optimize 9patch rendering." 2010-10-12 16:01:41 -07:00
Romain Guy
4bb942083a Optimize 9patch rendering.
This change detects empty quads in 9patches and removes them from
the mesh to avoid unnecessary blending.

Change-Id: I4500566fb4cb6845d64dcb59b522c0be7a0ec704
2010-10-12 15:59:26 -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
Gil Dobjanschi
e2c28468a5 Test implementation bug fix.
Change-Id: I1448d06662e2538f01d9c462d4a86fcbf57d7125
2010-10-12 15:55:14 -07:00
Axel Haslam
49016d6cd7 BatteryService: Set bool to true if sysfs entry is not 0
For the musb to recognized as online, the musbOnline value
has to be set. The battery driver sets the online property
of the sysfs as "3" when the charger type is USB.

The way the current code is, if the value is not 1,
musbOnline would be false and the menu to mount the
sdcard on the pc would not pop-up.

Since the linux driver returns 0 if the cable is not
connected, and 3 if the cable is connected, we should
set the boolean variable to 0 only if the sysfs value
is 0, otherwise we set it to true.

Change-Id: I538d8de446e7ea4f620ffcce156a57cf56b5a4e5
Signed-off-by: Axel Haslam <axelhaslam@ti.com>
2010-10-12 17:32:26 -05:00
Andy Stadler
8a703c772e am 8e2be267: Add versionCode and versionName to dumpsys packages
Merge commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58' into gingerbread-plus-aosp

* commit '8e2be267f53bd1d2f1531f56732ead4138ac5c58':
  Add versionCode and versionName to dumpsys packages
2010-10-12 15:25:34 -07:00
Jeff Brown
b0061549a2 Add text selection handles to preloaded drawables.
Change-Id: Iad48388ada7a555681290998f4cb6f8390aa05d4
2010-10-12 15:22:13 -07:00
Andy Stadler
8e2be267f5 Add versionCode and versionName to dumpsys packages
bug: 3090491
Change-Id: If116baaeb83bd282c5c5534fde6248f19830a71c
2010-10-12 15:05:06 -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
Irfan Sheriff
a9c2ef8464 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
e22eb863dc Merge "fix start driver for corner cases DO NOT MERGE" into gingerbread 2010-10-12 14:55:52 -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
Joe Malin
9c61f8fc01 DOC CHANGE: Fix bug in Testing doc
Change-Id: Id432a40adfb6aef05a3e7c19425de54cb8a5f610
2010-10-12 14:36:59 -07:00
Andreas Huber
54d09724e3 HTTP Live content that are tagged as complete are now seekable.
Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde
related-to-bug: 2368598
2010-10-12 14:32:10 -07:00
Chris Tate
b8203e9718 Pass the starting touch point in the DRAG_STARTED message
Fixes bug 3089251

Change-Id: I072742dc6c5745083cdac8dcfa19fb1f2bbbf404
2010-10-12 14:23:21 -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
Dirk Dougherty
d555e2643f 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
Alex Sakhartchouk
2bc063fdb6 Merge "Fixing font bug, initialization was done in the wrong order." 2010-10-12 14:17:59 -07:00
Wink Saville
a310031438 Merge "Remove some PII." into gingerbread 2010-10-12 14:17:00 -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
Mathias Agopian
aab758e879 turn off the electron beam
Change-Id: I335fb6719f1d5a3f1c6f37a046fd1c2c4ed2bbc6
2010-10-12 14:16:11 -07:00
Dirk Dougherty
354954a01c Merge "Doc change: cherrypick testing changes from master. Squashed commit of the following:" into gingerbread 2010-10-12 14:16:05 -07:00
Alex Sakhartchouk
960ae15cf3 Fixing font bug, initialization was done in the wrong order.
Change-Id: Icc7b932f25be1ca6e5423bba6a5cfc965f6c3341
2010-10-12 14:15:17 -07:00
Chris Tate
5a3b8e698e Merge "Elide undelivered drag-location messages" 2010-10-12 14:05:14 -07:00
Chris Tate
1ab5de7f21 am a75803e9: am 0a789236: Merge "Temporarily turn on backup/restore debug logs" into gingerbread
Merge commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2'

* commit 'a75803e9502a5687d825d7ff8f62ec70b540a3c2':
  Temporarily turn on backup/restore debug logs
2010-10-12 13:57:20 -07:00
Mathias Agopian
ef31d7d00e am 5d477279: am cf6b2765: Merge "fix a bug where FLIP_H would do a 180 rotation" into gingerbread
Merge commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78'

* commit '5d477279e6e41c9d61abe66dcded5c57a51e2c78':
  fix a bug where FLIP_H would do a 180 rotation
2010-10-12 13:57:09 -07:00