Eric Fischer
75e15985bc
Merge "Fix Czech lock screen date format."
2010-02-03 16:38:49 -08:00
Andreas Huber
bca1c65fe4
Merge "Previous change broke A/V sync, this is a better change to eliminate negative media positions."
2010-02-03 15:41:23 -08:00
Andreas Huber
065f69ef53
Previous change broke A/V sync, this is a better change to eliminate negative media positions.
...
related-to-bug: 2414900
2010-02-03 15:35:59 -08:00
Chris Tate
348f7b9048
Merge "Add auto-restore setting and Backup Manager awareness thereof"
2010-02-03 15:35:28 -08:00
Christopher Tate
cce9da5dc3
Add auto-restore setting and Backup Manager awareness thereof
...
This setting, like BACKUP_ENABLE, should never be set directly in the secure
settings database. Instead, it should be manipulated through the new IBackupManager
method setAutoRestore(boolean).
Change-Id: I5c3226ca85b6148bb756d753d7f9e4ea76e878c4
2010-02-03 15:33:52 -08:00
Doug Zongker
8c59ec53dc
Merge "remove android.webkit.HttpDateTime, again"
2010-02-03 15:15:02 -08:00
San Mehat
a15caf853b
Merge "NativeDaemonConnector: Improve NativeDaemonException reporting to include the actual error response"
2010-02-03 15:09:53 -08:00
Eric Fischer
574ee3905b
Fix Czech lock screen date format.
...
Bug 2291064
2010-02-03 15:08:56 -08:00
San Mehat
ec4caa0f54
NativeDaemonConnector: Improve NativeDaemonException reporting to include the actual error response
...
Signed-off-by: San Mehat <san@google.com>
2010-02-03 14:37:43 -08:00
Doug Zongker
45a9a14006
remove android.webkit.HttpDateTime, again
...
Remove this class, again, and change the webkit uses of it to use the
one in android-common. Remove class from preloaded-classes as well.
Change-Id: Ic0d4835e77180d299bc2c22b7c8780861b4781ee
2010-02-03 13:52:18 -08:00
Andreas Huber
70d10c0156
Fix a deadlock caused by the AudioPlayer notifying the observer that the stream had ended at the same time the observer was shutting down the AudioPlayer.
...
related-to-bug: 2414536
2010-02-03 13:24:26 -08:00
Doug Zongker
3c4a1ebc19
Merge "undo "move HttpDateTime from android.webkit to android-common jar""
2010-02-03 12:57:54 -08:00
Doug Zongker
e4a74ea0ae
undo "move HttpDateTime from android.webkit to android-common jar"
...
This restores this class to android.webkit, but leaves a copy in
android-common while I figure out how to move it correctly.
This reverts commit 7ad12a5f44253dc535f9a25ceb029579b40c43b1.
Change-Id: I1d0a3efe34764058b979c6987e6e774f64d02b8c
2010-02-03 12:56:16 -08:00
Bjorn Bringert
daea589620
Merge "Copy ic_menu_search.png to ic_search_category_default.png"
2010-02-03 12:52:21 -08:00
Daisuke Miyakawa
8f198c4bdd
Merge "Honor '+' in phone export in vCard."
2010-02-03 12:44:39 -08:00
Daisuke Miyakawa
900731de0c
Honor '+' in phone export in vCard.
...
Currently no test because of temporal reason. I'll do in the near future...
Bug: 2417138
2010-02-03 12:42:26 -08:00
Megha Joshi
1d91f2e416
am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
...
Merge commit 'b299f802b2dea19b003a6724d53ecff1b763bab0'
* commit 'b299f802b2dea19b003a6724d53ecff1b763bab0':
Screenshots for sample syncadapter.
2010-02-03 12:34:53 -08:00
Megha Joshi
b299f802b2
am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclair
...
Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp
* commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434':
Screenshots for sample syncadapter.
2010-02-03 12:29:19 -08:00
Megha Joshi
9f4cfc3afc
Merge "Screenshots for sample syncadapter." into eclair
2010-02-03 12:24:20 -08:00
Mathias Agopian
e304bdd5ee
fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug)
...
A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color.
Fix another typo which caused the viewer position to be wrong for
specular highlights.
Switch back to eye-space lighting, since there are still some issues
with some demos (San Angeles in particular).
2010-02-03 12:13:15 -08:00
Elliott Hughes
ecf04ec19a
Merge "Remove "StringTest.java"."
2010-02-03 12:05:40 -08:00
Mike Chan
8321eb377f
Merge "BatteryStatsImpl: initalize audio timer"
2010-02-03 12:00:39 -08:00
Elliott Hughes
809cf4481f
Remove "StringTest.java".
...
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.
2010-02-03 11:33:47 -08:00
Adam Powell
732ebb1bc3
Fixed a regression in View.cancelLongPress
2010-02-03 11:31:10 -08:00
Megha Joshi
021a90dbaa
Screenshots for sample syncadapter.
2010-02-03 11:21:45 -08:00
Doug Zongker
1fdaab2778
Merge "move HttpDateTime from android.webkit to android-common jar"
2010-02-03 11:21:27 -08:00
Doug Zongker
7ad12a5f44
move HttpDateTime from android.webkit to android-common jar
...
Some to-be-unbundled classes want to use HttpDateTime as well.
Change-Id: I40a001970682f6fbd4d9cd3546bd3f63ebfbe89b
2010-02-03 11:14:29 -08:00
Adam Powell
378a1488bb
Merge "Javadoc fixes to ScaleGestureDetector for SDK builds"
2010-02-03 11:07:42 -08:00
Marco Nelissen
499cc1742a
Merge "Fix fastscroll thumb"
2010-02-03 11:05:46 -08:00
Marco Nelissen
cd3e4ad4fb
Fix fastscroll thumb
2010-02-03 11:04:58 -08:00
Doug Zongker
9cf1a5a0c7
Merge "use device serial number to seed RNG for generating ANDROID_ID"
2010-02-03 11:03:18 -08:00
Adam Powell
ab905c87b7
Javadoc fixes to ScaleGestureDetector for SDK builds
2010-02-03 11:01:58 -08:00
Barry Hayes
6511fe9c9d
Merge "Add a "dalvik.vm.gc.overwritefree" property. When set to "true", the VM will be given the "-Xgc:overwritefree" flag, and the GC will clobber the memory of freed objects."
2010-02-03 10:58:18 -08:00
Doug Zongker
4f8ff39c1e
use device serial number to seed RNG for generating ANDROID_ID
...
Change-Id: I1bcc55f1309cb908803bc42084846a046041eda6
2010-02-03 10:48:22 -08:00
Marco Nelissen
d5bb7ef77e
Merge "Make the fastscroll thumb tell the parent to not intercept touch events, to keep the list from moving sideways in a "workspace" environment. Fixes one of the issues listed in bug 2374212"
2010-02-03 10:45:51 -08:00
Marco Nelissen
d43fe07852
Make the fastscroll thumb tell the parent to not intercept touch events,
...
to keep the list from moving sideways in a "workspace" environment.
Fixes one of the issues listed in bug 2374212
2010-02-03 10:42:33 -08:00
Doug Zongker
2c355e26e9
Merge "expose bootloader & radio versions, hardware string in API"
2010-02-03 10:38:09 -08:00
Romain Guy
f81f9ef60d
Merge "Add missing contentDescription to focusable controls."
2010-02-03 10:37:38 -08:00
Doug Zongker
74885efc8c
expose bootloader & radio versions, hardware string in API
...
Adds three new device-version-related strings to android.os.Build.
Change-Id: I832f87f26e50a649249c58037f563426f3bfc4bf
2010-02-03 10:37:29 -08:00
Andreas Huber
d126d0b61d
Merge "AudioPlayer didn't properly account for the latency when calculating the current media time."
2010-02-03 10:30:17 -08:00
Andreas Huber
c119f7ea23
AudioPlayer didn't properly account for the latency when calculating the current media time.
...
related-to-bug: 2414900
2010-02-03 10:23:26 -08:00
Suchi Amalapurapu
33cea41732
Merge "Apps on sdcard: Add new broadcasts"
2010-02-03 10:21:23 -08:00
Grace Kloba
a61b67abc2
Pass touch event time from Java to WebKit
...
Merge from https://android-git.corp.google.com/g/#change,39355
2010-02-03 09:59:00 -08:00
Dominic Mazzoni
8cb5e47278
Add missing contentDescription to focusable controls.
2010-02-03 09:56:48 -08:00
Ben Murdoch
62f67048c4
Merge "Add support for sending touch events in DRT."
2010-02-03 09:15:34 -08:00
Ben Murdoch
ecbc65cf8f
Add support for sending touch events in DRT.
...
As part of this, make it possible for DRT to configure the timeout threshold between sending touch events to WebCore as the Layout Tests only synthesize single events, not a stream. Because of this, they often get dropped by the WebView for coming too quickly.
Skip the multi touch test as we don't support multi touch in the Browser.
Change-Id: I7b9830f43181fea33206825b49ef2e294269b4dd
2010-02-03 16:57:46 +00:00
Barry Hayes
c2b3217823
Add a "dalvik.vm.gc.overwritefree" property. When set to "true", the
...
VM will be given the "-Xgc:overwritefree" flag, and the GC will
clobber the memory of freed objects.
2010-02-03 08:46:54 -08:00
Leon Clarke
a7ff78d820
Merge "Rebuild a cleaner certificates chain before validating it."
2010-02-03 07:56:58 -08:00
Bjorn Bringert
8d7f71dfd0
Copy ic_menu_search.png to ic_search_category_default.png
...
For some reason both these icons are exposed. Some apps use
ic_search_category_default.png for their search menu item,
and some use ic_menu_search.png. To make them look the same,
I copied ic_menu_search to ic_search_category_default.
Fixes http://b/issue?id=2373762
Change-Id: I045efaac84ed9507c4c0c9d6996f1bedb50d753f
2010-02-03 15:25:37 +00:00
Ben Murdoch
ecbfb2104f
Revert "am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKit". The corresponding change to external/webkit creates a merge conflict in master.
...
Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve
the conflict in external/webkit in master directly.
This reverts commit 9ecd9437ed57bedfa2a7626430be03f4924f6b42, reversing
changes made to 019fe73ddbf52edd1819e1d85a0b242ebccc7fc3.
Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
2010-02-03 11:00:00 +00:00