OSDN Git Service
Jean-Baptiste Queru [Tue, 7 Dec 2010 21:17:37 +0000 (13:17 -0800)]
resolved conflicts for merge of
ee27dd35 to master
Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7
Jean-Baptiste Queru [Tue, 7 Dec 2010 21:02:22 +0000 (13:02 -0800)]
am
12902d68: resolved conflicts for merge of
78742e01 to stage-korg-master
* commit '
12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
Strings for NI position request are moved to resources
Gilles Debunne [Tue, 7 Dec 2010 20:55:09 +0000 (12:55 -0800)]
Merge "Fix for Blink in TextView."
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:47:12 +0000 (12:47 -0800)]
resolved conflicts for merge of
78742e01 to stage-korg-master
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
Kenny Root [Tue, 7 Dec 2010 20:04:58 +0000 (12:04 -0800)]
Merge "DefaultContainerService's JNI library is required"
Jean-Baptiste Queru [Tue, 7 Dec 2010 20:01:25 +0000 (12:01 -0800)]
Merge "Strings for NI position request are moved to resources"
Adam Powell [Tue, 7 Dec 2010 19:51:28 +0000 (11:51 -0800)]
Merge "Fix bug
3259292 - Make FrameLayout respect margins without a gravity setting"
James Dong [Tue, 7 Dec 2010 19:08:53 +0000 (11:08 -0800)]
Merge "Don't drop video frames but to release them."
Shimeng (Simon) Wang [Tue, 7 Dec 2010 19:08:48 +0000 (11:08 -0800)]
Merge "Prevent scaling beyond zoom overview scale."
Brad Fitzpatrick [Tue, 7 Dec 2010 19:02:45 +0000 (11:02 -0800)]
Merge "Make getSharedPreference() async, blocking on first access."
Chet Haase [Tue, 7 Dec 2010 18:51:28 +0000 (10:51 -0800)]
Merge "Change cancel/end behavior of animations to be synchronous"
Wink Saville [Tue, 7 Dec 2010 18:34:49 +0000 (10:34 -0800)]
Merge "Have MobileDataStateTracker & DataConnectionTracker communicate directly."
Patrick Scott [Tue, 7 Dec 2010 18:17:23 +0000 (10:17 -0800)]
Merge "Add fling to scrollable layers."
Andreas Huber [Tue, 7 Dec 2010 18:12:47 +0000 (10:12 -0800)]
Merge "API Support for both synchronous and queued commands, optionally associated metadata."
Justin Ho [Tue, 7 Dec 2010 18:09:28 +0000 (10:09 -0800)]
Merge "Integrating updated Google Talk stat_notify icon (mdpi)"
Nick Pelly [Tue, 7 Dec 2010 17:40:35 +0000 (09:40 -0800)]
am
8c30a47d: am
47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '
8c30a47d801be50272098e60d0079ae1b4ebd22a':
Corrected MIFARE default key set
Nick Pelly [Tue, 7 Dec 2010 17:34:47 +0000 (09:34 -0800)]
am
47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread
* commit '
47e6ccb65ab0088cf04809c234cdb5f747579c8c':
Corrected MIFARE default key set
Nick Pelly [Tue, 7 Dec 2010 17:29:21 +0000 (09:29 -0800)]
Merge "Corrected MIFARE default key set" into gingerbread
Amith Yamasani [Tue, 7 Dec 2010 16:49:50 +0000 (08:49 -0800)]
Merge "Prevent SearchView dropdown from showing up when SearchView is hidden."
Chung-yih Wang [Tue, 7 Dec 2010 07:36:23 +0000 (23:36 -0800)]
am
c9cc9ab5: am
5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit '
c9cc9ab590ef879877e466c0b5f5823e11bb4c47':
Fix SIP bug of different transport/port used for requests.
Dirk Dougherty [Tue, 7 Dec 2010 07:36:18 +0000 (23:36 -0800)]
am
0d49a4e8: am
0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '
0d49a4e838769252a313738e30fe78557f769a59':
Doc change: fix href to axis_globe_inverted orientation diagram.
Martijn Coenen [Tue, 7 Dec 2010 07:36:09 +0000 (23:36 -0800)]
am
7012f1eb: am
9a9706a2: Added missing ndef technology to getTech.
* commit '
7012f1eb3759a071f06cff69cf449adb4c62192b':
Added missing ndef technology to getTech.
Nick Pelly [Tue, 7 Dec 2010 07:36:03 +0000 (23:36 -0800)]
am
68cea273: am
e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
* commit '
68cea273299e59e28f9ccd87c520cc57cbf5adce':
Added NdefFormatable tag, initial class with supported methods.
satok [Tue, 7 Dec 2010 06:27:54 +0000 (22:27 -0800)]
Merge "Move IME button to right side by new desing spec"
Chung-yih Wang [Tue, 7 Dec 2010 06:10:29 +0000 (22:10 -0800)]
am
5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
* commit '
5f86d7f50beba9f6327b8a04defe4e989a153d4a':
Fix SIP bug of different transport/port used for requests.
Jason Sams [Tue, 7 Dec 2010 06:10:18 +0000 (22:10 -0800)]
Merge "API review cleanup."
Chung-yih Wang [Tue, 7 Dec 2010 06:07:59 +0000 (22:07 -0800)]
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
Dirk Dougherty [Tue, 7 Dec 2010 03:44:36 +0000 (19:44 -0800)]
am
0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '
0871ee0c6f43a7201ce49a66211c1c850eabeb6b':
Doc change: fix href to axis_globe_inverted orientation diagram.
Martijn Coenen [Tue, 7 Dec 2010 02:48:02 +0000 (18:48 -0800)]
am
9a9706a2: Added missing ndef technology to getTech.
* commit '
9a9706a213637b396226afff53c69927283609a7':
Added missing ndef technology to getTech.
Romain Guy [Tue, 7 Dec 2010 02:47:03 +0000 (18:47 -0800)]
Merge "Draw text decorations correctly."
Nick Pelly [Tue, 7 Dec 2010 02:44:13 +0000 (18:44 -0800)]
am
e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
* commit '
e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
Added NdefFormatable tag, initial class with supported methods.
Nick Pelly [Tue, 7 Dec 2010 02:41:36 +0000 (18:41 -0800)]
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
Mathias Agopian [Tue, 7 Dec 2010 02:25:58 +0000 (18:25 -0800)]
am
0484a673: am
daef0a04: Merge "[
3229973,
3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
* commit '
0484a673c5839d2be9e615e52c6a45febdf1127b':
[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL
Mathias Agopian [Tue, 7 Dec 2010 02:22:57 +0000 (18:22 -0800)]
am
daef0a04: Merge "[
3229973,
3247470, ...] set EGLNativeWindowSurface\'s format in EGL" into gingerbread
* commit '
daef0a040de7a9825bdbcba7b2eae66195e3a95f':
[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL
Mathias Agopian [Tue, 7 Dec 2010 02:20:09 +0000 (18:20 -0800)]
Merge "[
3229973,
3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
Romain Guy [Tue, 7 Dec 2010 02:08:46 +0000 (18:08 -0800)]
Merge "Correctly render text when coordinates are not integers. Bug #
3225632"
James Dong [Tue, 7 Dec 2010 01:50:20 +0000 (17:50 -0800)]
Merge "Log the exception cause for better problem analysis"
Nick Pelly [Tue, 7 Dec 2010 01:48:38 +0000 (17:48 -0800)]
am
ea294903: am
eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit '
ea294903ca4c298c44b50b473b9b10ae2b77c9e3':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
Mindy Pereira [Tue, 7 Dec 2010 01:47:11 +0000 (17:47 -0800)]
Merge "Make webview edges behave the same way abslistview overscroll edges do."
Nick Pelly [Tue, 7 Dec 2010 01:45:25 +0000 (17:45 -0800)]
am
eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
* commit '
eba947a32a0233b3a2b384c580ab47bc7f27bb4d':
Remove ACTION_TAG_DISCOVERED from protected broadcast list.
Nick Pelly [Tue, 7 Dec 2010 01:43:46 +0000 (17:43 -0800)]
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
Adam Powell [Tue, 7 Dec 2010 01:41:47 +0000 (17:41 -0800)]
Merge "Clean up button bar styles"
Dan Bornstein [Tue, 7 Dec 2010 01:25:44 +0000 (17:25 -0800)]
Merge "Propagate the concept of "packed opcode" values."
Scott Main [Tue, 7 Dec 2010 01:24:24 +0000 (17:24 -0800)]
Merge "cherry pick from gingerbread: I14e59a2281fac9a437ebf52df4c846e7a1e9cc4a Do not merge: Doc change: API diff report for gingerbread."
Scott Main [Tue, 7 Dec 2010 01:22:48 +0000 (17:22 -0800)]
Merge "cherry pick from gingerbread: I08a2f67d324484ed05b956c540facd69f9028563 Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform."
Robert Greenwalt [Tue, 7 Dec 2010 00:51:32 +0000 (16:51 -0800)]
Merge "Make Proxy change broadcast sticky"
James Dong [Tue, 7 Dec 2010 00:45:08 +0000 (16:45 -0800)]
am
23b791cd: am
d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '
23b791cd0f725d188b84dabfd9eeab4e3775b869':
Fixed a race condition where some recording frames may not be released
Jean-Baptiste Queru [Tue, 7 Dec 2010 00:44:50 +0000 (16:44 -0800)]
am
465e88eb: am
1ee2394e: am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
Changing connect and response timeout.
James Dong [Mon, 6 Dec 2010 23:36:04 +0000 (15:36 -0800)]
am
d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '
d57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
Brian Carlstrom [Mon, 6 Dec 2010 23:30:34 +0000 (15:30 -0800)]
Merge "Tracking dalvik.bytecode.* API changes"
Jesse Wilson [Mon, 6 Dec 2010 23:24:28 +0000 (15:24 -0800)]
Merge "Test that we use proxies specified by system properties."
Fred Quintana [Mon, 6 Dec 2010 23:18:58 +0000 (15:18 -0800)]
Merge "make sure that pending operation reconstituted from disk always have an extras bundle"
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:33:03 +0000 (14:33 -0800)]
Merge "Merge from gingerbread-plus-aosp"
Wei-Ta Chen [Mon, 6 Dec 2010 22:32:32 +0000 (14:32 -0800)]
Merge "Add inPreferQualityOverSpeed into BitmapFactory.Options."
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:31:25 +0000 (14:31 -0800)]
Merge from gingerbread-plus-aosp
Change-Id: I154071687cdd51c28bb377ea3f1e818e96909b56
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:21:07 +0000 (14:21 -0800)]
Merge "Merge from gingerbread-plus-aosp"
James Dong [Mon, 6 Dec 2010 22:18:18 +0000 (14:18 -0800)]
Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created."
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:08:37 +0000 (14:08 -0800)]
Merge from gingerbread-plus-aosp
Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0
Gilles Debunne [Mon, 6 Dec 2010 21:57:47 +0000 (13:57 -0800)]
Merge "Moved Paste popup window up in TextView"
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:46:19 +0000 (13:46 -0800)]
am
1ee2394e: am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:43:36 +0000 (13:43 -0800)]
am
1d67fa5b: Merge "Changing connect and response timeout."
* commit '
1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
Jean-Baptiste Queru [Mon, 6 Dec 2010 21:39:19 +0000 (13:39 -0800)]
Merge "Changing connect and response timeout."
Irfan Sheriff [Mon, 6 Dec 2010 20:47:31 +0000 (12:47 -0800)]
Merge "Update scan results when frequency band is set"
Nick Pelly [Mon, 6 Dec 2010 19:55:08 +0000 (11:55 -0800)]
am
cbf4e352: am
3d524e56: Merge gingerbread-nfc into gingerbread
* commit '
cbf4e3525be80607c4d68630faf927ce6a717f72':
First implementation of MifareUltralight
Nick Pelly [Mon, 6 Dec 2010 19:50:47 +0000 (11:50 -0800)]
resolved conflicts for merge of
28e8c66d to master
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
Guang Zhu [Mon, 6 Dec 2010 19:36:54 +0000 (11:36 -0800)]
Merge "disable HW acceleration"
Xavier Ducrohet [Mon, 6 Dec 2010 19:32:43 +0000 (11:32 -0800)]
Merge "LayoutLib: Update font object when text info changes in paint delegate"
Guang Zhu [Mon, 6 Dec 2010 19:28:49 +0000 (11:28 -0800)]
Merge "change how assets are copied out of apk"
Daniel Sandler [Mon, 6 Dec 2010 19:15:45 +0000 (11:15 -0800)]
Merge "Hide navigation buttons and clock on lockscreen."
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:05:47 +0000 (11:05 -0800)]
am
005dd44b: am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 19:03:11 +0000 (11:03 -0800)]
am
864b1e00: Merge "NumberPicker: Set formatter local value to US."
* commit '
864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
Jean-Baptiste Queru [Mon, 6 Dec 2010 18:57:04 +0000 (10:57 -0800)]
Merge "NumberPicker: Set formatter local value to US."
Irfan Sheriff [Mon, 6 Dec 2010 18:42:58 +0000 (10:42 -0800)]
am
18cbfecd: (-s ours) am
bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit '
18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
DO NOT MERGE Avoid nullifying dhcp target
Xavier Ducrohet [Mon, 6 Dec 2010 18:40:38 +0000 (10:40 -0800)]
Merge "LayoutLib: Fix logging."
Andy Stadler [Mon, 6 Dec 2010 18:38:04 +0000 (10:38 -0800)]
Merge "Fix notification/builder defaults"
John Wang [Mon, 6 Dec 2010 18:29:49 +0000 (10:29 -0800)]
Merge "Block incoming calls for non-voice-device."
Gilles Debunne [Mon, 6 Dec 2010 18:22:11 +0000 (10:22 -0800)]
Merge "Made TextView use the new localState API for drag info"
Kenny Root [Mon, 6 Dec 2010 18:21:47 +0000 (10:21 -0800)]
Merge "Add measurement API to DefaultContainerService"
Irfan Sheriff [Mon, 6 Dec 2010 18:17:57 +0000 (10:17 -0800)]
Merge "Hold network hand-off wakelock only when connected"
Yu Shan Emily Lau [Mon, 6 Dec 2010 18:14:16 +0000 (10:14 -0800)]
Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)"
Fred Quintana [Mon, 6 Dec 2010 17:55:53 +0000 (09:55 -0800)]
Merge "add caching to the AccountManagerService"
Robert Greenwalt [Mon, 6 Dec 2010 17:54:16 +0000 (09:54 -0800)]
Merge "Don't clobber the net hostname if it's already set."
Iain Merrick [Mon, 6 Dec 2010 13:40:48 +0000 (05:40 -0800)]
Merge "Call flushCookieStore() from CookieSyncManager."
satok [Mon, 6 Dec 2010 05:38:30 +0000 (21:38 -0800)]
Merge "Fix null pointer exception"
Jeff Hamilton [Mon, 6 Dec 2010 04:03:59 +0000 (20:03 -0800)]
am
c1576ad6: Update the docs to clarify the ordering constraints.
* commit '
c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
Update the docs to clarify the ordering constraints.
Jason Sams [Mon, 6 Dec 2010 03:54:18 +0000 (19:54 -0800)]
Merge "Prevent message overrun in LocklessCommandFifo."
Nick Pelly [Mon, 6 Dec 2010 02:13:10 +0000 (18:13 -0800)]
am
3d524e56: Merge gingerbread-nfc into gingerbread
* commit '
3d524e562606e7994ede3429b37937f40f94cd41':
First implementation of MifareUltralight
Nick Pelly [Mon, 6 Dec 2010 02:08:16 +0000 (18:08 -0800)]
Merge gingerbread-nfc into gingerbread
Adam Powell [Mon, 6 Dec 2010 00:49:40 +0000 (16:49 -0800)]
Merge "Add dividers to action bar navigation. Lighter dividers for holo themes."
Nick Pelly [Sun, 5 Dec 2010 22:49:00 +0000 (14:49 -0800)]
am
d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
* commit '
d8c323321c28a0a5ff70c6e0694aa822edca4005':
Fixed technology name typo's.
Implement historical bytes / attrib on IsoDep
Provide system code and manufacturer code for Felica tech.
Fixed NfcAdapter init and getTechnology().
Secure Element access implementation
Rough first pass at the NFC technology API.
Revert "Merge "Remove the My Tag feature." into gingerbread"
Nick Pelly [Sun, 5 Dec 2010 22:46:29 +0000 (14:46 -0800)]
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
Nick Pelly [Sun, 5 Dec 2010 22:42:45 +0000 (14:42 -0800)]
Merge branch gingerbread-nfc into gingerbread.
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
Dianne Hackborn [Sun, 5 Dec 2010 22:12:19 +0000 (14:12 -0800)]
Merge "Fix up API definitions in master."
James Dong [Sun, 5 Dec 2010 22:07:58 +0000 (14:07 -0800)]
Merge "Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()"
Adam Powell [Sun, 5 Dec 2010 21:54:07 +0000 (13:54 -0800)]
Merge "Fix bug
3214215 - ListView should stay scrolled to the bottom in transcript mode after a resize"
Adam Powell [Sun, 5 Dec 2010 21:13:19 +0000 (13:13 -0800)]
Merge "Add public style for tabby-looking views"
Dianne Hackborn [Sun, 5 Dec 2010 21:11:57 +0000 (13:11 -0800)]
Merge "Update 9.xml to match the real GB 9.xml."
Irfan Sheriff [Sun, 5 Dec 2010 07:45:18 +0000 (23:45 -0800)]
am
bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit '
bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
DO NOT MERGE Avoid nullifying dhcp target
Shimeng (Simon) Wang [Sat, 4 Dec 2010 02:22:29 +0000 (18:22 -0800)]
Merge "Make sure the returned web view width is at least 0."
Irfan Sheriff [Sat, 4 Dec 2010 01:58:17 +0000 (17:58 -0800)]
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread