LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,559 Commits 2 Branches 0 Tags
2128eb22fd24ff4c6ec955f79950e0cebf7e448c
Commit Graph

8559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
cb0d49cd74 am eb178890: Merge " Adding a code sample for implementing accessibility in a custom view." into ics-mr1 
* commit 'eb1788903298fc12ac800fe8fcfc6b7adec7b258':
  Adding a code sample for implementing accessibility in a custom view.
 2011-11-30 18:20:12 -08:00
Svetoslav Ganov
eb17889032 Merge " Adding a code sample for implementing accessibility in a custom view." into ics-mr1 2011-11-30 18:18:33 -08:00
Svetoslav Ganov
cd362a83bf am bdf03ad7: Updating the Monkey commands due to framework changes. 
* commit 'bdf03ad735632ba585f53fea2e07d0e0c4973e20':
  Updating the Monkey commands due to framework changes.
 2011-11-30 17:54:49 -08:00
Svetoslav Ganov
bdf03ad735 Updating the Monkey commands due to framework changes. 
bug:5664337

Change-Id: I7093fb8a646b9363dde6eee87955330bedec117b
 2011-11-30 17:48:47 -08:00
Trevor Johns
f56101e2a3 Issue #5689186: Add Guava as a dependency for NFCDemo sample 
This adds Guava v10.0.1 as a dependency for development/samples/NFCDemo.
Without this, the sample does not build.

Also added a NOTICE file for NFCDemo to hold attribution for Guava.

Change-Id: I324e3984a2bd95d31be8d09bda3d2eb893edf831
 2011-11-30 17:04:39 -08:00
Svetoslav Ganov
a75233833c Adding a code sample for implementing accessibility in a custom view. 
bug:5683532

Change-Id: I79471c431ba3aeb4abe57f850e84a4da0bc1feba
 2011-11-29 13:02:58 -08:00
Chia-chi Yeh
9ad3f40880 Android VPN sample for ICS SDK 
Change-Id: I84e568625c5c9cc9b48f338e2d6226a8e9f67017
 2011-11-28 17:21:34 -08:00
The Android Automerger
4ae2c7e15f merge in ics-mr1-release history after reset to ics-mr1 2011-11-28 12:21:41 -08:00
Jean-Baptiste Queru
459d7f999f am a96a7c60: am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0 
* commit 'a96a7c6040f091777331745a4b31e2eb415a3a7a':
  Inaccvrate Morse data in sample code.
 2011-11-28 11:30:25 -08:00
Jean-Baptiste Queru
a96a7c6040 am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0 
* commit 'c4d810a43ce5d052812a453b488ef0cc7511dfda':
  Inaccvrate Morse data in sample code.
 2011-11-28 11:28:45 -08:00
Jean-Baptiste Queru
c4d810a43c Merge "Inaccvrate Morse data in sample code." into ics-mr0 2011-11-28 11:27:17 -08:00
Vladimir Chtchetkine
a2ba856963 am c0353726: Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1 
* commit 'c03537267d9da2124cdbf68d896bacf88d94cca9':
  Cherry-picked from 6f00e7fc in master. Do not merge.
 2011-11-23 15:16:08 -08:00
Vladimir Chtchetkine
c03537267d Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1 2011-11-23 15:14:20 -08:00
Xavier Ducrohet
e70a1d7725 am 60381093: am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge. 
* commit '603810939485089372245530fa3319dee850c776':
  Revert "Update the media_profiles.xml file to include..."  do not merge.
 2011-11-23 14:43:04 -08:00
Xavier Ducrohet
6038109394 am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge. 
* commit '2400b2c3402e6585437274f8acd5fd6e32367bb3':
  Revert "Update the media_profiles.xml file to include..."  do not merge.
 2011-11-23 14:41:05 -08:00
Xavier Ducrohet
2400b2c340 Revert "Update the media_profiles.xml file to include..." do not merge. 
This reverts commit a8fe85ea64.
 2011-11-23 14:36:58 -08:00
Xavier Ducrohet
e80c652add am 2d003a27: am 2310657c: Move support lib to rev 5. 
* commit '2d003a274d9138d78947a1f5bf315492afb64002':
  Move support lib to rev 5.
 2011-11-23 14:07:07 -08:00
James Dong
442304a15a am d2c0b7d4: am a8fe85ea: Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
* commit 'd2c0b7d4ac768a6cc706d17a59671c02b2177da0':
  Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
 2011-11-23 14:07:07 -08:00
Vladimir Chtchetkine
23fbec9592 am 9a1a290e: am fd1bdd61: Update supported frame sizes for fake camera. do not merge. 
* commit '9a1a290e58df454c07ed447693585a819642e3e0':
  Update supported frame sizes for fake camera. do not merge.
 2011-11-23 14:07:06 -08:00
Xavier Ducrohet
2d003a274d am 2310657c: Move support lib to rev 5. 
* commit '2310657c422924ef91a845d16e562acf10bc2797':
  Move support lib to rev 5.
 2011-11-23 14:04:31 -08:00
James Dong
d2c0b7d4ac am a8fe85ea: Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
* commit 'a8fe85ea64b82cdee7ba0ec4d3d2a211da8c24f4':
  Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
 2011-11-23 14:04:30 -08:00
Vladimir Chtchetkine
9a1a290e58 am fd1bdd61: Update supported frame sizes for fake camera. do not merge. 
* commit 'fd1bdd611a2954bfb171548b8fa288b0319a0aa9':
  Update supported frame sizes for fake camera. do not merge.
 2011-11-23 14:04:29 -08:00
Xavier Ducrohet
2310657c42 Move support lib to rev 5. 
Change-Id: I8163752e9913cdadd0d17a1ec2bbf6b8e7efa9ae
 2011-11-23 14:01:59 -08:00
James Dong
a8fe85ea64 Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
related-to-bug: 5625690

(cherry picked from commit f8781452d9)

Change-Id: Id27eb9052f00328ba04bac8486c9ed23f3c6a09b
 2011-11-23 13:14:50 -08:00
Vladimir Chtchetkine
fd1bdd611a Update supported frame sizes for fake camera. do not merge. 
Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

(cherry picked from commit 6f00e7fc48)

Change-Id: Ic50225e1700ea3b04ae5445549548f2ffe4ae2df
 2011-11-23 13:14:16 -08:00
Jean-Baptiste Queru
cf2051ab22 Inaccvrate Morse data in sample code. 
This vses the trve seqvence, svch that vsers can be
vnderstood vpon revsing this data, thvs bypassing
svrprising qvestions.

Change-Id: I1741d0c4072ab43975981799f602a6a6cda25088
 2011-11-23 08:14:10 -08:00
Vladimir Chtchetkine
4d9806f561 Cherry-picked from 6f00e7fc in master. Do not merge. 
Update supported frame sizes for fake camera

Camera framework requires 352x288, and 320x240 frames for video preview and video
recording. If these dimensions are missing in camera properties the camera app
may abort when entering video mode, or start video recording.

Also truned off switching fake frames, leaving only the checker board.

Change-Id: I63d145c967f1ba83992141ec97700f094a9d53a7
 2011-11-23 06:51:53 -08:00
Jean-Baptiste Queru
62c9a8aca2 am 31ef1de4: Revert "Add missing -lX11 on the link line." 
* commit '31ef1de4590c4c88f3f5d85ccc44e53c8fa56cde':
  Revert "Add missing -lX11 on the link line."
 2011-11-22 17:14:06 -08:00
Jean-Baptiste Queru
31ef1de459 Revert "Add missing -lX11 on the link line." 
This reverts commit 8dca56ba8d.
 2011-11-22 17:10:27 -08:00
Jesse Hall
3414178724 am 3a655154: am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit '3a655154d00e5ea67218bc3b5afb09b654a17156':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:46:25 -08:00
Jesse Hall
3a655154d0 am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit 'af4f66be50b17c8b8fce1dda53389bb0a10968ba':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:43:26 -08:00
Jesse Hall
afc9f5bcfe am 25902c05: am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit '25902c05406daaaa1605e13a30b1323e14a3acf2':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:39:44 -08:00
Jesse Hall
b43a624544 am f25dc0f6: am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'f25dc0f673a931640a7fcbba2613710ab8667235':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:39:43 -08:00
Jesse Hall
25902c0540 am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit 'f37a7ed6c5c609a3afc33f81bf50893362917ae6':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:37:32 -08:00
Jesse Hall
f25dc0f673 am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'faaf1553cfa39c23ceb198ba7edbd46ff3a11f7a':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:37:31 -08:00
The Android Automerger
a3e8aa9da3 merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:55:33 -08:00
Jesse Hall
af4f66be50 EmuGL: implement OES_EGL_image_external for GLESv1 
GLESv2 support will come in a followup change but will take advantage
of the GLClientState changes.

Change-Id: Ib6cbb4dafbd071e3b59b1e5d808b3e23656ada92
 2011-11-21 13:47:49 -08:00
Jesse Hall
f37a7ed6c5 GLES translator: don't delete EGLImage textures 
When remapping a GLES texture to a different GL texture in
glEGLImageTargetTexture2DOES(), the GLES texture's previous GL texture was
deleted unconditionally. This is bad when it came from an EGLImage and is
therefore owned by (and will continue to be used by) some other object.

The code now skips deleting the old GL texture if it came from an EGLImage.
This mirrors the logic in glDeleteTextures().

Change-Id: I5b650334a7019d824517c2915b1f23961fbbd809
 2011-11-21 13:14:19 -08:00
Jesse Hall
faaf1553cf EmuGL: set texture info from EGLImage 
The EGL->GL translator implementation of glEGLImageTargetTexture2DOES was
properly replacing uses of the target texture object with the texture object
associated with the EGLImage in the host GL library, but wasn't updating its
own info about the texture (dimensions, etc.). This broke places where the
translator relied on knowing this, e.g. when implementing the GLES glDrawTexi
call on top of GL glDrawArrays.

Change-Id: Ia4aefd89852a2609221c56da76bfac927464c0b2
 2011-11-18 14:11:49 -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
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
The Android Automerger
b911dde9d4 merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:45:52 -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