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

8419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
00ba25e157 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:45:37 -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
4f74cbaf19 am 15ee96f1: Fising the build 
* commit '15ee96f1d552c04b240b53212209b2cc678d2f50':
  Fising the build
 2011-11-30 19:54:51 -08:00
Svetoslav Ganov
15ee96f1d5 Fising the build 
Change-Id: I3bbc77a2ad4244076df01071c1093f969c9dd4e4
 2011-11-30 19:37:55 -08:00
Svetoslav Ganov
2137d172d7 am cf0a1987: resolved conflicts for merge of cb0d49cd to master 
* commit 'cf0a198756b4b320a03886b09c8f29db46b3b4af':
  Adding a code sample for implementing accessibility in a custom view.
 2011-11-30 18:59:50 -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
ed3a61ab6e am 64696acd: resolved conflicts for merge of cd362a83 to master 
* commit '64696acdd289b55dbcad6901025d11e57e123dd4':
  Updating the Monkey commands due to framework changes.
 2011-11-30 18:49:46 -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
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
The Android Open Source Project
749ee2f0ff am 77c98f02: Reconcile with ics-mr1-release 
* commit '77c98f0230268dc1a5d9293bbe074b07e72f1292':
 2011-11-30 14:04:21 -08:00
Jason Sams
edbca34e27 resolved conflicts for merge of d8266150 to graphics-dev 
Change-Id: Ie39a5e07ddbfcfe9e8161674f1b0912c9f8f49d1
 2011-11-30 13:54:40 -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
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
8785c24956 am 14bc4b97: am 459d7f99: am a96a7c60: am c4d810a4: Merge "Inaccvrate Morse data in sample code." into ics-mr0 
* commit '14bc4b97a8eef0ab7a42131b5d4eee1a8da5ff40':
  Inaccvrate Morse data in sample code.
 2011-11-28 11:35:49 -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
bc1622e353 am 1242aaf1: am a2ba8569: (-s ours) am c0353726: Merge "Cherry-picked from 6f00e7fc in master. Do not merge." into ics-mr1 
* commit '1242aaf17d3a5e9e9687f2c684908aa5a2adf5a9':
  Cherry-picked from 6f00e7fc in master. Do not merge.
 2011-11-23 15:19:13 -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
bbc8df370f am b52abf5c: am e70a1d77: (-s ours) am 60381093: am 2400b2c3: Revert "Update the media_profiles.xml file to include..." do not merge. 
* commit 'b52abf5c8b8f626406c5c059269c55e8b140443b':
  Revert "Update the media_profiles.xml file to include..."  do not merge.
 2011-11-23 14:46:49 -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
edf8d02734 am 2149b2a5: am e80c652a: am 2d003a27: am 2310657c: Move support lib to rev 5. 
* commit '2149b2a59ed9b8bdb37e6a456ee781d4f8f89a5c':
  Move support lib to rev 5.
 2011-11-23 14:11:06 -08:00
James Dong
3fee89b3d3 am 965ff5fb: 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 '965ff5fb190987f2e671788aa036a5a7b5b1f743':
  Update the media_profiles.xml file to include maximum memory usage support for video editor. do not merge.
 2011-11-23 14:11:05 -08:00
Vladimir Chtchetkine
d823615155 am 682d480b: am 23fbec95: (-s ours) am 9a1a290e: am fd1bdd61: Update supported frame sizes for fake camera. do not merge. 
* commit '682d480b49c1e0b076ed925954f3544d8255e2aa':
  Update supported frame sizes for fake camera. do not merge.
 2011-11-23 14:11:04 -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