Dirk Dougherty
db01bf12dc
am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
...
Merge commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp
* commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a':
SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
2010-01-22 16:49:57 -08:00
Dirk Dougherty
79643e1692
Merge "SDK doc change: Misc small fixes." into eclair
2010-01-22 16:45:58 -08:00
Dirk Dougherty
770a2991ab
Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
2010-01-22 16:38:59 -08:00
Chih-Chung Chang
5994a330ac
Add support for 180/270 degrees rotation.
2010-01-22 16:30:39 -08:00
Kenny Root
830bf2e81a
Merge "Multiple asset adding in one shot for AssetManager"
2010-01-22 15:54:11 -08:00
Dianne Hackborn
25e77b334f
am 678e66a4: Merge "Fix issue #2391429 : Crash during boot if fwd locked app is incompletely installed" into eclair
...
Merge commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2' into eclair-plus-aosp
* commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2':
Fix issue #2391429 : Crash during boot if fwd locked app is incompletely installed
2010-01-22 15:51:02 -08:00
Dianne Hackborn
29513890e3
Merge "Fix issue #2391429 : Crash during boot if fwd locked app is incompletely installed" into eclair
2010-01-22 15:47:08 -08:00
Romain Guy
d498f8a714
Merge "Make dialogs look better when their content is small."
2010-01-22 15:33:07 -08:00
Dan Egnor
45119fd323
Merge "As requested, expand ANR event log entry (and crash/WTF too) to include process flags (including FLAG_SYSTEM, etc)."
2010-01-22 15:24:17 -08:00
San Mehat
c58e431e36
Merge "NetworkManagementService: Introduce API methods for configuring interfaces"
2010-01-22 15:20:18 -08:00
San Mehat
a8f8795825
Merge "android.net: Introduce @hidden parcelable InterfaceConfiguration class"
2010-01-22 15:20:10 -08:00
Andreas Huber
8186a026d5
Merge "Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash."
2010-01-22 14:51:28 -08:00
Doug Zongker
70567adcee
Merge "remove GoogleLoginService unit test"
2010-01-22 14:30:02 -08:00
Dirk Dougherty
9c64b7d8da
am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
...
Merge commit '5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp
* commit '5d14cb34c0e9760340c15ac5faf2d76a64797117':
doc change: add announce for developer lab at mwc. move adc to carousel.
2010-01-22 14:28:05 -08:00
Dirk Dougherty
a2fa14097b
Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
2010-01-22 14:23:39 -08:00
John Wang
e390ac7b9f
am 098295a5: Merge "Updated emergency string when locale changes." into eclair
...
Merge commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0' into eclair-plus-aosp
* commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0':
Updated emergency string when locale changes.
2010-01-22 13:20:25 -08:00
Grace Kloba
9b65699d11
am 5ff24d5d: DO NOT MERGE
...
Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp
* commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d':
DO NOT MERGE
2010-01-22 13:17:52 -08:00
John Wang
0ac75bfa33
Merge "Updated emergency string when locale changes." into eclair
2010-01-22 13:17:25 -08:00
Xavier Ducrohet
4fd54a2d65
am 3bd6dc65: am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
...
Merge commit '3bd6dc653521281db25df77f055b3ec0b4659454'
* commit '3bd6dc653521281db25df77f055b3ec0b4659454':
ADT/Layoutlib: implement sweep gradient.
2010-01-22 12:36:26 -08:00
Scott Main
e05066b879
am 382f924c: am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file
...
Merge commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4'
* commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4':
docs: a lot of revision and expansion of the hello view tutorials
2010-01-22 12:00:42 -08:00
Adam Powell
eac3a68b17
am 97b10853: am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
...
Merge commit '97b108532f04f72af035e372be7b827f77888650'
* commit '97b108532f04f72af035e372be7b827f77888650':
Edge of screen slop detection for ScaleGestureDetector.
2010-01-22 12:00:24 -08:00
Scott Main
d18ccd6a01
am 5ed68156: am de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
...
Merge commit '5ed681561c5904eb55a275387f1df8cec401361c'
* commit '5ed681561c5904eb55a275387f1df8cec401361c':
docs: add a section about debugging web pages with the Console APIs;
2010-01-22 12:00:00 -08:00
Dianne Hackborn
8aa68dc935
am 5f641285: am b1c4a2a3: Fix issue #2364506 : Phone locked up while listening to music and attempting to download an update
...
Merge commit '5f64128568d815f91dcd37db43d4e26a0566b41c'
* commit '5f64128568d815f91dcd37db43d4e26a0566b41c':
Fix issue #2364506 : Phone locked up while listening to music and attempting to download an update
2010-01-22 11:59:41 -08:00
Mathias Agopian
519f29f5d8
Merge "return an error when Surface::lock() is called while the surface is already locked."
2010-01-22 11:52:08 -08:00
Mathias Agopian
9014726d89
return an error when Surface::lock() is called while the surface is already locked.
2010-01-22 11:47:55 -08:00
Andy McFadden
3983e26292
Merge "Move VM feature strings (used by DDMS) into VM."
2010-01-22 11:32:52 -08:00
Ken Shirriff
9ecddd62a2
Merge "Remove unused providers"
2010-01-22 11:14:43 -08:00
Romain Guy
74f561d0d8
Merge "Bring back buttons in dialogs. Bug #2390537 "
2010-01-22 11:01:42 -08:00
Eric Laurent
422068ab92
am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
...
Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp
* commit 'a59551bade6a7b0c916c277f044de79c6af1bd22':
Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.
2010-01-22 10:25:00 -08:00
John Wang
9a6a4486c3
am 08cb0024: Handle emergency calls only status in ServiceStateTracker.
...
Merge commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8' into eclair-plus-aosp
* commit '08cb0024026e0f42612ab569e1e4067d5ede3bf8':
Handle emergency calls only status in ServiceStateTracker.
2010-01-22 10:24:47 -08:00
Eric Laurent
17739fe712
Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair
2010-01-22 10:14:26 -08:00
Xavier Ducrohet
d6d3f143a9
am 60e3c09e: am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair
...
Merge commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7'
* commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7':
ADT/Layoutlib: implement radial gradient.
2010-01-22 09:45:49 -08:00
Ying Wang
e1612fa894
am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair
...
Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'
* commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c':
Add instrumentation as a source tag for proguard keep options.
2010-01-22 09:45:31 -08:00
Guang Zhu
a4122d95f7
am e0aed796: am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
...
Merge commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0'
* commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0':
Prevent orientation change from triggering activity recreation.
2010-01-22 09:44:34 -08:00
Amith Yamasani
d2dd0e25aa
am 658dc0d4: am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
...
Merge commit '658dc0d4b03015eb4a692968b82b664e24aa605a'
* commit '658dc0d4b03015eb4a692968b82b664e24aa605a':
Security fix in accessibility - don't read out password. # 2371557
2010-01-22 09:44:16 -08:00
Scott Main
aa354255d5
am d603e989: am 88e653f6: Merge "docs: some spelling typos" into eclair
...
Merge commit 'd603e989f47093ad9f7638bd3f62717daa731fd5'
* commit 'd603e989f47093ad9f7638bd3f62717daa731fd5':
docs: some spelling typos
2010-01-22 09:43:56 -08:00
Marco Nelissen
32f6863e21
Merge "Make the media scanner disregard database entries that do not have absolute path names. This allows us to store other things (perhaps with http or content URIs) in the database, without the media scanner removing them again."
2010-01-22 07:53:12 -08:00
Chih-Chung Chang
52e7200b6e
Add an orientation parameter for overlay, so we can do camera preview in portrait mode.
2010-01-21 20:20:08 -08:00
Romain Guy
d28d5be75b
Merge "Add a new attribute to LinearLayout: useLargestChild. Bug #2379138 "
2010-01-21 19:11:20 -08:00
Grace Kloba
59b4cfc4b3
am 76c29e63: (-s ours) am f167c4bf: DO NOT MERGE
...
Merge commit '76c29e633fd924e0f98f34768999abb991753394'
* commit '76c29e633fd924e0f98f34768999abb991753394':
DO NOT MERGE
2010-01-21 17:57:51 -08:00
Grace Kloba
9dd486267f
am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE
...
Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7'
* commit 'b869c594465d29e96fb841b48c638ddee232bbd7':
DO NOT MERGE
2010-01-21 17:57:29 -08:00
Grace Kloba
90713bcfdb
am 55d791e7: (-s ours) am 5a0bf1f0: DO NOT MERGE
...
Merge commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a'
* commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a':
DO NOT MERGE
2010-01-21 17:57:07 -08:00
Grace Kloba
a24ffc2854
am 8d4baa78: am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
...
Merge commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2'
* commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2':
If ZoomButttonsController detects more than one pointer,
2010-01-21 17:56:46 -08:00
Grace Kloba
d0a6dc225d
am 3648f949: (-s ours) am f080a5ad: Merge "DO NOT MERGE" into eclair
...
Merge commit '3648f949ef100668500c9f21d0e8b53d310a393e'
* commit '3648f949ef100668500c9f21d0e8b53d310a393e':
DO NOT MERGE
2010-01-21 17:56:25 -08:00
Jim Miller
27be597fcb
am 84928fa9: am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
...
Merge commit '84928fa93c3be222b77794de9922d299f4971ea4'
* commit '84928fa93c3be222b77794de9922d299f4971ea4':
Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
2010-01-21 17:56:03 -08:00
Xavier Ducrohet
35e0ee0dac
am da84d6a1: am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
...
Merge commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6'
* commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6':
ADT/Layoutlib: Add dash support to stroke.
2010-01-21 17:55:40 -08:00
Xavier Ducrohet
9920a48c57
am c0ea805c: am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair
...
Merge commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3'
* commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3':
ADT/Layoutlib: properly handle stroke information.
2010-01-21 17:55:17 -08:00
Fred Quintana
8db9427d58
am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782 " into eclair
...
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp
* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
initialize sync adapters that get installed while the system is running
2010-01-21 17:35:28 -08:00
jsh
ef32ea29b3
am 036e2108: Fix NPE when importing from USIM.
...
Merge commit '036e21083d9936425687d7de29e95b2c458a7e4a' into eclair-plus-aosp
* commit '036e21083d9936425687d7de29e95b2c458a7e4a':
Fix NPE when importing from USIM.
2010-01-21 17:35:18 -08:00
Fred Quintana
4910d5fb2e
Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782 " into eclair
2010-01-21 17:30:07 -08:00