Dianne Hackborn
24070fb9e4
am a007ab29: am ffbc4b94: Merge "Fix SD card mounting issues #3074555 and #3072332 " into gingerbread
...
Merge commit 'a007ab294d83db987b05b49ab869566978a87494'
* commit 'a007ab294d83db987b05b49ab869566978a87494':
Fix SD card mounting issues #3074555 and #3072332
2010-10-13 17:01:17 -07:00
Daniel Sandler
e5e4a308ac
Merge "Dynamically show the menu button on the system bar."
2010-10-13 16:32:07 -07:00
Erik
46958be804
Merge "Adds a way to scroll to a position in a given duration"
2010-10-13 16:03:21 -07:00
Kenny Root
abd52cc87c
am c3041432: am de846ac6: Merge "Change to new binder implementation for OBB" into gingerbread
...
Merge commit 'c30414329c381afba7bd23bdd0f1237fad0850a6'
* commit 'c30414329c381afba7bd23bdd0f1237fad0850a6':
Change to new binder implementation for OBB
2010-10-13 15:58:59 -07:00
Kenny Root
b04069b06a
resolved conflicts for merge of 8bb7a1df to master
...
Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9
2010-10-13 15:43:51 -07:00
Jason Sams
656ef8daca
Merge "Begin hooking up SurfaceConfig."
2010-10-13 15:33:00 -07:00
Romain Guy
488a9c36ee
Merge "Add a getNativeMatrix() API."
2010-10-13 14:18:18 -07:00
Irfan Sheriff
30a00e6a03
Merge "state machine fixes"
2010-10-13 13:55:39 -07:00
Amith Yamasani
45b26832c6
Merge "Add voice button and a bunch of minor fixes for focus and visibility of ime, submit button and drop down."
2010-10-13 13:19:28 -07:00
Joe Onorato
2441ca615b
am 0ad4a77c: (-s ours) am 1169f420: Merge "Add animation for the status bar going away." into gingerbread
...
Merge commit '0ad4a77cb78348951c349ba92ec858bfb26aeb33'
* commit '0ad4a77cb78348951c349ba92ec858bfb26aeb33':
Add animation for the status bar going away.
2010-10-13 12:13:28 -07:00
Irfan Sheriff
697127a696
Merge "Retry quicker for control channel setup"
2010-10-13 10:15:43 -07:00
Alex Sakhartchouk
9f73d8bbc6
Merge "Packing the struct to work around llvm bug."
2010-10-13 10:11:02 -07:00
Bjorn Bringert
1670393563
Merge "Make fields in WebAddress private, add getters/setters"
2010-10-13 08:31:48 -07:00
Mike Lockwood
08fa659cc4
am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
...
Merge commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e' into gingerbread-plus-aosp
* commit 'c792c2e9edb3c785208560b6961ac6ed5b07eb4e':
GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue
2010-10-13 05:52:51 -07:00
Mike Lockwood
91a2e55166
Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread
2010-10-13 05:46:15 -07:00
Ben Murdoch
40ca2cb9a5
Merge "Sync autofill profile data to native WebKit"
2010-10-13 04:47:21 -07:00
Steve Block
0670e7b4de
Merge "Implement DeviceMotionEvent"
2010-10-13 04:18:37 -07:00
Justin Ho
a8003e8afc
am e03471e1: Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
...
Merge commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5' into gingerbread-plus-aosp
* commit 'e03471e12f1adcd818b5bfd9dcb894c75fe955c5':
Updated popup_ 9 patches and removing text_select_handle (hdpi)
2010-10-12 20:32:56 -07:00
Justin Ho
137ef22cef
Merge "Updated popup_ 9 patches and removing text_select_handle (hdpi)" into gingerbread
2010-10-12 20:30:36 -07:00
Justin Ho
e867b1c1ef
am 33bae9b8: Updated lockscreen asset (Hiroshi), new menu background
...
Merge commit '33bae9b826145677585a2171f4986d4c6433fd0d' into gingerbread-plus-aosp
* commit '33bae9b826145677585a2171f4986d4c6433fd0d':
Updated lockscreen asset (Hiroshi), new menu background
2010-10-12 20:24:37 -07:00
Hung-ying Tyan
d516490fcb
am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
...
Merge commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64' into gingerbread-plus-aosp
* commit 'f1b1eec9de1ca27b660f6c00487de07a30eecf64':
SipService: mScreenOn is flipped to wrong value.
2010-10-12 19:46:14 -07:00
Hung-ying Tyan
7daf32433a
Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread
2010-10-12 19:44:17 -07:00
Nick Pelly
3b0bf69242
am ab39f1ef: Merge "Fix build." into gingerbread
...
Merge commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831' into gingerbread-plus-aosp
* commit 'ab39f1ef13a546e38b49bfc02dca2ec771c13831':
Fix build.
2010-10-12 19:25:57 -07:00
Nick Pelly
9bf9f7a444
Merge "Fix build." into gingerbread
2010-10-12 19:23:13 -07:00
Dianne Hackborn
1fe33e2c77
am 259c8499: Merge "Fix issue #3089800 : adb shell am -W causes ActivityManager crash" into gingerbread
...
Merge commit '259c849989ccd30b0bb4569d11f125ed2c0c1911' into gingerbread-plus-aosp
* commit '259c849989ccd30b0bb4569d11f125ed2c0c1911':
Fix issue #3089800 : adb shell am -W causes ActivityManager crash
2010-10-12 19:08:49 -07:00
Dianne Hackborn
f0908a156c
Merge "Fix issue #3089800 : adb shell am -W causes ActivityManager crash" into gingerbread
2010-10-12 19:06:37 -07:00
Jaikumar Ganesh
fd6b7eec66
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
1f5843c4d2
Merge "Bluez doesn't handle disconnect while connecting well. Defer the message." into gingerbread
2010-10-12 19:02:46 -07:00
Nick Pelly
ae9dfe8fe7
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
Adam Powell
db472e3369
Merge "Holo fixes and refinements"
2010-10-12 18:49:08 -07:00
Romain Guy
48ea2ae901
Merge "Optimize layer clears."
2010-10-12 18:44:18 -07:00
Gil Dobjanschi
272f704c1f
Merge "Test implementation bug fix."
2010-10-12 18:34:03 -07:00
Winson Chung
876aeabf16
Merge "Extracting default loading view definition into XML resource."
2010-10-12 18:25:25 -07:00
Jeff Brown
afa0ccd368
Merge "resolved conflicts for merge of f2e0681a to master"
2010-10-12 18:20:26 -07:00
Romain Guy
b64b6f067c
Merge "Tweak layers caching for better performance in Launcher."
2010-10-12 18:20:06 -07:00
Jeff Brown
26dbf44c66
resolved conflicts for merge of f2e0681a to master
...
Change-Id: I5ba9b1f16a29f73444123bcead4c53f09a79b0f6
2010-10-12 18:19:08 -07:00
Joe Onorato
08d795291c
am d965724f: (-s ours) am 44104df1: Merge "Fix status bar flashing after orientation change" into gingerbread
...
Merge commit 'd965724fdcc63a070657518542559a8b1a35a70d'
* commit 'd965724fdcc63a070657518542559a8b1a35a70d':
Fix status bar flashing after orientation change
2010-10-12 18:05:09 -07:00
Romain Guy
4a77cb6bde
Merge "Remove logging."
2010-10-12 17:50:32 -07:00
Chris Tate
f819d7a2a9
Merge "Don't stomp on the drag-focus bookkeeping inadvertently."
2010-10-12 17:42:15 -07:00
Justin Ho
5511fed2a4
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
c2dc99c3ca
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
7225fff288
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
3874b18c1d
Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread
2010-10-12 17:33:27 -07:00
Adam Powell
d3b93334e8
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
308ddf283c
Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread
2010-10-12 17:08:43 -07:00
Jaikumar Ganesh
d3a7abfb57
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
6cd9eff46d
Merge "Fix auto connection priority handling." into gingerbread
2010-10-12 16:46:50 -07:00
Kenny Root
5fc97fe955
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
c64ef759ac
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
8cbb1e7af4
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