Andreas Huber
17a880a16c
Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"
2011-10-07 10:08:48 -07:00
Iliyan Malchev
9a0bd1baa4
Merge "Add initialize method to CameraHardwareInterface"
2011-10-07 09:57:26 -07:00
Steve Block
7721d7dee7
Merge "Add WebViewClient.onProceededAfterSslError()"
2011-10-07 09:53:43 -07:00
Andreas Huber
b6f7145ba3
Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
2011-10-07 07:59:35 -07:00
The Android Open Source Project
e8b410bee2
Reconcile with ics-factoryrom-release
...
Change-Id: I432900d452f3f8869f42a0ff4ae0d34e1c34dc46
2011-10-07 05:35:36 -07:00
Chih-Chung Chang
50ed63d8d9
Merge "Allow shutter/recording sound to be adjusted unless it's forced."
2011-10-07 03:20:26 -07:00
Wu-cheng Li
9a113ce9fe
Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
2011-10-07 03:08:23 -07:00
The Android Automerger
0b2c66ca39
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-06 20:52:50 -07:00
James Dong
3428e41a41
Merge "Fix an issue where we should allow negative values but did not"
2011-10-06 20:38:29 -07:00
Christopher Tate
064d8440aa
am a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore
...
* commit 'a0c39e28e56d642168ad18dccb86f5787b4e1592':
DO NOT MERGE: fix wallpaper restore
2011-10-06 20:00:25 -07:00
Scott Main
6c06486d69
Merge "docs: deprecate thingy"
2011-10-06 18:41:48 -07:00
Nicolas Roard
b235502492
Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations."
2011-10-06 18:29:20 -07:00
Ying Wang
a61153e8ac
Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf"
2011-10-06 18:25:22 -07:00
Anirudh Dewani
2ea0c1972b
Merge "Docs changes for WiFiDirect sample"
2011-10-06 17:57:55 -07:00
Svetoslav Ganov
e0f66c859a
Merge "Accessibility test automation API not working."
2011-10-06 17:28:51 -07:00
Philip Milne
31d246845c
Merge "Move Activity1 and Activity2 to API Demos area in development/samples."
2011-10-06 17:21:08 -07:00
Justin Ho
a2e315be95
Merge "Reference download asset through intermediate."
2011-10-06 16:28:57 -07:00
Jeff Brown
5c905ea7de
Merge "Clean up CursorWindow code. Bug: 5332296"
2011-10-06 16:28:15 -07:00
Justin Ho
05838ff98e
am 65162b1e: Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
...
* commit '65162b1ee430cb8050109327a7fd958fa72d64ac':
Adding 3 additional notification sounds Bug: 5416299
2011-10-06 15:57:38 -07:00
Justin Ho
271d3ed41c
Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
2011-10-06 15:51:43 -07:00
Chia-chi Yeh
87b869ece2
Merge "VPN: temporarily disable the default proxy when VPN is active."
2011-10-06 15:29:50 -07:00
Chia-chi Yeh
f2cb45d4f8
Merge "ConnectivityService: detach the logic of global proxy."
2011-10-06 15:29:43 -07:00
Dianne Hackborn
80f66b685a
Merge "Fix issue #5371530 : SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately"
2011-10-06 15:15:32 -07:00
Svetoslav Ganov
5177755699
Merge "Fixing errors in position information of scrollable views reported for accessibility."
2011-10-06 15:13:06 -07:00
Jeff Brown
cc0bf53f21
Clean up CursorWindow code.
...
Bug: 5332296
The code is functionally equivalent, but a little more efficient
and much easier to maintain.
Change-Id: I90670a13799df05831843a5137ab234929281b7c
2011-10-06 14:40:13 -07:00
Chet Haase
e7244280cd
Merge "Fix issue #5367164 : memory leak in LayoutTransition"
2011-10-06 14:35:53 -07:00
Jake Hamby
2da73a572b
Merge "Enable support for multiple SMSDispatchers in CDMALTEPhone."
2011-10-06 14:05:58 -07:00
Robert Ly
fd6d9a0309
Merge "docs: tools and adt notes"
2011-10-06 13:54:42 -07:00
Christopher Tate
00d87d6040
Merge "Disable db_sample logging"
2011-10-06 13:09:58 -07:00
Christopher Tate
06877a7b5c
Merge "Prevent concurrent backup operations"
2011-10-06 13:09:52 -07:00
Xavier Ducrohet
1b22b98a43
Merge "Update dev guide for new build system and new lib system."
2011-10-06 12:56:58 -07:00
Irfan Sheriff
e156080204
Merge "Mobile hotspot provision string"
2011-10-06 12:42:48 -07:00
Daniel Sandler
f6dd719953
Merge "Cascading clear-all in the phone notifications panel."
2011-10-06 12:40:53 -07:00
Chet Haase
7b4bdab36e
Merge "Fix issue #5384631 : hw windows not resizing correctly"
2011-10-06 12:14:26 -07:00
Jeff Sharkey
fdc6ca5527
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
...
* commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf':
Hide quota APIs until finalized.
2011-10-06 11:22:40 -07:00
Jeff Sharkey
a12e2cc771
Merge "Hide quota APIs until finalized." into ics-factoryrom
2011-10-06 11:19:29 -07:00
Scott Main
be9758fea5
Merge "docs: add new action item and state list drawable resource attributes"
2011-10-06 11:19:25 -07:00
Eric Fischer
402cd45604
am 2fc826ec: (-s ours) Import translations for late permission additions.
...
* commit '2fc826ec944cf85d1c3e65011091c58dc94110c0':
Import translations for late permission additions.
2011-10-06 11:03:18 -07:00
Wink Saville
b2c098a902
Merge "Set mGotCountryCode properly."
2011-10-06 10:52:13 -07:00
Steve Block
378903492e
Merge "Improve a warning message in WebViewCore's EventHub"
2011-10-06 10:35:33 -07:00
Ben Murdoch
b8cafd85c6
Merge "Pass correct units for text size in autocomplete drop down."
2011-10-06 10:23:20 -07:00
John Reck
42101dbaec
Merge "Prevent adapter flickering"
2011-10-06 10:22:03 -07:00
Roman Nurik
b670684013
Merge "Mark random music player sample as updated in the resource TOC"
2011-10-06 10:11:32 -07:00
Andreas Huber
0062eff837
Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."
2011-10-06 09:17:14 -07:00
Steve Block
3b00604f35
Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty"
2011-10-06 08:48:52 -07:00
Justin Ho
a7163253f1
Merge "primary progress updated to fix clipping problem"
2011-10-06 07:39:11 -07:00
Justin Ho
554be3acde
Merge "scrubber assets updated to larger size"
2011-10-06 07:39:03 -07:00
Jeff Sharkey
fe5a88d9de
Merge "Refine random stats generation."
2011-10-05 23:38:44 -07:00
Michael Jurka
dc056cb5d9
Merge "Adding logging to debug widget deletions"
2011-10-05 22:11:19 -07:00
Mathias Agopian
0e8bbee577
don't log EGL errors due to unimplemented proprietary extensions
...
Change-Id: Icfc33d4f55d1e7fb49390ce0921ba37a438c9fc2
2011-10-05 19:15:32 -07:00