OSDN Git Service

android-x86/frameworks-base.git
13 years agoam ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb
Scott Main [Mon, 14 Feb 2011 20:35:36 +0000 (12:35 -0800)]
am ecd8fa06: Merge "docs: add clarification to split touch events" into honeycomb

* commit 'ecd8fa06e73b9d2ef6082af3f50e1daa194e9e08':
  docs: add clarification to split touch events

13 years agoMerge "docs: add clarification to split touch events" into honeycomb
Scott Main [Mon, 14 Feb 2011 20:33:10 +0000 (12:33 -0800)]
Merge "docs: add clarification to split touch events" into honeycomb

13 years agoam 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb
Katie McCormick [Mon, 14 Feb 2011 20:03:16 +0000 (12:03 -0800)]
am 28c3f5ca: Merge "Doc change: New docs for Loaders." into honeycomb

* commit '28c3f5ca436f466638012934b8f3f1f923158118':
  Doc change: New docs for Loaders.

13 years agoMerge "Doc change: New docs for Loaders." into honeycomb
Katie McCormick [Mon, 14 Feb 2011 20:01:04 +0000 (12:01 -0800)]
Merge "Doc change: New docs for Loaders." into honeycomb

13 years agoDoc change: New docs for Loaders.
Katie McCormick [Fri, 4 Feb 2011 23:31:29 +0000 (15:31 -0800)]
Doc change: New docs for Loaders.

Change-Id: I89e70576462ef9bf576fea2837572546b3a9b355

13 years agoam b254165a: Merge "docs: fix links" into honeycomb
Scott Main [Mon, 14 Feb 2011 19:46:38 +0000 (11:46 -0800)]
am b254165a: Merge "docs: fix links" into honeycomb

* commit 'b254165af83849c21276bf832759a38d889cd90e':
  docs: fix links

13 years agoam 2e805682: Merge "add compatible-screens manifest element and update supports-scree...
Scott Main [Mon, 14 Feb 2011 19:46:35 +0000 (11:46 -0800)]
am 2e805682: Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb

* commit '2e80568263924b13c59a24d4d28fecb903bbc2a9':
  add compatible-screens manifest element and update supports-screens element with resizeable attribute

13 years agoMerge "docs: fix links" into honeycomb
Scott Main [Mon, 14 Feb 2011 19:44:49 +0000 (11:44 -0800)]
Merge "docs: fix links" into honeycomb

13 years agoMerge "add compatible-screens manifest element and update supports-screens element...
Scott Main [Mon, 14 Feb 2011 19:44:10 +0000 (11:44 -0800)]
Merge "add compatible-screens manifest element and update supports-screens element with resizeable attribute" into honeycomb

13 years agodocs: add clarification to split touch events
Scott Main [Mon, 14 Feb 2011 19:37:50 +0000 (11:37 -0800)]
docs: add clarification to split touch events

Change-Id: If7904475a40905c603b5bf756fecc007073f6242

13 years agoam 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb
Joe Malin [Mon, 14 Feb 2011 19:28:52 +0000 (11:28 -0800)]
am 55ee1d66: Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb

* commit '55ee1d66981f1edef966562f11c60886138544ea':
  DOC CHANGE: Fix bug 3448489 - Monkeyrunner example

13 years agoMerge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb
Joe Malin [Mon, 14 Feb 2011 19:26:00 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Fix bug 3448489 - Monkeyrunner example" into honeycomb

13 years agodocs: fix links
Scott Main [Mon, 14 Feb 2011 19:23:48 +0000 (11:23 -0800)]
docs: fix links

Change-Id: I7aba4b06996caa55f8d47cab3b13505e37de86ca

13 years agoam ea72329b: docs: update 3.0 version notes
Scott Main [Mon, 14 Feb 2011 18:34:51 +0000 (10:34 -0800)]
am ea72329b: docs: update 3.0 version notes

* commit 'ea72329bcc360437d67492bc4f2c82e65e8ba841':
  docs: update 3.0 version notes

13 years agodocs: update 3.0 version notes
Scott Main [Thu, 10 Feb 2011 00:01:04 +0000 (16:01 -0800)]
docs: update 3.0 version notes

Change-Id: Ib864f2b0964877b69e119cdf8e21e710b5b5fbc4

13 years agoDOC CHANGE: Fix bug 3448489 - Monkeyrunner example
Joe Malin [Mon, 14 Feb 2011 18:29:12 +0000 (10:29 -0800)]
DOC CHANGE: Fix bug 3448489 - Monkeyrunner example

Change-Id: Ib997e9b0ef27a071c26774d139f19610404cdfbc

13 years agoam 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
Joe Malin [Mon, 14 Feb 2011 18:05:46 +0000 (10:05 -0800)]
am 83c8b8a3: Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb

* commit '83c8b8a3284063c201beccc79f14db6bd715dd82':
  Doc Change: Topics for copy/paste/drag/drop

13 years agoMerge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb
Joe Malin [Mon, 14 Feb 2011 18:03:33 +0000 (10:03 -0800)]
Merge "Doc Change: Topics for copy/paste/drag/drop" into honeycomb

13 years agoam 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.
Xavier Ducrohet [Mon, 14 Feb 2011 17:57:17 +0000 (09:57 -0800)]
am 02d2b5a4: LayoutLib: When possible ensure parsers are popped from the stack.

* commit '02d2b5a4031c80bfe1012ce2f4f7b3695762abd9':
  LayoutLib: When possible ensure parsers are popped from the stack.

13 years agoDoc Change: Topics for copy/paste/drag/drop
Joe Malin [Wed, 19 Jan 2011 22:33:23 +0000 (14:33 -0800)]
Doc Change: Topics for copy/paste/drag/drop

Change-Id: I755216fe9d2afca87a9adaeb99840142ff34a685

13 years agoLayoutLib: When possible ensure parsers are popped from the stack.
Xavier Ducrohet [Mon, 14 Feb 2011 04:15:50 +0000 (20:15 -0800)]
LayoutLib: When possible ensure parsers are popped from the stack.

Some parser consumers (seems to be mostly resource inflation)
don't use the pull parser up to the END_DOCUMENT tag, making
the parser not pop itself from the parser stack automatically.

This is likely due to the XML resources being very shallow (1-2 levels
max), and the inflater just reading the content that it expects instead
of parsing till the document is done.

This ensures that *some* parsers are pop'ed from the stack when
used. Some other parsers we don't really control and hope the
user will parse till END_DOCUMENT.

Change-Id: Ie1f5762983fed2b2ae97b896218ae12b493e7ad9

13 years agoam b269346c: am d4952380: fix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 17:25:30 +0000 (09:25 -0800)]
am b269346c: am d4952380: fix md5sum for windows installer

* commit 'b269346ca333a975d37ac50fec0c7b6a4c39a3de':
  fix md5sum for windows installer

13 years agoam d4952380: fix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 17:14:12 +0000 (09:14 -0800)]
am d4952380: fix md5sum for windows installer

* commit 'd49523809714b04636a9ac43de1c508ed1dbfc38':
  fix md5sum for windows installer

13 years agofix md5sum for windows installer
Scott Main [Mon, 14 Feb 2011 16:56:06 +0000 (08:56 -0800)]
fix md5sum for windows installer

Change-Id: I85a3f5c9c39b0bb5d9c8654c8b7702e7bd0235f2

13 years agoam bbcf2079: Merge "Fix struct initializer for balls." into honeycomb
Stephen Hines [Sat, 12 Feb 2011 00:47:04 +0000 (16:47 -0800)]
am bbcf2079: Merge "Fix struct initializer for balls." into honeycomb

* commit 'bbcf2079e9978ad6f75732070ce1dcc0dea3ea3f':
  Fix struct initializer for balls.

13 years agoam b9659336: Merge "Update Supported Media Formats document to include information...
Roman Nurik [Sat, 12 Feb 2011 00:44:52 +0000 (16:44 -0800)]
am b9659336: Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb

* commit 'b9659336c24ee9be8041132f0d9a1bca3ff6ed36':
  Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.

13 years agoMerge "Fix struct initializer for balls." into honeycomb
Stephen Hines [Sat, 12 Feb 2011 00:44:49 +0000 (16:44 -0800)]
Merge "Fix struct initializer for balls." into honeycomb

13 years agoMerge "Update Supported Media Formats document to include information about network...
Roman Nurik [Sat, 12 Feb 2011 00:43:32 +0000 (16:43 -0800)]
Merge "Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations." into honeycomb

13 years agoFix struct initializer for balls.
Stephen Hines [Sat, 12 Feb 2011 00:38:46 +0000 (16:38 -0800)]
Fix struct initializer for balls.

Bug: 3092382
Change-Id: Ie4e85177727b32f0a260fae53885c97bee111343

13 years agoam ccea5d27: Doc change: tools, adt, ndk release notes
Robert Ly [Sat, 12 Feb 2011 00:30:15 +0000 (16:30 -0800)]
am ccea5d27: Doc change: tools, adt, ndk release notes

* commit 'ccea5d27d37636db2669abec8a854fbd923440da':
  Doc change: tools, adt, ndk release notes

13 years agoDoc change: tools, adt, ndk release notes
Robert Ly [Fri, 11 Feb 2011 22:59:36 +0000 (14:59 -0800)]
Doc change: tools, adt, ndk release notes

Change-Id: I83f03b193995450f694e5f638bdb4a2cf90c0bdd

13 years agoam 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update...
Roman Nurik [Fri, 11 Feb 2011 23:42:57 +0000 (15:42 -0800)]
am 94be4a5e: Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.

* commit '94be4a5e1ad833d7e5d0dbed29b806ba8fd5409e':
  Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.

13 years agoam 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb
Adam Cohen [Fri, 11 Feb 2011 23:23:27 +0000 (15:23 -0800)]
am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb

* commit '5a1b63572bf52142aa880cccc92636e65600bb60':
  Adding StackWidget sample code

13 years agoDeprecate samples/index.html in favor of resource browser. Also update resources...
Roman Nurik [Fri, 11 Feb 2011 22:46:00 +0000 (14:46 -0800)]
Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code.

Change-Id: I0b98cf639a0c52343290227291620c88fd260774

13 years agoMerge "Adding StackWidget sample code" into honeycomb
Adam Cohen [Fri, 11 Feb 2011 23:19:38 +0000 (15:19 -0800)]
Merge "Adding StackWidget sample code" into honeycomb

13 years agoam 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets...
Winson Chung [Fri, 11 Feb 2011 23:15:33 +0000 (15:15 -0800)]
am 5f3cd3ea: Merge "Associated changes for \'Adding sample for collection widgets backed by content providers.\'" into honeycomb

* commit '5f3cd3eabb7bcf8a293f84e84b0acbef682d3c88':
  Associated changes for 'Adding sample for collection widgets backed by content providers.'

13 years agoMerge "Associated changes for 'Adding sample for collection widgets backed by content...
Winson Chung [Fri, 11 Feb 2011 23:07:06 +0000 (15:07 -0800)]
Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb

13 years agoUpdate Supported Media Formats document to include information about network protocol...
Roman Nurik [Fri, 21 Jan 2011 23:52:38 +0000 (15:52 -0800)]
Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations.

Change-Id: I905213a47c9da0476e8495ffa20344a8811d56bc

13 years agoresolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp
Robert Ly [Fri, 11 Feb 2011 21:49:09 +0000 (13:49 -0800)]
resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp

Conflicts:
docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2

13 years agoam 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:18:41 +0000 (13:18 -0800)]
am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb

* commit '2be58282746de92773f6423d4ae55a2ef4e5f226':
  Doc change: updating animation framework topic

13 years agoam 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:18:33 +0000 (13:18 -0800)]
am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb

* commit '997a671368c3b9f66f3a415876aaa94b391ab602':
  Doc change: renderscript dev guide

13 years agoam 322891c6: Doc change: nfc dev guide
Robert Ly [Fri, 11 Feb 2011 21:18:31 +0000 (13:18 -0800)]
am 322891c6: Doc change: nfc dev guide

* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide

13 years agoMerge "Doc change: updating animation framework topic" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:15:55 +0000 (13:15 -0800)]
Merge "Doc change: updating animation framework topic" into honeycomb

13 years agoMerge "Doc change: renderscript dev guide" into honeycomb
Robert Ly [Fri, 11 Feb 2011 21:15:35 +0000 (13:15 -0800)]
Merge "Doc change: renderscript dev guide" into honeycomb

13 years agoadd compatible-screens manifest element
Scott Main [Mon, 31 Jan 2011 23:40:59 +0000 (15:40 -0800)]
add compatible-screens manifest element
and update supports-screens element with resizeable attribute

Change-Id: I0f9247464572d126b725270b40074a390b0887bf

13 years agoam f9e7442a: Update sample code in documentation
James Dong [Fri, 11 Feb 2011 19:56:33 +0000 (11:56 -0800)]
am f9e7442a: Update sample code in documentation

* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
  Update sample code in documentation

13 years agoAssociated changes for 'Adding sample for collection widgets backed by content provid...
Winson Chung [Fri, 11 Feb 2011 03:11:33 +0000 (19:11 -0800)]
Associated changes for 'Adding sample for collection widgets backed by content providers.'

Change-Id: Ic872675f4645497dd1478b6c7e3074b029ea66ad

13 years agoam 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:16:45 +0000 (10:16 -0800)]
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"

* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
  stubs

13 years agoam 6901f963: am 93552de8: Merge "stubs"
Jean-Baptiste Queru [Fri, 11 Feb 2011 18:04:53 +0000 (10:04 -0800)]
am 6901f963: am 93552de8: Merge "stubs"

* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs

13 years agoam 93552de8: Merge "stubs"
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:54:59 +0000 (09:54 -0800)]
am 93552de8: Merge "stubs"

* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs

13 years agoMerge "stubs"
Jean-Baptiste Queru [Fri, 11 Feb 2011 17:39:46 +0000 (09:39 -0800)]
Merge "stubs"

13 years agostubs
Steve Block [Fri, 11 Feb 2011 00:04:48 +0000 (16:04 -0800)]
stubs

Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22

13 years agoDoc change: renderscript dev guide
Robert Ly [Wed, 9 Feb 2011 10:49:37 +0000 (02:49 -0800)]
Doc change: renderscript dev guide

Change-Id: I4a70e4659fa629fa16369c81ebc601c8b4b570e5

13 years agoDoc change: updating animation framework topic
Robert Ly [Sun, 6 Feb 2011 09:30:55 +0000 (01:30 -0800)]
Doc change: updating animation framework topic

Change-Id: Ideb386113a0fb027f62c1ed4215dd0bab79fdb72

13 years agoAdding StackWidget sample code
Adam Cohen [Fri, 11 Feb 2011 02:57:45 +0000 (18:57 -0800)]
Adding StackWidget sample code

Change-Id: I4c469f25147f733a3a09cdea0db407cd4e9f62ca

13 years agoUpdate sample code in documentation
James Dong [Thu, 10 Feb 2011 22:59:28 +0000 (14:59 -0800)]
Update sample code in documentation

bug - 3364497

Change-Id: I4cad247a403917aa7816350454c9ae3930dd3d25

13 years agoam cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
Jason Sams [Thu, 10 Feb 2011 23:08:41 +0000 (15:08 -0800)]
am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb

* commit 'cbcd93352b9fff3ada4a01c3094b24e5fafde97f':
  Basic 101 level compute example for RS.

13 years agoam b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
Mathias Agopian [Thu, 10 Feb 2011 23:08:33 +0000 (15:08 -0800)]
am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb

* commit 'b66b7a2c183a1423ea629d4f73ed95f9b87d54b7':
  fix [3408713] Dialog window invisible sometimes

13 years agoam 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
Dirk Dougherty [Thu, 10 Feb 2011 23:08:28 +0000 (15:08 -0800)]
am 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb

* commit '12244c57960d85a066c94774e3e37685d0081213':
  Doc change: changes for 3.0 SDK

13 years agoam bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
Robert Ly [Thu, 10 Feb 2011 23:08:18 +0000 (15:08 -0800)]
am bbdc4ce2: Merge "clean up and add javadocs" into honeycomb

* commit 'bbdc4ce254e4918f771e448cd4fa9602679eaf2b':
  clean up and add javadocs

13 years agoam efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
Alex Sakhartchouk [Thu, 10 Feb 2011 23:08:14 +0000 (15:08 -0800)]
am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb

* commit 'efc48eea1541990046248b86e899c72b58c8506f':
  HelloWorld graphics sample for Renderscript.

13 years agoam f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the...
Alex Sakhartchouk [Thu, 10 Feb 2011 23:07:59 +0000 (15:07 -0800)]
am f1ff8b2f: Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb

* commit 'f1ff8b2fd6441d122e84c5040834bf6e0d845b05':
  Cleanup of the code in view to do creation/destruction in the right places.

13 years agoIgnore a8d3f02a from honeycomb - already there
Jean-Baptiste Queru [Thu, 10 Feb 2011 22:48:53 +0000 (14:48 -0800)]
Ignore a8d3f02a from honeycomb - already there

Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468

13 years agoresolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
Gilles Debunne [Thu, 10 Feb 2011 22:43:35 +0000 (14:43 -0800)]
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp

Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b

13 years agoam bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
Wink Saville [Thu, 10 Feb 2011 21:53:10 +0000 (13:53 -0800)]
am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
  Telephony: Fix cb sms implementation

13 years agoam d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerom...
Mathias Agopian [Thu, 10 Feb 2011 21:53:01 +0000 (13:53 -0800)]
am d0f27f43: am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread

* commit 'd0f27f435eb8a2c7e5841da68760d1f023fcf919':
  fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep

13 years agoam b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
Scott Main [Thu, 10 Feb 2011 21:52:57 +0000 (13:52 -0800)]
am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page

* commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43':
  add 2.3.3 announcement to site home page

13 years agoam c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
Jeff Hamilton [Thu, 10 Feb 2011 21:52:48 +0000 (13:52 -0800)]
am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread

* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
  More documentation updates for NFC.

13 years agoam 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3...
Dirk Dougherty [Thu, 10 Feb 2011 21:52:40 +0000 (13:52 -0800)]
am 8d56f6de: am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread

* commit '8d56f6decf9efd29b286e02c549510d681b7573d':
  Doc change: Add version notes for Android 2.3.3.

13 years agoam 47dac545: am 39cf3a44: Document NFC permissions.
Nick Pelly [Thu, 10 Feb 2011 21:52:34 +0000 (13:52 -0800)]
am 47dac545: am 39cf3a44: Document NFC permissions.

* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
  Document NFC permissions.

13 years agoam 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch....
Jeff Hamilton [Thu, 10 Feb 2011 21:52:23 +0000 (13:52 -0800)]
am 1ac35411: am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread

* commit '1ac35411f186dca346e8d9078a4fd2d570bb8a97':
  Improve the docs a bit for foreground dispatch.

13 years agoam c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE...
Eric Fischer [Thu, 10 Feb 2011 21:50:51 +0000 (13:50 -0800)]
am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
  Import revised translations.  DO NOT MERGE

13 years agoam 129c7372: am 3c01a139: rename SIP doc title
Scott Main [Thu, 10 Feb 2011 21:50:44 +0000 (13:50 -0800)]
am 129c7372: am 3c01a139: rename SIP doc title

* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
  rename SIP doc title

13 years agoresolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
Scott Main [Thu, 10 Feb 2011 21:47:32 +0000 (13:47 -0800)]
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp

Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7

13 years agoDoc change: nfc dev guide
Robert Ly [Thu, 10 Feb 2011 21:42:13 +0000 (13:42 -0800)]
Doc change: nfc dev guide

Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

13 years agoMerge "Basic 101 level compute example for RS." into honeycomb
Jason Sams [Thu, 10 Feb 2011 21:06:16 +0000 (13:06 -0800)]
Merge "Basic 101 level compute example for RS." into honeycomb

13 years agoresolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
Katie McCormick [Thu, 10 Feb 2011 20:38:07 +0000 (12:38 -0800)]
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp

Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc

13 years agoMerge "fix [3408713] Dialog window invisible sometimes" into honeycomb
Mathias Agopian [Thu, 10 Feb 2011 20:29:19 +0000 (12:29 -0800)]
Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb

13 years agoMerge "Doc change: changes for 3.0 SDK" into honeycomb
Dirk Dougherty [Thu, 10 Feb 2011 20:02:38 +0000 (12:02 -0800)]
Merge "Doc change: changes for 3.0 SDK" into honeycomb

13 years agoDoc change: changes for 3.0 SDK
Dirk Dougherty [Wed, 9 Feb 2011 02:39:55 +0000 (18:39 -0800)]
Doc change: changes for 3.0 SDK

Change-Id: If94d2bd65f396491d0f5de333dfe30d18628edc9

13 years agoMerge "clean up and add javadocs" into honeycomb
Robert Ly [Thu, 10 Feb 2011 18:15:14 +0000 (10:15 -0800)]
Merge "clean up and add javadocs" into honeycomb

13 years agoMerge "HelloWorld graphics sample for Renderscript." into honeycomb
Alex Sakhartchouk [Thu, 10 Feb 2011 17:53:30 +0000 (09:53 -0800)]
Merge "HelloWorld graphics sample for Renderscript." into honeycomb

13 years agoMerge "Cleanup of the code in view to do creation/destruction in the right places...
Alex Sakhartchouk [Thu, 10 Feb 2011 17:51:34 +0000 (09:51 -0800)]
Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb

13 years agoDO NOT MERGE
Nick Pelly [Thu, 3 Feb 2011 06:37:40 +0000 (22:37 -0800)]
DO NOT MERGE

Reconcile documentation updates from gingerbread to honeycomb.

Change-Id: I8c199906beb5cd3c290ded123d6aefd0d1697f30

13 years agofix [3408713] Dialog window invisible sometimes
Mathias Agopian [Thu, 10 Feb 2011 02:38:55 +0000 (18:38 -0800)]
fix [3408713] Dialog window invisible sometimes

weak pointer comparison operators were implemented wrong,
they were using the internal "unsafe" pointer. We could end up
with two "equal" weak pointer pointing to different objects.

this caused KeyedVector keyed by weak pointer to work incorrectly, in
turn causing a window that just got added to a list to be immediately
removed.

Change-Id: Ib191010c39aafa9229109e4211f6c3b2b2f9696d

13 years agoBasic 101 level compute example for RS.
Jason Sams [Thu, 10 Feb 2011 01:11:28 +0000 (17:11 -0800)]
Basic 101 level compute example for RS.

Change-Id: Ic196ebdf558c1b9661182e191e31d7f62448e73a

13 years agoam 2050de5b: Text selection is broken.
Gilles Debunne [Thu, 10 Feb 2011 00:49:42 +0000 (16:49 -0800)]
am 2050de5b: Text selection is broken.

* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.

13 years agoclean up and add javadocs
Robert Ly [Wed, 9 Feb 2011 21:57:06 +0000 (13:57 -0800)]
clean up and add javadocs

Change-Id: I7f628106247de887cd91c4a4b4b55d3ebfa700c8

13 years agoHelloWorld graphics sample for Renderscript.
Alex Sakhartchouk [Wed, 9 Feb 2011 23:39:29 +0000 (15:39 -0800)]
HelloWorld graphics sample for Renderscript.

Change-Id: I7f5c4813a207a37f67c563407369a1dbc1be250d

13 years agoam 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples...
Alex Sakhartchouk [Wed, 9 Feb 2011 23:23:54 +0000 (15:23 -0800)]
am 699a0969: Merge "DO NOT MERGE Removing an activity that shouldn\'t go into samples" into honeycomb

* commit '699a0969434b6ee434dd9f5f212fe1bb914fdf0d':
  DO NOT MERGE Removing an activity that shouldn't go into samples

13 years agoam 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 23:21:49 +0000 (15:21 -0800)]
am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb

* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
  Doc change: add diff report for API 11

13 years agoMerge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb
Alex Sakhartchouk [Wed, 9 Feb 2011 23:20:21 +0000 (15:20 -0800)]
Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb

13 years agoMerge "Doc change: add diff report for API 11" into honeycomb
Dirk Dougherty [Wed, 9 Feb 2011 23:19:08 +0000 (15:19 -0800)]
Merge "Doc change: add diff report for API 11" into honeycomb

13 years agoam fefa95a9: Doc change: Add version notes for Android 2.3.3.
Dirk Dougherty [Wed, 9 Feb 2011 22:20:06 +0000 (14:20 -0800)]
am fefa95a9: Doc change: Add version notes for Android 2.3.3.

* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
  Doc change: Add version notes for Android 2.3.3.

13 years agoText selection is broken.
Gilles Debunne [Wed, 9 Feb 2011 22:17:22 +0000 (14:17 -0800)]
Text selection is broken.

Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3

13 years agoDoc change: Add version notes for Android 2.3.3.
Dirk Dougherty [Tue, 8 Feb 2011 01:32:11 +0000 (17:32 -0800)]
Doc change: Add version notes for Android 2.3.3.

13 years agoam 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
Wink Saville [Wed, 9 Feb 2011 21:45:37 +0000 (13:45 -0800)]
am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
  Telephony: Fix cb sms implementation

13 years agoam 6e25789f: Merge "Telephony: Fix cb sms implementation"
Wink Saville [Wed, 9 Feb 2011 21:42:45 +0000 (13:42 -0800)]
am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit '6e25789fbe7ac283021156b17f406acb48850292':
  Telephony: Fix cb sms implementation

13 years agoam cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
Mathias Agopian [Wed, 9 Feb 2011 21:22:46 +0000 (13:22 -0800)]
am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb

* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
  fix [3374821] Cannot take screenshot of HC preview

13 years agoMerge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
Mathias Agopian [Wed, 9 Feb 2011 21:18:53 +0000 (13:18 -0800)]
Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb