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

8334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Moll
dd652afd50 resolved conflicts for merge of ac0ad7e7 to master 
Change-Id: I2a17f6702a9577d61044c99a4648d8bcf5b3d7fa
 2011-12-01 12:13:12 -08:00
Raphael Moll
ac0ad7e7eb am f0385cf8: am bd235021: SDK: fix script creating platform source archive. 
* commit 'f0385cf8684aaebb6c03774a2aa9106f26472f6e':
  SDK: fix script creating platform source archive.
 2011-12-01 11:21:28 -08:00
Raphael Moll
f0385cf868 am bd235021: SDK: fix script creating platform source archive. 
* commit 'bd235021675ba84b79173c0e02712fd838daef7e':
  SDK: fix script creating platform source archive.
 2011-12-01 11:20:01 -08:00
Raphael Moll
bd23502167 SDK: fix script creating platform source archive. 
It turns out that the way I use Python to create ZIP
archives is plain wrong. Some files simply don't have the
right size and we get EOFException when unzipping with
Java's ZipFile.

This change adds a flag to instead simply copy all the
files we want and then run the 'zip' system command.
The python zip facility is left there intact in case
I want to go back and fix it later (I'm going to assume
it's my usage that's wrong before really blaming python).

Change-Id: Iea178a49be0bf23c91c01a2e036ae7a76def2b55
 2011-11-30 22:39:29 -08:00
Svetoslav Ganov
15ee96f1d5 Fising the build 
Change-Id: I3bbc77a2ad4244076df01071c1093f969c9dd4e4
 2011-11-30 19:37:55 -08:00
Svetoslav Ganov
cf0a198756 resolved conflicts for merge of cb0d49cd to master 
Change-Id: I0eabcb7b55a0b10f50e2e1f065213223b5600aab
 2011-11-30 18:53:19 -08:00
Svetoslav Ganov
64696acdd2 resolved conflicts for merge of cd362a83 to master 
Change-Id: I64ce155422530815d2f8deeb4f901c0920f6e68b
 2011-11-30 18:45:11 -08:00
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
The Android Open Source Project
77c98f0230 Reconcile with ics-mr1-release 
Change-Id: I3630f339035d2ce8f5faec4c35bd04ce1001e02c
 2011-11-30 12:55:29 -08:00
Jason Sams
d8266150ba Merge "Fixing vector element alignment issues." 2011-11-29 18:00:06 -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
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
14bc4b97a8 am 459d7f99: am a96a7c60: am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0 
* commit '459d7f999f8aba4f3c4e8d39c926fdb12e2a50e6':
  Inaccvrate Morse data in sample code.
 2011-11-28 11:33:01 -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
1242aaf17d am a2ba8569: (-s ours) am c0353726: Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1 
* commit 'a2ba8569636972e0633625c47f5a60d3a11ad834':
  Cherry-picked from 6f00e7fc in master. Do not merge.
 2011-11-23 15:17:32 -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
b52abf5c8b am e70a1d77: (-s ours) am 60381093: am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge. 
* commit 'e70a1d7725a7f83c9aa823278b2532e95d3c22b8':
  Revert "Update the media_profiles.xml file to include..."  do not merge.
 2011-11-23 14:45:17 -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
2149b2a59e am e80c652a: am 2d003a27: am 2310657c: Move support lib to rev 5. 
* commit 'e80c652add58f4491ffc4cd2c528a765b6c60975':
  Move support lib to rev 5.
 2011-11-23 14:09:01 -08:00
James Dong
965ff5fb19 am 442304a1: (-s ours) am d2c0b7d4: am a8fe85ea: Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge. 
* commit '442304a15afe4ce08ae7a7c06c0be0168164e714':
  Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
 2011-11-23 14:09:00 -08:00
Vladimir Chtchetkine
682d480b49 am 23fbec95: (-s ours) am 9a1a290e: am fd1bdd61: Update supported frame sizes for fake camera. do not merge. 
* commit '23fbec95929582fc60e0a59b9ef068e2b235195b':
  Update supported frame sizes for fake camera. do not merge.
 2011-11-23 14:08:54 -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
Vladimir Chtchetkine
d18dbecaf2 Merge "Update supported frame sizes for fake camera" 2011-11-23 06:42:23 -08:00
Jean-Baptiste Queru
027b026b09 am 62c9a8ac: am 31ef1de4: Revert "Add missing -lX11 on the link line." 
* commit '62c9a8aca24900c5efef7081a942090ddfa6f1c4':
  Revert "Add missing -lX11 on the link line."
 2011-11-22 17:15:32 -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
0ede748027 am 34141787: am 3a655154: am af4f66be: EmuGL: implement OES_EGL_image_external for GLESv1 
* commit '3414178724afeb07d2243544460ada97a09ffa7e':
  EmuGL: implement OES_EGL_image_external for GLESv1
 2011-11-22 15:48:14 -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
0bcca2c890 am afc9f5bc: am 25902c05: am f37a7ed6: GLES translator: don\'t delete EGLImage textures 
* commit 'afc9f5bcfe16481d124ae7721f18e9bdcae3ad14':
  GLES translator: don't delete EGLImage textures
 2011-11-22 15:42:24 -08:00
Jesse Hall
24dc87cd2a am b43a6245: am f25dc0f6: am faaf1553: EmuGL: set texture info from EGLImage 
* commit 'b43a624544ccc5bef1d267d9d8a0dff9043a677c':
  EmuGL: set texture info from EGLImage
 2011-11-22 15:42:23 -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