OSDN Git Service
Dan Morrill [Tue, 14 Dec 2010 19:31:29 +0000 (11:31 -0800)]
am
0ccc8b73: am
5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
* commit '
0ccc8b7345eac0b507c221be47e55926cbda8957':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
Dan Morrill [Tue, 14 Dec 2010 19:28:50 +0000 (11:28 -0800)]
am
5441a9ff: Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
* commit '
5441a9ff2128cf2c5088974c74b79d2d1734f755':
GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen).
Dan Morrill [Tue, 14 Dec 2010 19:27:20 +0000 (11:27 -0800)]
Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
Christopher Tate [Tue, 14 Dec 2010 18:32:05 +0000 (10:32 -0800)]
Merge "Time out orphaned / unresponsive restore sessions"
Christopher Tate [Tue, 14 Dec 2010 18:31:56 +0000 (10:31 -0800)]
Merge "Don't restore wildly wrong sized wallpapers"
Costin Manolache [Tue, 14 Dec 2010 18:20:41 +0000 (10:20 -0800)]
am
7afa1613: am
a848d344: Merge "Fix bug in permission grant system." into gingerbread
* commit '
7afa161368308e78bb4a66b4fd32558dfd556776':
Fix bug in permission grant system.
Costin Manolache [Tue, 14 Dec 2010 18:14:10 +0000 (10:14 -0800)]
am
a848d344: Merge "Fix bug in permission grant system." into gingerbread
* commit '
a848d3445090e114cbfe61f1c7449122a665fba6':
Fix bug in permission grant system.
Andreas Huber [Tue, 14 Dec 2010 18:11:28 +0000 (10:11 -0800)]
Merge "Properly signal the condition if we run out of input data."
Andreas Huber [Tue, 14 Dec 2010 18:11:11 +0000 (10:11 -0800)]
Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes."
Costin Manolache [Tue, 14 Dec 2010 18:07:26 +0000 (10:07 -0800)]
Merge "Fix bug in permission grant system." into gingerbread
Brad Fitzpatrick [Tue, 14 Dec 2010 00:52:35 +0000 (16:52 -0800)]
Framework-side support for Dalvik "isSensitiveThread" hook.
Used in lock contention stats.
Bug:
3226270
Change-Id: Ie6f58d130a29079a59bdefad40b80304d9bc3623
Chet Haase [Tue, 14 Dec 2010 17:18:33 +0000 (09:18 -0800)]
Merge "Adding TimeAnimator capability (hidden for now)"
satok [Tue, 14 Dec 2010 13:45:44 +0000 (05:45 -0800)]
Merge "Add a Setting preference "INPUT_METHOD_SELECTOR_VISIBILITY""
Joe Onorato [Tue, 14 Dec 2010 09:22:23 +0000 (01:22 -0800)]
Merge "notification panel animations"
Jason Sams [Tue, 14 Dec 2010 07:53:35 +0000 (23:53 -0800)]
Merge "More API updates."
satok [Tue, 14 Dec 2010 06:15:17 +0000 (22:15 -0800)]
Merge "Hide ime switch icon when there are only one IME and no enabled subtypes"
Mike Lockwood [Tue, 14 Dec 2010 06:03:14 +0000 (22:03 -0800)]
Merge "MTP: check for replacing existing files via the database instead of the file system"
Dianne Hackborn [Tue, 14 Dec 2010 04:54:48 +0000 (20:54 -0800)]
Merge "Fix issue #
3258849: Grab thumbnail when exiting an app via back"
Irfan Sheriff [Tue, 14 Dec 2010 03:25:59 +0000 (19:25 -0800)]
Merge "WPS fixes and refactor"
Roman Nurik [Tue, 14 Dec 2010 03:18:26 +0000 (19:18 -0800)]
am
483654fb: am
0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
* commit '
483654fb724c7aab619303b50025b6bb25431e87':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
Roman Nurik [Tue, 14 Dec 2010 03:15:28 +0000 (19:15 -0800)]
am
0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
* commit '
0a97435c8d776746bb3dcf16824e2cc81eee20aa':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
Roman Nurik [Tue, 14 Dec 2010 03:12:42 +0000 (19:12 -0800)]
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
Jeff Brown [Tue, 14 Dec 2010 02:33:00 +0000 (18:33 -0800)]
Merge "Make framework modifier key handling more precise."
Romain Guy [Tue, 14 Dec 2010 02:30:15 +0000 (18:30 -0800)]
Merge "Refactor OpenGLRenderer to simplify OpenGL drawing code."
Xavier Ducrohet [Tue, 14 Dec 2010 02:24:11 +0000 (18:24 -0800)]
Merge "LayoutLib: implement more of Canvas/Paint."
Gilles Debunne [Tue, 14 Dec 2010 02:11:51 +0000 (18:11 -0800)]
Merge "setTextIsSelectable documentation updated."
Adam Powell [Tue, 14 Dec 2010 02:06:00 +0000 (18:06 -0800)]
Merge "Fix bug
3281956 - Cherry-picked from GB"
Jaikumar Ganesh [Tue, 14 Dec 2010 00:49:50 +0000 (16:49 -0800)]
Merge "Remove delay with auto connection."
Scott Main [Tue, 14 Dec 2010 00:48:43 +0000 (16:48 -0800)]
Merge "docs: remove getting started guide for preview"
Chet Haase [Tue, 14 Dec 2010 00:47:00 +0000 (16:47 -0800)]
Merge "Fix artifact with concurrent add/remove LayoutTransitions"
Brad Fitzpatrick [Tue, 14 Dec 2010 00:30:17 +0000 (16:30 -0800)]
am
2d5b11ab: am
0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '
2d5b11aba0fec21e1ce3f358eb0d280b62704899':
Fix StrictMode javadoc copy/paste error.
Nick Kralevich [Tue, 14 Dec 2010 00:30:10 +0000 (16:30 -0800)]
am
30ad1e57: am
9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '
30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
Avoid leaking sockets.
Dianne Hackborn [Tue, 14 Dec 2010 00:28:01 +0000 (16:28 -0800)]
Merge "resolved conflicts for merge of
78e9f4cb to master"
Brad Fitzpatrick [Mon, 13 Dec 2010 23:27:25 +0000 (15:27 -0800)]
am
0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
* commit '
0927c9026537166cec36b2f9bb8a764ef8a7c606':
Fix StrictMode javadoc copy/paste error.
Brad Fitzpatrick [Mon, 13 Dec 2010 23:25:09 +0000 (15:25 -0800)]
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
Alex Sakhartchouk [Mon, 13 Dec 2010 23:24:20 +0000 (15:24 -0800)]
Merge "Perf test"
Nick Kralevich [Mon, 13 Dec 2010 23:05:20 +0000 (15:05 -0800)]
am
9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '
9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
Avoid leaking sockets.
Nick Kralevich [Mon, 13 Dec 2010 23:03:28 +0000 (15:03 -0800)]
Merge "Avoid leaking sockets." into gingerbread
Dianne Hackborn [Mon, 13 Dec 2010 22:55:25 +0000 (14:55 -0800)]
resolved conflicts for merge of
78e9f4cb to master
Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634
Romain Guy [Mon, 13 Dec 2010 22:43:41 +0000 (14:43 -0800)]
Merge "Improve error detection in HardwareRenderer.draw(). Bug #
3280872"
Dianne Hackborn [Mon, 13 Dec 2010 22:37:09 +0000 (14:37 -0800)]
am
e4a59519: Fix issue #
3154576: battery stats checkin should include UID -> packages+ map
* commit '
e4a5951925f16f18dae91ed65567e96528f17fee':
Fix issue #
3154576: battery stats checkin should include UID -> packages+ map
Brian Carlstrom [Mon, 13 Dec 2010 22:30:39 +0000 (14:30 -0800)]
Merge "Update API for CopyOnWriteArrayList "synchronized" changes"
Jim Miller [Mon, 13 Dec 2010 22:28:17 +0000 (14:28 -0800)]
Merge "Fix
3253629: Improve Recents panel animation performance."
Louis Huemiller [Mon, 13 Dec 2010 22:17:23 +0000 (14:17 -0800)]
Merge "Hardware Composer Stress Test Enhancements"
Mike Lockwood [Mon, 13 Dec 2010 21:54:09 +0000 (13:54 -0800)]
Merge "PowerManager: remove unused import"
Jaikumar Ganesh [Mon, 13 Dec 2010 21:42:42 +0000 (13:42 -0800)]
Merge "Add direct calls to Bluez to add SDP records."
Leon Scroggins [Mon, 13 Dec 2010 21:24:41 +0000 (13:24 -0800)]
Merge "Use black text on white background for dropdowns."
Louis Huemiller [Mon, 13 Dec 2010 07:05:31 +0000 (23:05 -0800)]
Hardware Composer Stress Test Enhancements
Enhancements include:
+ Change default delay after each set operation
from 0.1 to 0.0 seconds. This significantly
increases the default rate at which operations
are performed.
+ Make sourceCrop to displayFrame scale
factor of 1.0 a frequent occurance.
+ Enable use of RGB888 and YV12 graphic formats.
+ Add initCheck() call after creation of a
GraphicBuffer, to confirm it was created
without any errors.
Change-Id: I1606dff3924a23bdd5cb27ba302bebb4f200d768
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:12:36 +0000 (13:12 -0800)]
am
6d13b146: am
e78a0009: resolved conflicts for merge of
4b94c451 to stage-korg-master
* commit '
6d13b146e0444f40f45b9fe5812093c5e611b68e':
Added dropbox broadcast notification
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:10:23 +0000 (13:10 -0800)]
am
e78a0009: resolved conflicts for merge of
4b94c451 to stage-korg-master
* commit '
e78a000955c283509ee8a21b8b7e448060ac8dd8':
Added dropbox broadcast notification
Jean-Baptiste Queru [Mon, 13 Dec 2010 21:06:13 +0000 (13:06 -0800)]
resolved conflicts for merge of
4b94c451 to stage-korg-master
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
Brandon Keely [Mon, 13 Dec 2010 21:04:00 +0000 (13:04 -0800)]
Merge "Massaging system transitions."
Leon Scroggins [Mon, 13 Dec 2010 21:02:39 +0000 (13:02 -0800)]
Merge "Do not loop forever."
Mike Lockwood [Mon, 13 Dec 2010 20:39:28 +0000 (12:39 -0800)]
Merge "MediaScanner: No longer delete playlist files that have no valid entries"
Jean-Baptiste Queru [Mon, 13 Dec 2010 20:34:48 +0000 (12:34 -0800)]
Merge "Added dropbox broadcast notification"
Martijn Coenen [Mon, 13 Dec 2010 20:31:46 +0000 (12:31 -0800)]
am
6c247164: am
e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
* commit '
6c2471649b5b1d1d9c19305a43676161823b623a':
Fixed API for active NDEF reading and NDEF formatting.
Jeff Hamilton [Mon, 13 Dec 2010 20:31:38 +0000 (12:31 -0800)]
am
80c78a89: am
641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '
80c78a896f32461513b9750fc2869cd6b2795888':
First pass at advanced NFC tag dispatching APIs and other cleanup.
Martijn Coenen [Mon, 13 Dec 2010 20:31:29 +0000 (12:31 -0800)]
am
41e74b99: am
b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit '
41e74b991bc50bfa16ba920e998c76a88aa8ae69':
Changed technology close() to reconnect to the tag instead of physical disconnect.
Martijn Coenen [Mon, 13 Dec 2010 20:31:23 +0000 (12:31 -0800)]
am
2019f533: am
fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit '
2019f53396f5b45a307cc4b24123eb19b9a5246f':
Changed transceive on all technologies to "raw", except for Mifare classes.
Martijn Coenen [Mon, 13 Dec 2010 20:31:10 +0000 (12:31 -0800)]
am
25556f66: am
3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '
25556f666934c72ca53ad0f309078e3d4bd29ca9':
Implemented isWritable() to indicate NDEF capability container r/w state.
Kenny Root [Mon, 13 Dec 2010 20:29:06 +0000 (12:29 -0800)]
Merge "Introduce NDK API for 64-bit assets"
Nick Pelly [Mon, 13 Dec 2010 20:25:22 +0000 (12:25 -0800)]
Merge "resolved conflicts for merge of
1d0d1188 to master"
Nick Pelly [Mon, 13 Dec 2010 20:22:34 +0000 (12:22 -0800)]
resolved conflicts for merge of
1d0d1188 to master
Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717
Xavier Ducrohet [Mon, 13 Dec 2010 19:35:42 +0000 (11:35 -0800)]
Merge "LayoutLib: parsed resources were always set as platform res."
Adam Powell [Mon, 13 Dec 2010 18:52:04 +0000 (10:52 -0800)]
Merge "Update bg drawable properly on ActionBars based on earlier changes"
Adam Powell [Mon, 13 Dec 2010 18:47:07 +0000 (10:47 -0800)]
Merge "Smooth out gesture zooming in WebViews."
James Dong [Mon, 13 Dec 2010 18:33:33 +0000 (10:33 -0800)]
Merge "Revert "Allows the authoring engine to skip frame.""
Patrick Scott [Mon, 13 Dec 2010 17:30:27 +0000 (09:30 -0800)]
Merge "Suppress scrollbars during layer fling."
Jean-Michel Trivi [Mon, 13 Dec 2010 17:01:34 +0000 (09:01 -0800)]
Merge "Fix bug
3275151 Request and abandon audio focus with audio mode changes"
Chet Haase [Mon, 13 Dec 2010 16:15:57 +0000 (08:15 -0800)]
Merge "Add ability to reuse bitmaps when decoding PNG content"
Martijn Coenen [Mon, 13 Dec 2010 16:14:01 +0000 (08:14 -0800)]
am
e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
* commit '
e3f6336bcffc250da90ec864bccfa73ad1d016b9':
Fixed API for active NDEF reading and NDEF formatting.
Iain Merrick [Mon, 13 Dec 2010 14:22:49 +0000 (06:22 -0800)]
Merge "Move useChromiumHttpStack() from CookieManager to JniUtil."
Leon Scroggins [Mon, 13 Dec 2010 13:56:54 +0000 (05:56 -0800)]
Merge "Use drawLines to draw the outline of the WebTextView."
Mike Lockwood [Sun, 12 Dec 2010 20:22:57 +0000 (12:22 -0800)]
Merge "MTP: Add support for reserve storage setting to avoid low storage situations."
Jeff Hamilton [Sun, 12 Dec 2010 04:58:38 +0000 (20:58 -0800)]
am
641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '
641dd62155fd2eeddd93b2036154b13c05b70ba2':
First pass at advanced NFC tag dispatching APIs and other cleanup.
Jason Sams [Sun, 12 Dec 2010 02:52:37 +0000 (18:52 -0800)]
Merge "Add multitouch support to physics test. Fix context state overwrite calling invoke."
Martijn Coenen [Sat, 11 Dec 2010 04:40:40 +0000 (20:40 -0800)]
am
b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit '
b79173f6602359d00a1a89f4d6505a44d461d796':
Changed technology close() to reconnect to the tag instead of physical disconnect.
Martijn Coenen [Sat, 11 Dec 2010 04:40:34 +0000 (20:40 -0800)]
am
fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit '
fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
Changed transceive on all technologies to "raw", except for Mifare classes.
Martijn Coenen [Sat, 11 Dec 2010 04:40:26 +0000 (20:40 -0800)]
am
3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '
3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
Implemented isWritable() to indicate NDEF capability container r/w state.
James Dong [Sat, 11 Dec 2010 01:34:52 +0000 (17:34 -0800)]
Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers"
Nick Pelly [Sat, 11 Dec 2010 01:19:45 +0000 (17:19 -0800)]
am
ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
* commit '
ae56a851624c2b2e78da8a2c339d2caa64c4f981':
Make getSystemService(NFC_SERVICE) the NFC entry point.
Gilles Debunne [Sat, 11 Dec 2010 01:19:06 +0000 (17:19 -0800)]
Merge "TextView's runnable are stopped when the View is detached."
Gilles Debunne [Sat, 11 Dec 2010 01:18:37 +0000 (17:18 -0800)]
Merge "Modified OverScroller curves"
Nick Pelly [Sat, 11 Dec 2010 01:18:00 +0000 (17:18 -0800)]
Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
John Wang [Sat, 11 Dec 2010 00:55:36 +0000 (16:55 -0800)]
Merge "Notify voicemail only for voice-capable device."
Adam Powell [Sat, 11 Dec 2010 00:33:47 +0000 (16:33 -0800)]
Merge "Fix a bug where the fast scroll track would be positioned incorrectly."
Mathias Agopian [Sat, 11 Dec 2010 00:30:46 +0000 (16:30 -0800)]
Merge "[
3258939] Need snapshot to limit which layers are included"
Mathias Agopian [Sat, 11 Dec 2010 00:22:31 +0000 (16:22 -0800)]
[
3258939] Need snapshot to limit which layers are included
Change-Id: Id7351a0e3f53dde99b291cffba553d89fd4d7ca9
Jason Sams [Sat, 11 Dec 2010 00:06:19 +0000 (16:06 -0800)]
Merge "Remove CreateFromBitmapRef and add CopyTo(bitmap) replacement."
John Wang [Sat, 11 Dec 2010 00:05:51 +0000 (16:05 -0800)]
Merge "Block SMS service for non-sms-capable device."
Amith Yamasani [Fri, 10 Dec 2010 23:39:41 +0000 (15:39 -0800)]
Merge "Potential fix for Settings screen ClassCast exception on the phone."
Xia Wang [Fri, 10 Dec 2010 22:49:18 +0000 (14:49 -0800)]
Merge "Make Wi-Fi stress tests output log consistent. Fix: record average at the beginning of each iteration"
Romain Guy [Fri, 10 Dec 2010 22:42:21 +0000 (14:42 -0800)]
Merge "Ignore empty layers."
Brad Fitzpatrick [Fri, 10 Dec 2010 22:19:58 +0000 (14:19 -0800)]
Merge "StrictMode "custom" trigger support."
Gilles Debunne [Fri, 10 Dec 2010 21:50:51 +0000 (13:50 -0800)]
Merge "Selecting text from a punctuation sign selects previous word."
Dianne Hackborn [Fri, 10 Dec 2010 21:44:13 +0000 (13:44 -0800)]
Merge "Turn off screenshot capturing for thumbnails."
Adam Powell [Fri, 10 Dec 2010 21:30:37 +0000 (13:30 -0800)]
Merge "Fix bug
3257463 - Yes, we SHOULD put the child in the recycler."
Megha Joshi [Fri, 10 Dec 2010 20:52:19 +0000 (12:52 -0800)]
am
87c03b58: (-s ours) am
7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '
87c03b58a9468caec18b161128ab14de90764fd4':
Integrating webinar hosting with developer.android.com
Megha Joshi [Fri, 10 Dec 2010 20:33:59 +0000 (12:33 -0800)]
am
7a1f15b1: Merge "Integrating webinar hosting with developer.android.com" into gingerbread
* commit '
7a1f15b1497ba2a79243448f6ac5617264f8c8d3':
Integrating webinar hosting with developer.android.com
Romain Guy [Fri, 10 Dec 2010 20:33:34 +0000 (12:33 -0800)]
Merge "Correctly compare strings in UTF-8 instead of UTF-16 Bug #
3272858"