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

43236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Nurik
d822438fa7 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.
 2011-02-11 15:42:57 -08:00
Adam Cohen
c7f15f5cbb am 5a1b6357: Merge "Adding StackWidget sample code" into honeycomb 
* commit '5a1b63572bf52142aa880cccc92636e65600bb60':
  Adding StackWidget sample code
 2011-02-11 15:23:27 -08:00
Roman Nurik
94be4a5e1a Deprecate samples/index.html in favor of resource browser. Also update resources-data.js for Accelerometer, Accessibility, and StackWidget sample code. 
Change-Id: I0b98cf639a0c52343290227291620c88fd260774
 2011-02-11 15:21:49 -08:00
Adam Cohen
5a1b63572b Merge "Adding StackWidget sample code" into honeycomb 2011-02-11 15:19:38 -08:00
Winson Chung
4068390434 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.'
 2011-02-11 15:15:33 -08:00
Winson Chung
5f3cd3eabb Merge "Associated changes for 'Adding sample for collection widgets backed by content providers.'" into honeycomb 2011-02-11 15:07:06 -08:00
Roman Nurik
7641db4b3e Update Supported Media Formats document to include information about network protocols and provide video encoding recommendations. 
Change-Id: I905213a47c9da0476e8495ffa20344a8811d56bc
 2011-02-11 14:42:17 -08:00
Robert Ly
65bdc59ea0 resolved conflicts for merge of 810c1c0c to honeycomb-plus-aosp 
Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I42d55f7ae899a914dc3f1c8a55492411c28057a2
 2011-02-11 13:49:09 -08:00
Robert Ly
6059bb3e24 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
41d34195f9 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
810c1c0c35 am 322891c6: Doc change: nfc dev guide 
* commit '322891c689c845b5aa63dbca606967eb9f8f900b':
  Doc change: nfc dev guide
 2011-02-11 13:18:31 -08:00
Robert Ly
2be5828274 Merge "Doc change: updating animation framework topic" into honeycomb 2011-02-11 13:15:55 -08:00
Robert Ly
997a671368 Merge "Doc change: renderscript dev guide" into honeycomb 2011-02-11 13:15:35 -08:00
Scott Main
1b6dd05927 add compatible-screens manifest element 
and update supports-screens element with resizeable attribute

Change-Id: I0f9247464572d126b725270b40074a390b0887bf
 2011-02-11 13:00:52 -08:00
James Dong
d24d00ae1c am f9e7442a: Update sample code in documentation 
* commit 'f9e7442a0c0c7efc70d13fa9330baa797316154a':
  Update sample code in documentation
 2011-02-11 11:56:33 -08:00
Winson Chung
06d2fa705b Associated changes for 'Adding sample for collection widgets backed by content providers.' 
Change-Id: Ic872675f4645497dd1478b6c7e3074b029ea66ad
 2011-02-11 11:27:23 -08:00
Jean-Baptiste Queru
0ba97e3ff8 am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs" 
* commit '6d104f118a59e276eb577ae322f29c2ff8a5015a':
  stubs
 2011-02-11 10:16:45 -08:00
Jean-Baptiste Queru
6d104f118a am 6901f963: am 93552de8: Merge "stubs" 
* commit '6901f963c27f2d0a9caf56b42b6054d0cecc84d1':
  stubs
 2011-02-11 10:04:53 -08:00
Jean-Baptiste Queru
6901f963c2 am 93552de8: Merge "stubs" 
* commit '93552de8e305027fb003401e347b9493c64c981f':
  stubs
 2011-02-11 09:54:59 -08:00
Jean-Baptiste Queru
93552de8e3 Merge "stubs" 2011-02-11 09:39:46 -08:00
Steve Block
1da970625c stubs 
Change-Id: I6bc0b8e9d4412a0b60c6226fbd2b7a6d15aceb22
 2011-02-11 09:33:40 -08:00
Robert Ly
bc68067d25 Doc change: renderscript dev guide 
Change-Id: I4a70e4659fa629fa16369c81ebc601c8b4b570e5
 2011-02-10 21:37:03 -08:00
Robert Ly
676faeba90 Doc change: updating animation framework topic 
Change-Id: Ideb386113a0fb027f62c1ed4215dd0bab79fdb72
 2011-02-10 21:22:33 -08:00
Adam Cohen
fca67c5525 Adding StackWidget sample code 
Change-Id: I4c469f25147f733a3a09cdea0db407cd4e9f62ca
 2011-02-10 19:12:41 -08:00
James Dong
f9e7442a0c Update sample code in documentation 
bug - 3364497

Change-Id: I4cad247a403917aa7816350454c9ae3930dd3d25
 2011-02-10 18:48:31 -08:00
Jason Sams
e8d074d763 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
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
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