drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,261 Commits 1 Branch 0 Tags
Commit Graph

43261 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
c6c3e77d4d 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
592989b3b7 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
affeaaed8e 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
bf3aae10b5 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
7541a9a250 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
fe9b24f4cd Ignore a8d3f02a from honeycomb - already there 
Change-Id: Ife79875dbf547c23771fc6b8f66464c76c0a4468
 2011-02-10 14:49:12 -08:00
Gilles Debunne
aff2cfd14b resolved conflicts for merge of 8e28ab22 to honeycomb-plus-aosp 
Change-Id: Ic590c75a6d4475cc0a35f1af8687a4ee8846f20b
 2011-02-10 14:43:35 -08:00
Joe Malin
1fd7301e91 SDK docs: Hierarchy Viewer V2 
Change-Id: I6716eac083a8e054e52383ad76a5377c677ea40d
 2011-02-10 14:06:33 -08:00
Wink Saville
48fe5c3a86 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
b624eea70c 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
0d66a2ec42 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
9e5ffb55e8 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
58dacceb78 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
cc47600d4d am 47dac545: am 39cf3a44: Document NFC permissions. 
* commit '47dac545da6468e5b46e940917eb6711c02b8e84':
  Document NFC permissions.
 2011-02-10 13:52:34 -08:00
Jeff Hamilton
510ced64f4 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
bdf587e8b9 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
51d94b268a am 129c7372: am 3c01a139: rename SIP doc title 
* commit '129c73723f2241f762f485a9b5421bfae3cbbdcd':
  rename SIP doc title
 2011-02-10 13:50:44 -08:00
Scott Main
c06e7abe6f resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp 
Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
 2011-02-10 13:47:32 -08:00
Robert Ly
322891c689 Doc change: nfc dev guide 
Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
 2011-02-10 13:42:13 -08:00
Jason Sams
cbcd93352b Merge "Basic 101 level compute example for RS." into honeycomb 2011-02-10 13:06:16 -08:00
Katie McCormick
ce7c05e842 resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp 
Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc
 2011-02-10 12:38:07 -08:00
Mathias Agopian
b66b7a2c18 Merge "fix [3408713] Dialog window invisible sometimes" into honeycomb 2011-02-10 12:29:19 -08:00
Dirk Dougherty
12244c5796 Merge "Doc change: changes for 3.0 SDK" into honeycomb 2011-02-10 12:02:38 -08:00
Dirk Dougherty
6d9cf27460 Doc change: changes for 3.0 SDK 
Change-Id: If94d2bd65f396491d0f5de333dfe30d18628edc9
 2011-02-10 12:01:21 -08:00
Robert Ly
bbdc4ce254 Merge "clean up and add javadocs" into honeycomb 2011-02-10 10:15:14 -08:00
Alex Sakhartchouk
efc48eea15 Merge "HelloWorld graphics sample for Renderscript." into honeycomb 2011-02-10 09:53:30 -08:00
Alex Sakhartchouk
f1ff8b2fd6 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
Nick Pelly
a8d3f02aaa DO NOT MERGE 
Reconcile documentation updates from gingerbread to honeycomb.

Change-Id: I8c199906beb5cd3c290ded123d6aefd0d1697f30
 2011-02-09 23:43:24 -08:00
Mathias Agopian
37c2a37501 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
Jason Sams
716b27b69d Basic 101 level compute example for RS. 
Change-Id: Ic196ebdf558c1b9661182e191e31d7f62448e73a
 2011-02-09 17:11:34 -08:00
Gilles Debunne
8e28ab22de am 2050de5b: Text selection is broken. 
* commit '2050de5b9a5c097e30545ab822211d49031bd9dc':
  Text selection is broken.
 2011-02-09 16:49:42 -08:00
Robert Ly
11518acc8c clean up and add javadocs 
Change-Id: I7f628106247de887cd91c4a4b4b55d3ebfa700c8
 2011-02-09 16:24:12 -08:00
Alex Sakhartchouk
4123cc5efb HelloWorld graphics sample for Renderscript. 
Change-Id: I7f5c4813a207a37f67c563407369a1dbc1be250d
 2011-02-09 15:39:29 -08:00
Alex Sakhartchouk
85bccf6e0b 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
e05bd9ee7f 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
699a096943 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
0e40519bee Merge "Doc change: add diff report for API 11" into honeycomb 2011-02-09 15:19:08 -08:00
Dirk Dougherty
e110975368 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
Gilles Debunne
2050de5b9a Text selection is broken. 
Bug 3439569

Lazy initialization code was not back-ported.

Change-Id: I9815f649891e2ddc602383488749144686ab1dd3
 2011-02-09 14:17:22 -08:00
Dirk Dougherty
fefa95a9c8 Doc change: Add version notes for Android 2.3.3. 2011-02-09 14:04:10 -08:00
Wink Saville
bdce3d2c35 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
01a5eba810 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
bfe9e9cf18 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
cc24170dc6 Merge "fix [3374821] Cannot take screenshot of HC preview" into honeycomb 2011-02-09 13:18:53 -08:00
Wink Saville
6e25789fbe Merge "Telephony: Fix cb sms implementation" 2011-02-09 13:09:24 -08:00
Mathias Agopian
d0f27f435e 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
ada1b6f297 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
Scott Main
b605869cd3 am 07cefd3c: add 2.3.3 announcement to site home page 
* commit '07cefd3cc3d8d27750e4fc725d9aec86250750dd':
  add 2.3.3 announcement to site home page
 2011-02-09 13:03:11 -08:00
Dirk Dougherty
bf5cde2f71 am be04bfd0: am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread 
* commit 'be04bfd09914bbabf715959170c32030072b65f4':
  Doc change: Add diff report for api 10.
 2011-02-09 12:19:54 -08:00
Gilles Debunne
54afc818af am 63bd55c7: am cdfe8999: Fix for multiple merge problem. 
* commit '63bd55c7bf6f5d9384ad25637a4f4a7d2ef8d441':
  Fix for multiple merge problem.
 2011-02-09 12:19:46 -08:00