OSDN Git Service
Irfan Sheriff [Tue, 23 Nov 2010 21:27:56 +0000 (13:27 -0800)]
Merge "Fix Wifi's setting of isAvailable."
Mindy Pereira [Tue, 23 Nov 2010 19:32:51 +0000 (11:32 -0800)]
Merge "Update edge and glow rendering to match new specs."
Brad Fitzpatrick [Tue, 23 Nov 2010 19:19:53 +0000 (11:19 -0800)]
Merge "StrictMode fingerprinting / hashCode improvements."
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:17:48 +0000 (11:17 -0800)]
am
9df7f313: am
f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
* commit '
9df7f31359866a77a47c9fab3171c71715fd0056':
frameworks/base: Destroy the overlay even if there is an error
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:14:57 +0000 (11:14 -0800)]
am
f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error"
* commit '
f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
frameworks/base: Destroy the overlay even if there is an error
Jean-Baptiste Queru [Tue, 23 Nov 2010 19:02:09 +0000 (11:02 -0800)]
Merge "frameworks/base: Destroy the overlay even if there is an error"
Huahui Wu [Tue, 23 Nov 2010 18:56:54 +0000 (10:56 -0800)]
Merge "b/
3186860: fix failing layout tests: fast/events/touch/basic-multi-touch-events-limited.html fast/events/touch/touch-target-limited.html"
Brad Fitzpatrick [Tue, 23 Nov 2010 18:41:07 +0000 (10:41 -0800)]
Merge "Cache WindowManager in StrictMode; add android.util.Singleton"
Cary Clark [Tue, 23 Nov 2010 18:14:55 +0000 (10:14 -0800)]
Merge "cancel text selection on rotate"
Brad Fitzpatrick [Tue, 23 Nov 2010 18:14:29 +0000 (10:14 -0800)]
Merge "CloseGuard cleanups."
Adam Powell [Tue, 23 Nov 2010 18:06:10 +0000 (10:06 -0800)]
Merge "Merge overscrolling from gingerbread."
Vasu Nori [Tue, 23 Nov 2010 18:05:06 +0000 (10:05 -0800)]
Merge "print certain rows from downloads.db when bugreports are taken"
Mike Lockwood [Tue, 23 Nov 2010 17:22:37 +0000 (09:22 -0800)]
Merge "MTP: Remove static library build for linux host."
Kenny Root [Tue, 23 Nov 2010 17:20:33 +0000 (09:20 -0800)]
Merge "Add knowledge of mipmap to aapt"
Gloria Wang [Tue, 23 Nov 2010 05:29:22 +0000 (21:29 -0800)]
am
3e18dfab: am
4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '
3e18dfab3417e139c7ec3896cea9e303fdc8fa63':
Notify the playback status to DRM agents before the playback starts
Gloria Wang [Tue, 23 Nov 2010 05:29:08 +0000 (21:29 -0800)]
am
24a90c26: am
d9334934: Merge "Update of DRM Framework."
* commit '
24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
Gloria Wang [Tue, 23 Nov 2010 05:26:13 +0000 (21:26 -0800)]
am
4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '
4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
Gloria Wang [Tue, 23 Nov 2010 05:25:56 +0000 (21:25 -0800)]
am
d9334934: Merge "Update of DRM Framework."
* commit '
d93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
Gloria Wang [Tue, 23 Nov 2010 05:15:07 +0000 (21:15 -0800)]
Merge "Notify the playback status to DRM agents before the playback starts"
Gloria Wang [Tue, 23 Nov 2010 05:14:09 +0000 (21:14 -0800)]
Merge "Update of DRM Framework."
Dianne Hackborn [Tue, 23 Nov 2010 05:05:39 +0000 (21:05 -0800)]
Merge "New animations from lbk."
satok [Tue, 23 Nov 2010 01:27:43 +0000 (17:27 -0800)]
Merge "Add an API to get shortcut IMEs"
Jean-Baptiste Queru [Tue, 23 Nov 2010 00:46:18 +0000 (16:46 -0800)]
Merge "resolved conflicts for merge of
8484e57f to master"
Jean-Baptiste Queru [Tue, 23 Nov 2010 00:43:59 +0000 (16:43 -0800)]
resolved conflicts for merge of
8484e57f to master
Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
Gil Dobjanschi [Tue, 23 Nov 2010 00:38:38 +0000 (16:38 -0800)]
Merge "Begin transition was invalidated when the image duration was changed."
Jean-Baptiste Queru [Tue, 23 Nov 2010 00:32:34 +0000 (16:32 -0800)]
resolved conflicts for merge of
e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
Joe Onorato [Tue, 23 Nov 2010 00:28:32 +0000 (16:28 -0800)]
Merge "Add a better notification test and clean up the flag handling in the notification builder."
Jason Sams [Tue, 23 Nov 2010 00:27:59 +0000 (16:27 -0800)]
Merge "More error checks"
Justin Ho [Tue, 23 Nov 2010 00:24:48 +0000 (16:24 -0800)]
Merge "Merging some Gingerbread status bar icons to master"
Jean-Baptiste Queru [Mon, 22 Nov 2010 23:59:04 +0000 (15:59 -0800)]
Merge "Enabling cell broadcast (SMS-CB) support in the platform."
Andreas Huber [Mon, 22 Nov 2010 23:40:29 +0000 (15:40 -0800)]
Merge "Squashed commit of the following:"
Justin Ho [Mon, 22 Nov 2010 23:38:37 +0000 (15:38 -0800)]
Merge "Adding new gingerbread notifications and ringtones to master"
satok [Mon, 22 Nov 2010 23:17:37 +0000 (15:17 -0800)]
Merge "Synchronize getCurrentInputMethodSubtype"
Xia Wang [Mon, 22 Nov 2010 22:50:28 +0000 (14:50 -0800)]
am
6bdd6937: am
5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
* commit '
6bdd69370fe2bda7adc7055f62165fccd944b192':
Add Wifi Tethering stress test
Adam Powell [Mon, 22 Nov 2010 22:49:20 +0000 (14:49 -0800)]
Merge "Fix bug
3208546 - use the right sized progress spinner for holo.light"
Xia Wang [Mon, 22 Nov 2010 22:46:33 +0000 (14:46 -0800)]
am
5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread
* commit '
5df8c155872833647ac56951ab90bd26a9af9480':
Add Wifi Tethering stress test
Xia Wang [Mon, 22 Nov 2010 22:44:49 +0000 (14:44 -0800)]
Merge "Add Wifi Tethering stress test" into gingerbread
Jean-Michel Trivi [Mon, 22 Nov 2010 22:08:18 +0000 (14:08 -0800)]
Merge "Unhide android.media.AudioManager.MODE_IN_COMMUNICATION"
Naomi Luis [Thu, 18 Nov 2010 20:48:25 +0000 (12:48 -0800)]
frameworks/base: Destroy the overlay even if there is an error
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.
Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
Scott Main [Mon, 22 Nov 2010 21:58:05 +0000 (13:58 -0800)]
am
4f3c40cc: am
8fac7c2e: change sdk version variable to 2.3 (for docs)
* commit '
4f3c40cc4d24ba1404b1332dbf1bfcddede8bf99':
change sdk version variable to 2.3 (for docs)
Scott Main [Mon, 22 Nov 2010 21:55:55 +0000 (13:55 -0800)]
am
8fac7c2e: change sdk version variable to 2.3 (for docs)
* commit '
8fac7c2edc433b6c7d153caac238fef595133663':
change sdk version variable to 2.3 (for docs)
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:48:06 +0000 (13:48 -0800)]
am
c8454a85: am
b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit '
c8454a851f26b78de77c0f6b1aa746ce3e2517f1':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:44:56 +0000 (13:44 -0800)]
am
b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
* commit '
b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
SearchDialog: Fix for NullpointerException while using Suggestions in Browser
Jean-Baptiste Queru [Mon, 22 Nov 2010 21:40:29 +0000 (13:40 -0800)]
Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"
Gloria Wang [Mon, 22 Nov 2010 18:48:30 +0000 (10:48 -0800)]
Merge "64-bit file size/offset support for DRM framework"
James Dong [Mon, 22 Nov 2010 17:54:21 +0000 (09:54 -0800)]
Merge "Fixed an issue in SampleTable where the table index was incorrectly wrapped around to -1"
Dmitri Plotnikov [Mon, 22 Nov 2010 17:48:17 +0000 (09:48 -0800)]
Merge "Adding IS_READ_ONLY flag to groups"
Iain Merrick [Mon, 22 Nov 2010 17:34:31 +0000 (09:34 -0800)]
Merge "Make maybeSavePassword() a top-level method in BrowserFrame."
Erik [Mon, 22 Nov 2010 04:08:06 +0000 (20:08 -0800)]
Merge "b/
3215774 Fix scrollMode notifications"
Joe Onorato [Mon, 22 Nov 2010 03:23:36 +0000 (19:23 -0800)]
Merge changes I61331a6e,I5728222b
* changes:
new battery assets
Use new nav button assets.
Dirk Dougherty [Sat, 20 Nov 2010 03:21:04 +0000 (19:21 -0800)]
am
e489d48f: am
805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
* commit '
e489d48f7c95b874ee7820d1052d862109244437':
doc change: Docs for SDK Tools r8, ADT 8
Wu-cheng Li [Sat, 20 Nov 2010 03:20:59 +0000 (19:20 -0800)]
am
fb6f4505: am
589e8381: Merge "Improve camera documentation." into gingerbread
* commit '
fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6':
Improve camera documentation.
Dirk Dougherty [Sat, 20 Nov 2010 03:04:56 +0000 (19:04 -0800)]
am
805bddc1: Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
* commit '
805bddc123c1fc56be333d6ff365f168d4bc2b08':
doc change: Docs for SDK Tools r8, ADT 8
Dirk Dougherty [Sat, 20 Nov 2010 03:03:03 +0000 (19:03 -0800)]
Merge "doc change: Docs for SDK Tools r8, ADT 8" into gingerbread
Wu-cheng Li [Sat, 20 Nov 2010 02:17:24 +0000 (18:17 -0800)]
am
589e8381: Merge "Improve camera documentation." into gingerbread
* commit '
589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
Wu-cheng Li [Sat, 20 Nov 2010 02:14:43 +0000 (18:14 -0800)]
Merge "Improve camera documentation." into gingerbread
James Dong [Sat, 20 Nov 2010 01:35:26 +0000 (17:35 -0800)]
Merge "Fixed MediaPlayer unit test issues"
Mathias Agopian [Sat, 20 Nov 2010 01:23:13 +0000 (17:23 -0800)]
am
d3b5510b: am
927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit '
d3b5510b8505c6c653469193a40f6431272085f3':
Fix SensorManager.getOrientation() documentation.
Mathias Agopian [Sat, 20 Nov 2010 01:20:14 +0000 (17:20 -0800)]
am
927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit '
927e7410000dd1917387c01fc4229836ddd5eb97':
Fix SensorManager.getOrientation() documentation.
Mathias Agopian [Sat, 20 Nov 2010 01:18:21 +0000 (17:18 -0800)]
Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
Shimeng (Simon) Wang [Sat, 20 Nov 2010 01:13:07 +0000 (17:13 -0800)]
Merge "Make sure we have a ";" after locale in User Agent"
Brad Fitzpatrick [Sat, 20 Nov 2010 01:08:44 +0000 (17:08 -0800)]
Merge "Don't re-read SharedPreferences unnecessarily."
Daniel Shiplacoff [Sat, 20 Nov 2010 01:00:25 +0000 (17:00 -0800)]
Merge "Updates assets for edge glow and line."
Scott Main [Sat, 20 Nov 2010 00:56:53 +0000 (16:56 -0800)]
am
55ff5708: am
828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
* commit '
55ff5708bb166ab985ffd89e62ddcb13927d6403':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:56:49 +0000 (16:56 -0800)]
am
716f60ce: resolved conflicts for merge of
e2ec61b2 to gingerbread-plus-aosp
* commit '
716f60ce605131429dc9efe8f351f0da0c8cc8c2':
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:56:42 +0000 (16:56 -0800)]
am
7b76ed69: am
e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
* commit '
7b76ed693e42caea0c5f1bcbe7059c580e9cb314':
Added noop unregisterReceiver to complement existing noop registerReceiver.
Jake Hamby [Sat, 20 Nov 2010 00:53:26 +0000 (16:53 -0800)]
Merge "Revert "Don't call cancel discovery when its already canceelled.""
Brian Muramatsu [Sat, 20 Nov 2010 00:52:11 +0000 (16:52 -0800)]
Merge "Fix ClipboardManager#hasText"
Scott Main [Sat, 20 Nov 2010 00:51:57 +0000 (16:51 -0800)]
am
828b6816: Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
* commit '
828b68166679ebfc0002e2ea516ca91e6fb13597':
docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462
James Dong [Sat, 20 Nov 2010 00:49:10 +0000 (16:49 -0800)]
Merge "Removed uncessary FILE structure pointer for I/O"
Scott Main [Sat, 20 Nov 2010 00:48:50 +0000 (16:48 -0800)]
Merge "docs: add docs for xhdpi and xlarge screen support update screen ranges figure bug:
3099462" into gingerbread
Brian Carlstrom [Sat, 20 Nov 2010 00:28:30 +0000 (16:28 -0800)]
Merge "Adding CloseGuard to Animation to find forgotten animations"
Xavier Ducrohet [Sat, 20 Nov 2010 00:23:22 +0000 (16:23 -0800)]
Merge "Layoutlib: support for editing embedded layouts."
Andy Stadler [Sat, 20 Nov 2010 00:22:31 +0000 (16:22 -0800)]
Merge "Fixes to DevicePolicyManager.setPasswordExpirationTimeout"
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:21:31 +0000 (16:21 -0800)]
resolved conflicts for merge of
e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
Dianne Hackborn [Sat, 20 Nov 2010 00:04:53 +0000 (16:04 -0800)]
Merge "Goodbye title_bar_shadow."
Eric Laurent [Fri, 19 Nov 2010 23:58:24 +0000 (15:58 -0800)]
Merge "Fix issue
3157123."
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:50:29 +0000 (15:50 -0800)]
Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:43:28 +0000 (15:43 -0800)]
am
e3bef7c4: Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
* commit '
e3bef7c48d7ec13cb8c7c81dba8d775377e69bed':
Added noop unregisterReceiver to complement existing noop registerReceiver.
Jean-Baptiste Queru [Fri, 19 Nov 2010 23:31:30 +0000 (15:31 -0800)]
Merge "Added noop unregisterReceiver to complement existing noop registerReceiver."
Mike Lockwood [Fri, 19 Nov 2010 22:56:07 +0000 (14:56 -0800)]
Merge "CameraBrowser: temporarily move to system partition"
Dianne Hackborn [Fri, 19 Nov 2010 22:38:16 +0000 (14:38 -0800)]
Merge "Implement issue #
2367442: Please add API for manipulating installer package names"
Xavier Ducrohet [Fri, 19 Nov 2010 22:33:58 +0000 (14:33 -0800)]
Merge "LayoutLib: use the new expand API."
Jeff Brown [Fri, 19 Nov 2010 21:57:34 +0000 (13:57 -0800)]
Merge "Fix SDK build on Windows due to use of mmap."
Jeff Brown [Fri, 19 Nov 2010 21:13:07 +0000 (13:13 -0800)]
Fix SDK build on Windows due to use of mmap.
Change-Id: Id4bd9a6f932285c93c5853e540efc20b99876564
Xavier Ducrohet [Fri, 19 Nov 2010 20:59:29 +0000 (12:59 -0800)]
Merge "LayoutLib: fix some tests"
Mike Lockwood [Fri, 19 Nov 2010 20:31:00 +0000 (12:31 -0800)]
Merge "CameraBrowser improvements:"
Brad Fitzpatrick [Fri, 19 Nov 2010 20:08:34 +0000 (12:08 -0800)]
Merge "Fix AbsListView StrictMode.Span end point on flings."
Daniel Sandler [Fri, 19 Nov 2010 19:54:35 +0000 (11:54 -0800)]
Merge "Improve hide/show animations in status bar."
Xavier Ducrohet [Fri, 19 Nov 2010 19:21:01 +0000 (11:21 -0800)]
Merge "Layoutlib: support viewkey in include nodes."
Android Git Automerger [Fri, 19 Nov 2010 19:10:11 +0000 (11:10 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Brad Fitzpatrick [Fri, 19 Nov 2010 19:07:47 +0000 (11:07 -0800)]
Merge "StrictMode: use Log.isLoggable"
Gilles Debunne [Fri, 19 Nov 2010 19:07:15 +0000 (11:07 -0800)]
Merge "Clean-up in StaticLayout"
Mike Lockwood [Fri, 19 Nov 2010 18:58:47 +0000 (10:58 -0800)]
Merge "PTP: Fix permissions problems with files imported via PTP"
Charles Chen [Fri, 19 Nov 2010 18:56:45 +0000 (10:56 -0800)]
Merge "Removing logs of text that is being spoken."
Dirk Dougherty [Fri, 19 Nov 2010 18:56:26 +0000 (10:56 -0800)]
am
00f502a3: am
0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '
00f502a38cc4d6e2278f962b04308e6590dba36b':
Doc change: update media formats table.
Dirk Dougherty [Fri, 19 Nov 2010 18:53:20 +0000 (10:53 -0800)]
am
0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '
0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
Doc change: update media formats table.
Dirk Dougherty [Fri, 19 Nov 2010 18:47:10 +0000 (10:47 -0800)]
Merge "Doc change: update media formats table." into gingerbread
Robert Greenwalt [Fri, 19 Nov 2010 18:34:17 +0000 (10:34 -0800)]
Merge "Notify all VMs when proxy changes."
Andreas Huber [Fri, 19 Nov 2010 18:31:50 +0000 (10:31 -0800)]
Merge "Fix an artifact of going from off_t to off64_t"