LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,284 Commits 2 Branches 0 Tags
39a2f958e374bfac508ce34c7b0027bf5f69f97e
Commit Graph

8284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
39a2f958e3 Merge "New compute sample for simple image processing." into graphics-dev 2011-11-18 17:48:27 -08:00
Jason Sams
f347e62207 New compute sample for simple image processing. 
Change-Id: I0aeada2d425a0e4f915fc2f8f8af111329297709
 2011-11-18 16:26:14 -08:00
The Android Open Source Project
1596de8fbd am 243d1e27: Reconcile with ics-mr1-release 
* commit '243d1e27f7b6788c2a05a7e010baae4a5c290927':
 2011-11-18 15:44:00 -08:00
The Android Open Source Project
243d1e27f7 Reconcile with ics-mr1-release 
Change-Id: I071634b40bad4ccdf306f8dfc881ea6630bbab7d
 2011-11-18 15:42:21 -08:00
Jean-Baptiste Queru
b4d3ec2416 am 2cb7d006: am 189281a7: am 8dca56ba: Add missing -lX11 on the link line. 
* commit '2cb7d006ac85333f152905b1bf726f8fa8017eb3':
  Add missing -lX11 on the link line.
 2011-11-18 15:27:25 -08:00
Svetoslav Ganov
ab573421b9 am 84ed1bb1: am 19c93bac: am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit '84ed1bb1de1ee6eda2498e56a0ddca890ccf0fa7':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 15:27:25 -08:00
Jean-Baptiste Queru
2cb7d006ac am 189281a7: am 8dca56ba: Add missing -lX11 on the link line. 
* commit '189281a755ef5df5d16be0b94dd3e71059f28e92':
  Add missing -lX11 on the link line.
 2011-11-18 15:23:15 -08:00
Svetoslav Ganov
84ed1bb1de am 19c93bac: am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit '19c93baca796c7cd9c7317e6a68d2f4cabbf915b':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 15:22:35 -08:00
Jean-Baptiste Queru
189281a755 am 8dca56ba: Add missing -lX11 on the link line. 
* commit '8dca56ba8d98c40fee0e6d547a49b0f7325efffc':
  Add missing -lX11 on the link line.
 2011-11-18 13:50:33 -08:00
Jean-Baptiste Queru
8dca56ba8d Add missing -lX11 on the link line. 
Change-Id: I881c1740bc6ae3a4086f6a400b5d0b9973b61a78
 2011-11-18 12:08:39 -08:00
Svetoslav Ganov
19c93baca7 am cd2db139: Add the support libraries to the platform documentation (demos). 
* commit 'cd2db139ae4bbfbe7f8fa74a8b899328f2ff3c77':
  Add the support libraries to the platform documentation (demos).
 2011-11-18 10:14:03 -08:00
Fred Chung
0b489a4995 am 0ddf5b01: am b1ea3257: (-s ours) am b47c44c2: am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit '0ddf5b014052cdaafafa52503bdf4f5ac21e6979':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 16:00:23 -08:00
Fred Chung
0ddf5b0140 am b1ea3257: (-s ours) am b47c44c2: am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit 'b1ea3257b3b98963e2cd38077649ba670d863953':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 15:56:32 -08:00
Svetoslav Ganov
cd2db139ae Add the support libraries to the platform documentation (demos). 
Updated the support demos due to renamed support classes.

bug:5629339

Change-Id: Ia94cd60ea2b89ad74003baaa8eb8e84d21822374
 2011-11-17 15:15:24 -08:00
Fred Chung
b1ea3257b3 am b47c44c2: am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit 'b47c44c2101199049c37d9c06c8906d24a9d2f10':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 14:53:42 -08:00
Fred Chung
b47c44c210 am 512ea9b6: DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b 
* commit '512ea9b6f8cc75ec74a7ab8d1c38dec201667f1e':
  DO NOT MERGE: SDK sample code for Bluetooth HDP API. Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-17 14:49:25 -08:00
James Dong
c6d75104ad am 43a67b48: am b62c5b91: am f8781452: Update the media_profiles.xml file to include maximum memory usage support for video editor 
* commit '43a67b48c213c6264de6024d7b3eca2f296adff1':
  Update the media_profiles.xml file to include maximum memory usage support for video editor
 2011-11-17 07:52:01 -08:00
James Dong
43a67b48c2 am b62c5b91: am f8781452: Update the media_profiles.xml file to include maximum memory usage support for video editor 
* commit 'b62c5b9156d589ea8aaa6c441530b2ef371f1915':
  Update the media_profiles.xml file to include maximum memory usage support for video editor
 2011-11-17 07:48:19 -08:00
The Android Automerger
b911dde9d4 merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:45:52 -08:00
Fred Chung
839427847c am 4c23a87d: am e39ad49b: am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 
* commit '4c23a87d7a05452a33644a7418db8be16b1ed63d':
  SDK sample code for Bluetooth HDP API.
 2011-11-17 04:10:53 -08:00
Fred Chung
4c23a87d7a am e39ad49b: am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 
* commit 'e39ad49b453230058ff77df70565360975a68f04':
  SDK sample code for Bluetooth HDP API.
 2011-11-17 04:08:25 -08:00
James Dong
b62c5b9156 am f8781452: Update the media_profiles.xml file to include maximum memory usage support for video editor 
* commit 'f8781452d95b9a14a656706981c0005fd1b3a2ef':
  Update the media_profiles.xml file to include maximum memory usage support for video editor
 2011-11-16 17:41:21 -08:00
Fred Chung
512ea9b6f8 DO NOT MERGE: SDK sample code for Bluetooth HDP API. 
Cherry pick from ics-mr1 Change ID I0f68ba42309c960f0df1e537b0932c6d68d9657b

Change-Id: I1d5e37fc24d82f8f9f846c82b93f68dcc58d95cc
 2011-11-16 15:26:28 -08:00
James Dong
f8781452d9 Update the media_profiles.xml file to include maximum memory usage support for video editor 
Change-Id: I26eacaaca76b72fc5a43ee8fabacf62060418edd
related-to-bug: 5625690
 2011-11-16 14:37:49 -08:00
Fred Chung
e39ad49b45 am 053c4648: Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 
* commit '053c46485bd24cdef4f0bbbe224cbaa1ba3d7f9b':
  SDK sample code for Bluetooth HDP API.
 2011-11-16 09:48:18 -08:00
Fred Chung
053c46485b Merge "SDK sample code for Bluetooth HDP API." into ics-mr1 2011-11-16 09:31:44 -08:00
The Android Automerger
0c5793c94d merge in ics-mr1-release history after reset to ics-mr1 2011-11-16 06:45:39 -08:00
Mathias Agopian
4f2055d9f5 am 31700968: am b81d6b19: am fb305664: Merge "should fix sdk build" into ics-mr1 
* commit '3170096834e0b4ed321a973de4fc3777cd22f431':
  should fix sdk build
 2011-11-15 21:17:36 -08:00
Mathias Agopian
3170096834 am b81d6b19: am fb305664: Merge "should fix sdk build" into ics-mr1 
* commit 'b81d6b19ecd1cba24bb1093855b4b2c423de36bf':
  should fix sdk build
 2011-11-15 21:15:56 -08:00
Mathias Agopian
b81d6b19ec am fb305664: Merge "should fix sdk build" into ics-mr1 
* commit 'fb30566416499d441718af4bc9956404270f25ec':
  should fix sdk build
 2011-11-15 21:13:28 -08:00
Mathias Agopian
fb30566416 Merge "should fix sdk build" into ics-mr1 2011-11-15 21:11:21 -08:00
Mathias Agopian
9c14396791 should fix sdk build 
Change-Id: I5b403056f5245eae9a6476d9d573a3b1c25ea0c6
 2011-11-15 21:09:15 -08:00
Svetoslav Ganov
ccd14a7b8e am 3af68288: am 402d3fd4: am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 
* commit '3af6828840772003479c1917a25552a95826665c':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
 2011-11-15 14:43:05 -08:00
Svetoslav Ganov
3af6828840 am 402d3fd4: am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 
* commit '402d3fd41838dc6a098ec3482f83b20b32df29f4':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
 2011-11-15 14:40:44 -08:00
Svetoslav Ganov
402d3fd418 am 41867b63: Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 
* commit '41867b639fb02d9606d4f30359cafc66498f0cbd':
  Fix the support-v4 demos to work on a platform with APIs V4 (samples part)
 2011-11-15 14:38:04 -08:00
Svetoslav Ganov
41867b639f Merge "Fix the support-v4 demos to work on a platform with APIs V4 (samples part)" into ics-mr1 2011-11-15 14:34:53 -08:00
Svetoslav Ganov
a09e21a223 Fix the support-v4 demos to work on a platform with APIs V4 (samples part) 
Some of the samples are using APIs that are introduced after v4 but not supported
in the v4 library.  Update the samples to use the new stuff added to the support
library.

bug:5616340

Change-Id: I90889f5e9ee48e7e30249464e60d5d28cd3f7a4b
 2011-11-15 11:38:45 -08:00
The Android Automerger
cfb2cc2120 merge in ics-mr1-release history after reset to ics-mr1 2011-11-15 06:45:30 -08:00
Dianne Hackborn
7262991d27 am 0efad946: am f1ab1a8e: am 2fd75c63: Move switch preference into its own demo. 
* commit '0efad946bda1103f170e505e01de52248176337a':
  Move switch preference into its own demo.
 2011-11-15 04:11:34 -08:00
Fred Chung
14c26228cd SDK sample code for Bluetooth HDP API. 
Change-Id: I0f68ba42309c960f0df1e537b0932c6d68d9657b
 2011-11-14 21:36:25 -08:00
Dianne Hackborn
0efad946bd am f1ab1a8e: am 2fd75c63: Move switch preference into its own demo. 
* commit 'f1ab1a8e26c89442b758c56613a47e35e71d2ef5':
  Move switch preference into its own demo.
 2011-11-14 14:38:27 -08:00
Dianne Hackborn
f1ab1a8e26 am 2fd75c63: Move switch preference into its own demo. 
* commit '2fd75c63684e4ada9e00e1d31304519e60f5a22a':
  Move switch preference into its own demo.
 2011-11-14 14:35:56 -08:00
Dianne Hackborn
2fd75c6368 Move switch preference into its own demo. 
This avoids everything breaking on pre-ICS platforms.

Also get rid of pref initialization in Application. I hate that.  Hate
hate hate.  Hate.  Totally hate.

Totally.

Change-Id: Idb3526a96eb2dff49f9de8e5ae71149cb4ed6e96
 2011-11-14 14:28:42 -08:00
Jason Sams
16e433ce4a Merge "Fix build" into graphics-dev 2011-11-10 16:54:15 -08:00
Jason Sams
b3f32a8ab9 Fix build 
Change-Id: If6d85bf9e9e54613c6dbf7eae4be902142400251
 2011-11-10 15:28:08 -08:00
The Android Open Source Project
b9f27a5dcc Reconcile with ics-mr1-release 
Change-Id: Icbe033444524bc3b55a7dfb4fa21fca1f3b65b51
 2011-11-10 14:35:22 -08:00
Vladimir Chtchetkine
8d21ceda27 Merge "Fix temperature sensor" 2011-11-09 18:42:40 -08:00
Vladimir Chtchetkine
50ab613ece Fix temperature sensor 
Change-Id: I4cc1264f4437172e78b38ce394e4dd005ad1a59f
 2011-11-09 18:02:21 -08:00
Yu Shan Emily Lau
a97b2c8e45 am 145e160b: (-s ours) am d673b70d: am 6b415b7d: (-s ours) Merge "do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch" into ics-mr0 
* commit '145e160bfeb61c8bf3cfbd4242da4cde0d998df0':
 2011-11-10 01:11:31 +00:00
Yu Shan Emily Lau
c2837c2f34 am c7b60925: (-s ours) am 1baa142c: do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch 
* commit 'c7b60925d7ef7f6825bbb338f476198669a2b5c4':
  do not merge: cherry-picked Change-Id: I094dbc4ffa42771a13dfb796761546093649481c from master branch
 2011-11-09 21:50:48 +00:00