OSDN Git Service
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"
Brad Fitzpatrick [Fri, 19 Nov 2010 18:27:56 +0000 (10:27 -0800)]
am
096c4c44: am
251384a7: Merge "Improve performance when getting styled string."
* commit '
096c4c448d8110c21108f2db4a19a85099e78557':
Improve performance when getting styled string.
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:27:51 +0000 (10:27 -0800)]
am
f69f356e: am
14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* inste
* commit '
f69f356ebaf33aa150817c44ee2bd781f24e4e71':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
Brad Fitzpatrick [Fri, 19 Nov 2010 18:25:09 +0000 (10:25 -0800)]
am
251384a7: Merge "Improve performance when getting styled string."
* commit '
251384a7595022ddbc53f4ab0fa386f9c040f1f5':
Improve performance when getting styled string.
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:24:51 +0000 (10:24 -0800)]
am
14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
* commit '
14ac9546367d4df37eead55f6762b944b49f33b2':
build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
Scott Main [Fri, 19 Nov 2010 18:23:29 +0000 (10:23 -0800)]
Merge "docs: de-'new' samples and tutorials"
Mike Lockwood [Fri, 19 Nov 2010 18:22:09 +0000 (10:22 -0800)]
Merge "Remove command line mtp host tool"
Irfan Sheriff [Fri, 19 Nov 2010 18:18:29 +0000 (10:18 -0800)]
Merge "Split SupplicantStateTracker and refactor"
Andreas Huber [Fri, 19 Nov 2010 18:07:28 +0000 (10:07 -0800)]
Merge "Squashed commit of the following:"
Kenny Root [Fri, 19 Nov 2010 17:11:42 +0000 (09:11 -0800)]
Merge "Use different version of CLDR data in DatePicker"
Scott Main [Fri, 19 Nov 2010 17:09:33 +0000 (09:09 -0800)]
Merge "new docs for fragments"
Amith Yamasani [Fri, 19 Nov 2010 16:47:36 +0000 (08:47 -0800)]
Merge "Update screen timeout again."
Mike Lockwood [Fri, 19 Nov 2010 16:33:21 +0000 (08:33 -0800)]
Merge "PTP: Improve performance and reliability of file importing"
Brad Fitzpatrick [Fri, 19 Nov 2010 15:41:39 +0000 (07:41 -0800)]
Merge "Improve performance when getting styled string."
Kristian Monsen [Fri, 19 Nov 2010 14:58:01 +0000 (06:58 -0800)]
Merge "Find mime from file extension if the mime is empty"
Jesse Wilson [Fri, 19 Nov 2010 07:09:44 +0000 (23:09 -0800)]
Merge "Decode JSON literal types eagerly and with our own decoder."
Xavier Ducrohet [Fri, 19 Nov 2010 05:00:59 +0000 (21:00 -0800)]
Merge "Layoutlib: use int[] wrapper to use as map keys."
Dianne Hackborn [Fri, 19 Nov 2010 04:05:19 +0000 (20:05 -0800)]
Merge "Some work on issue #
3201795: Improve transition when keyboard comes up"
Xavier Ducrohet [Fri, 19 Nov 2010 04:03:31 +0000 (20:03 -0800)]
Merge "Layoutlib: Properly dispose of bitmap delegate."
James Dong [Fri, 19 Nov 2010 02:19:30 +0000 (18:19 -0800)]
Merge "64-bit file size/offset support for media framework"
Stephen Hines [Fri, 19 Nov 2010 01:48:58 +0000 (17:48 -0800)]
Merge "Remove unnecessary export_func pragma."
Eric Laurent [Fri, 19 Nov 2010 01:45:48 +0000 (17:45 -0800)]
Merge "Fix issue
3192794."
Adam Powell [Fri, 19 Nov 2010 01:23:54 +0000 (17:23 -0800)]
Merge "Make holo widget styles public"
Eric Fischer [Fri, 19 Nov 2010 01:20:43 +0000 (17:20 -0800)]
Merge "Add date format strings for the new locales."
Gil Dobjanschi [Fri, 19 Nov 2010 01:14:14 +0000 (17:14 -0800)]
Merge "AudioTrack getTimelineDuration clarification."
Eric Fischer [Fri, 19 Nov 2010 01:12:43 +0000 (17:12 -0800)]
Merge "Import initial translations for 20 new locales."
Wink Saville [Fri, 19 Nov 2010 01:10:04 +0000 (17:10 -0800)]
Merge "Use TextUtils.isEmpty to simplify code."
Alex Sakhartchouk [Fri, 19 Nov 2010 00:39:42 +0000 (16:39 -0800)]
Merge "Fixing the state restore bug."
Adam Cohen [Fri, 19 Nov 2010 00:15:03 +0000 (16:15 -0800)]
Merge "Fixing issue #
3200503"
Alex Sakhartchouk [Thu, 18 Nov 2010 23:58:17 +0000 (15:58 -0800)]
Merge "Support for cubemaps."
Mathias Agopian [Thu, 18 Nov 2010 23:55:31 +0000 (15:55 -0800)]
am
550b1e17: am
671a6ff4: Add support for virtual sensors.
* commit '
550b1e17c332b1302299af0b3a8a2fa81d7cde65':
Add support for virtual sensors.
Mathias Agopian [Thu, 18 Nov 2010 23:52:14 +0000 (15:52 -0800)]
am
671a6ff4: Add support for virtual sensors.
* commit '
671a6ff4be11b3e2d8eb017e0c7a78e6133fb2b8':
Add support for virtual sensors.
Jamie Gennis [Thu, 18 Nov 2010 23:42:59 +0000 (15:42 -0800)]
Merge "Set the external display usage bit in Stagefright."
Wink Saville [Thu, 18 Nov 2010 23:42:04 +0000 (15:42 -0800)]
Merge "Fix SPN_STRINGS_UPDATED_ACTION."
Justin Ho [Thu, 18 Nov 2010 23:10:02 +0000 (15:10 -0800)]
am
5e5c2a19: (-s ours) am
80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
* commit '
5e5c2a199a9e44ef56c6638a52b9a9153f3d8c0d':
DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
Justin Ho [Thu, 18 Nov 2010 23:06:51 +0000 (15:06 -0800)]
am
80381ab4: Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
* commit '
80381ab4ed44bd69c3e3464a848ca15851365b03':
DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem
Justin Ho [Thu, 18 Nov 2010 23:03:39 +0000 (15:03 -0800)]
Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread
Gil Dobjanschi [Thu, 18 Nov 2010 22:47:18 +0000 (14:47 -0800)]
Merge "Added IOException to WaveformData constructor"
Jeff Brown [Thu, 18 Nov 2010 22:20:30 +0000 (14:20 -0800)]
Merge "Added support for full PC-style keyboards."
Andreas Huber [Thu, 18 Nov 2010 22:15:02 +0000 (14:15 -0800)]
Merge "Log H.264 profile/level in OMXCodec"
Stephen Hines [Thu, 18 Nov 2010 22:05:54 +0000 (14:05 -0800)]
Merge "Mark a non-exported function as static."
Andreas Huber [Thu, 18 Nov 2010 21:19:07 +0000 (13:19 -0800)]
Merge "Support for "chunked" HTTP transfer encoding."
James Dong [Thu, 18 Nov 2010 21:13:12 +0000 (13:13 -0800)]
Merge "Fix an issue wherre error notification will not be sent after mediaplayer reset"
Xavier Ducrohet [Thu, 18 Nov 2010 20:58:32 +0000 (12:58 -0800)]
Merge "Layoutlib: support XML based ColorStateList."
Jeff Brown [Thu, 18 Nov 2010 20:42:11 +0000 (12:42 -0800)]
am
bed67e99: (-s ours) am
b27b8c0c: Fix a key repeating bug. (DO NOT MERGE)
* commit '
bed67e9925157d97986f6ff46bd1d4314522f92d':
Fix a key repeating bug. (DO NOT MERGE)
Jeff Brown [Thu, 18 Nov 2010 20:42:04 +0000 (12:42 -0800)]
am
a4846be1: (-s ours) am
bfc1cc2d: Fix stuck keys when released out of order. (DO NOT MERGE)
* commit '
a4846be127e4158c5b9da7d32e5f596c569235aa':
Fix stuck keys when released out of order. (DO NOT MERGE)
Jeff Brown [Thu, 18 Nov 2010 20:36:59 +0000 (12:36 -0800)]
am
b27b8c0c: Fix a key repeating bug. (DO NOT MERGE)
* commit '
b27b8c0caf8ff23d10eea655085769f314050427':
Fix a key repeating bug. (DO NOT MERGE)
Jeff Brown [Thu, 18 Nov 2010 20:36:50 +0000 (12:36 -0800)]
am
bfc1cc2d: Fix stuck keys when released out of order. (DO NOT MERGE)
* commit '
bfc1cc2d1ea85cc754e63b422eb8cef8ae6a3667':
Fix stuck keys when released out of order. (DO NOT MERGE)
Daisuke Miyakawa [Thu, 18 Nov 2010 19:27:49 +0000 (11:27 -0800)]
Merge "Make AsyncQueryHandler emit more helpful log."
Gloria Wang [Thu, 18 Nov 2010 19:18:35 +0000 (11:18 -0800)]
Merge "Add getUri() for streaming"
Daniel Sandler [Thu, 18 Nov 2010 19:01:13 +0000 (11:01 -0800)]
Merge "Hello, HoloClock."
Gilles Debunne [Thu, 18 Nov 2010 19:00:50 +0000 (11:00 -0800)]
Merge "Added new timepicker assets"
Scott Main [Thu, 18 Nov 2010 19:00:43 +0000 (11:00 -0800)]
Merge "docs: revise menu resources to account for action bar"
Shimeng (Simon) Wang [Thu, 18 Nov 2010 18:55:08 +0000 (10:55 -0800)]
Merge "Add supported video/m4v mimeType to the support list."
Jeff Brown [Thu, 11 Nov 2010 00:03:06 +0000 (16:03 -0800)]
Added support for full PC-style keyboards.
BREAKING CHANGE: Redesigned the key character map format to
accomodate full keyboards with more comprehensive suite of modifiers.
Old key character maps will not work anymore and must be updated.
The new format is plain text only and it not compiled to a binary
file (so the "kcm" tool will be removed in a subsequent check-in).
Added FULL keyboard type to support full PC-style keyboards.
Added SPECIAL_FUNCTION keyboard type to support special function
keypads that do not have any printable keys suitable for typing
and only have keys like HOME and POWER
Added a special VIRTUAL_KEYBOARD device id convention that maps
to a virtual keyboard with a fixed known layout. This is designed
to work around issues injecting input events on devices whose
built-in keyboard does not have a useful key character map (ie.
when the built-in keyboard is a special function keyboard only.)
Modified several places where events were being synthesized
to use the virtual keyboard.
Removed support for the "qwerty" default layout.
The new default layout is "Generic". For the most part "qwerty"
was being used as a backstop in case the built-in keyboard did
not have a key character map (probably because it was a special
function keypad) and the framework needed to be able to inject
key events anyways. The latter issue is resolved by using the
special VIRTUAL_KEYBOARD device instead of BUILT_IN_KEYBOARD.
Added the concept of a key modifier behavior so that
MetaKeyKeyListener can distinguish between keyboards that use
chorded vs. toggled modifiers.
Wrote more robust key layout and key character map parsers
to enable support for new keyboard features and user installable
key maps.
Fixed a bug in InputReader generating key ups when keys
are released out of sequence.
Updated tons of documentation.
Currently QwertyKeyListener is being used for full keyboards
with autotext and capitalization disabled. This mostly works
but causes some problems with character pickers, etc.
These issues will be resolved in subsequent changes.
Change-Id: Ica48f6097a551141c215bc0d2c6f7b3fb634d354
Kenny Root [Thu, 18 Nov 2010 17:05:25 +0000 (09:05 -0800)]
Merge "Don't waste memory creating new Boolean objects"
Jeff Brown [Wed, 3 Nov 2010 00:58:22 +0000 (17:58 -0700)]
Fix a key repeating bug. (DO NOT MERGE)
This change fixes a bug in the dispatcher where the window manager
policy would incorrectly receive a key repeat count of 0 in the case
where the key repeat was generated by the hardware or driver.
Long-press on HOME was broken as a result.
Repeating keys could also get stuck down.
Bug:
3159581
Bug:
3208156
Change-Id: I1145487cfcc41a7850dba4cafc63c4a5951ace5b
Brad Fitzpatrick [Thu, 18 Nov 2010 03:27:29 +0000 (19:27 -0800)]
Merge "StrictMode: shut up VM penalty logging on debug builds."
Jeff Brown [Thu, 18 Nov 2010 03:16:52 +0000 (19:16 -0800)]
Fix stuck keys when released out of order. (DO NOT MERGE)
Bug:
3208156
Change-Id: I14e4d54f4912de5e2fabcd8638120623aa2d16e0
Scott Main [Thu, 18 Nov 2010 02:40:50 +0000 (18:40 -0800)]
am
705c179e: am
0fe33a48: am
2cbe92ea: docs: add better visibility to app install location doc
* commit '
705c179e3aade32f0e288299ba4519d4ee0a333f':
docs: add better visibility to app install location doc
Jean-Baptiste Queru [Thu, 18 Nov 2010 02:40:31 +0000 (18:40 -0800)]
Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
Daniel Sandler [Thu, 18 Nov 2010 02:38:53 +0000 (18:38 -0800)]
Merge "Lights out was getting stuck. Fixed."
Scott Main [Thu, 18 Nov 2010 02:37:50 +0000 (18:37 -0800)]
am
0fe33a48: am
2cbe92ea: docs: add better visibility to app install location doc
* commit '
0fe33a4835ae3721f6302f3f2112d79e43b2b4f6':
docs: add better visibility to app install location doc
Dmitri Plotnikov [Thu, 18 Nov 2010 02:37:19 +0000 (18:37 -0800)]
Merge "Adding a new provider status"