Robert Ly
7e67e8bdfc
am 2be58282: Merge "Doc change: updating animation framework topic" into honeycomb
...
* commit '2be58282746de92773f6423d4ae55a2ef4e5f226':
Doc change: updating animation framework topic
2011-02-11 13:18:41 -08:00
Robert Ly
be46db59f1
am 997a6713: Merge "Doc change: renderscript dev guide" into honeycomb
...
* commit '997a671368c3b9f66f3a415876aaa94b391ab602':
Doc change: renderscript dev guide
2011-02-11 13:18:33 -08:00
Robert Ly
6619488871
am 322891c6: Doc change: nfc dev guide
...
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
Doc change: nfc dev guide
2011-02-11 13:18:31 -08:00
Robert Ly
b7425b51b5
Merge "Doc change: updating animation framework topic" into honeycomb
2011-02-11 13:15:55 -08:00
Robert Ly
5e349a4031
Merge "Doc change: renderscript dev guide" into honeycomb
2011-02-11 13:15:35 -08:00
James Dong
6a4db29916
am f9e7442a: Update sample code in documentation
...
* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
Update sample code in documentation
2011-02-11 11:56:33 -08:00
Jean-Baptiste Queru
6f436ed2b9
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
stubs
2011-02-11 10:16:45 -08:00
Jean-Baptiste Queru
fd32f41763
am 6901f963: am 93552de8: Merge "stubs"
...
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
stubs
2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
a240734bae
am 93552de8: Merge "stubs"
...
* commit '93552de8e305027fb003401e347b9493c64c981f':
stubs
2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
3edab5a44e
Merge "stubs"
2011-02-11 09:39:46 -08:00
Steve Block
58c40337d0
stubs
...
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
2011-02-11 09:33:40 -08:00
Jason Sams
b74048a884
am cbcd9335: Merge "Basic 101 level compute example for RS." into honeycomb
...
* commit 'cbcd93352b9fff3ada4a01c3094b24e5fafde97f':
Basic 101 level compute example for RS.
2011-02-10 15:08:41 -08:00
Mathias Agopian
a878ce287d
am b66b7a2c: Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
...
* commit 'b66b7a2c183a1423ea629d4f73ed95f9b87d54b7':
fix [3408713] Dialog window invisible sometimes
2011-02-10 15:08:33 -08:00
Dirk Dougherty
c356865504
am 12244c57: Merge "Doc change: changes for 3.0 SDK" into honeycomb
...
* commit '12244c57960d85a066c94774e3e37685d0081213':
Doc change: changes for 3.0 SDK
2011-02-10 15:08:28 -08:00
Robert Ly
f779e9831d
am bbdc4ce2: Merge "clean up and add javadocs" into honeycomb
...
* commit 'bbdc4ce254e4918f771e448cd4fa9602679eaf2b':
clean up and add javadocs
2011-02-10 15:08:18 -08:00
Alex Sakhartchouk
ccfbd36925
am efc48eea: Merge "HelloWorld graphics sample for Renderscript." into honeycomb
...
* commit 'efc48eea1541990046248b86e899c72b58c8506f':
HelloWorld graphics sample for Renderscript.
2011-02-10 15:08:14 -08:00
Alex Sakhartchouk
d758cc306d
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.
2011-02-10 15:07:59 -08:00
Jean-Baptiste Queru
6d2cb2f356
Ignore a8d3f02a from honeycomb - already there
...
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
2011-02-10 14:49:12 -08:00
Gilles Debunne
23820f6a89
resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp
...
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
2011-02-10 14:43:35 -08:00
Wink Saville
11b5325535
am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
Telephony: Fix cb sms implementation
2011-02-10 13:53:10 -08:00
Mathias Agopian
71fcb03f87
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
2011-02-10 13:53:01 -08:00
Scott Main
3ac3afb0f3
am b605869c: am 07cefd3c: add 2.3.3 announcement to site home page
...
* commit 'b605869cd36c7498ca99cc00bad5d0dfbf237c43':
add 2.3.3 announcement to site home page
2011-02-10 13:52:57 -08:00
Jeff Hamilton
2ac5673e83
am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread
...
* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
More documentation updates for NFC.
2011-02-10 13:52:48 -08:00
Dirk Dougherty
0cbf55999f
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.
2011-02-10 13:52:40 -08:00
Nick Pelly
6f1ae086a9
am 47dac545: am 39cf3a44: Document NFC permissions.
...
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
Document NFC permissions.
2011-02-10 13:52:34 -08:00
Jeff Hamilton
165c1ad42f
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.
2011-02-10 13:52:23 -08:00
Eric Fischer
0c365669ad
am c1c31433: (-s ours) am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c1c314334757e0ab3c244023aec1b24433b66b48':
Import revised translations. DO NOT MERGE
2011-02-10 13:50:51 -08:00
Scott Main
22201fb079
am 129c7372: am 3c01a139: rename SIP doc title
...
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
rename SIP doc title
2011-02-10 13:50:44 -08:00
Scott Main
81363d359f
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
...
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
2011-02-10 13:47:32 -08:00
Jason Sams
5170719304
Merge "Basic 101 level compute example for RS." into honeycomb
2011-02-10 13:06:16 -08:00
Katie McCormick
b91f20af98
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp
...
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
2011-02-10 12:38:07 -08:00
Mathias Agopian
aa60b1f889
Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb
2011-02-10 12:29:19 -08:00
Dirk Dougherty
6ae328cec7
Merge "Doc change: changes for 3.0 SDK" into honeycomb
2011-02-10 12:02:38 -08:00
Robert Ly
13e49458c9
Merge "clean up and add javadocs" into honeycomb
2011-02-10 10:15:14 -08:00
Alex Sakhartchouk
4782b521f6
Merge "HelloWorld graphics sample for Renderscript." into honeycomb
2011-02-10 09:53:30 -08:00
Alex Sakhartchouk
4029472744
Merge "Cleanup of the code in view to do creation/destruction in the right places." into honeycomb
2011-02-10 09:51:34 -08:00
Mathias Agopian
7802bbd20f
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
2011-02-09 18:38:55 -08:00
Gilles Debunne
4dffae1718
am 2050de5b: Text selection is broken.
...
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
Text selection is broken.
2011-02-09 16:49:42 -08:00
Alex Sakhartchouk
31e6d2e0d3
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
2011-02-09 15:23:54 -08:00
Dirk Dougherty
257497d912
am 0e40519b: Merge "Doc change: add diff report for API 11" into honeycomb
...
* commit '0e40519beefe3d2ea0870a8eecac1a58f1fb6403':
Doc change: add diff report for API 11
2011-02-09 15:21:49 -08:00
Alex Sakhartchouk
65bcbcc831
Merge "DO NOT MERGE Removing an activity that shouldn't go into samples" into honeycomb
2011-02-09 15:20:21 -08:00
Dirk Dougherty
4917dbf6a5
Merge "Doc change: add diff report for API 11" into honeycomb
2011-02-09 15:19:08 -08:00
Dirk Dougherty
094217876b
am fefa95a9: Doc change: Add version notes for Android 2.3.3.
...
* commit 'fefa95a9c828d2b67227894b7ee3979504c0f52a':
Doc change: Add version notes for Android 2.3.3.
2011-02-09 14:20:06 -08:00
Wink Saville
614a618526
am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '01a5eba810bfdf5b111a7546814e174c1d57b6e7':
Telephony: Fix cb sms implementation
2011-02-09 13:45:37 -08:00
Wink Saville
76615d7b6f
am 6e25789f: Merge "Telephony: Fix cb sms implementation"
...
* commit '6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
2011-02-09 13:42:45 -08:00
Mathias Agopian
42ebf195b2
am cc24170d: Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
...
* commit 'cc24170dc653ea5fc9fe7b9b8c596700c4d6dc99':
fix [3374821] Cannot take screenshot of HC preview
2011-02-09 13:22:46 -08:00
Mathias Agopian
5d90264a79
Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb
2011-02-09 13:18:53 -08:00
Wink Saville
0db20b9d86
Merge "Telephony: Fix cb sms implementation"
2011-02-09 13:09:24 -08:00
Mathias Agopian
4ed86b8f5c
am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
...
* commit 'ada1b6f297596cac4451edbc83df060a31cdda68':
fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep
2011-02-09 13:09:12 -08:00
Mathias Agopian
6cb8fc11ee
Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
2011-02-09 13:06:00 -08:00