LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,283 Commits 2 Branches 0 Tags
678b7241cbdd894e98ece3454187f28748706f5c
Commit Graph

5283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Moll
1f93b7ef17 am 9edfe975: am 2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair 
Merge commit '9edfe9759827ec86584b72b038c7ff5f9cf054c0'

* commit '9edfe9759827ec86584b72b038c7ff5f9cf054c0':
  Add etc1tool to Windows SDK.
 2010-01-12 15:43:18 -08:00
Raphael Moll
9edfe97598 am 2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair 
Merge commit '2b9a0444eaa9a3ba3e527990babb6a44f1ae5739' into eclair-plus-aosp

* commit '2b9a0444eaa9a3ba3e527990babb6a44f1ae5739':
  Add etc1tool to Windows SDK.
 2010-01-12 15:38:37 -08:00
Raphael Moll
2b9a0444ea Merge "Add etc1tool to Windows SDK." into eclair 2010-01-12 15:32:03 -08:00
The Android Open Source Project
2b6482773e android-2.1_r1 snapshot 2010-01-12 15:18:14 -08:00
Xavier Ducrohet
cd0c5185e2 am 7ae4c402: am 2f2fb96b: Make the SDK packaging put the samples in the root folder. 
Merge commit '7ae4c4026a3e0596d32983003594abb0d3df80cc'

* commit '7ae4c4026a3e0596d32983003594abb0d3df80cc':
  Make the SDK packaging put the samples in the root folder.
 2010-01-12 13:12:19 -08:00
Xavier Ducrohet
7ae4c4026a am 2f2fb96b: Make the SDK packaging put the samples in the root folder. 
Merge commit '2f2fb96b4b037a016336a98e3b637f4394e1f323' into eclair-plus-aosp

* commit '2f2fb96b4b037a016336a98e3b637f4394e1f323':
  Make the SDK packaging put the samples in the root folder.
 2010-01-12 12:46:21 -08:00
Xavier Ducrohet
2f2fb96b4b Make the SDK packaging put the samples in the root folder. 
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
 2010-01-12 12:32:12 -08:00
Raphael
d670431064 Add etc1tool to Windows SDK. 
SDK BUG 2368918

This depends on Change I1b4f5e39 from build/core.

Change-Id: I8348514506742aa70cdee057e94069a67357a689
 2010-01-12 11:16:08 -08:00
Marco Nelissen
0eae51d333 Set the property to enable stagefright in the simulator. 2010-01-12 09:44:39 -08:00
Dan Egnor
8aa948e7e0 Fix build (was broken by bad up merge) 2010-01-11 14:24:45 -08:00
Derek Sollenberger
f0ef1b60fe Merge "resolved conflicts for merge of a85d523b to master" 2010-01-11 14:13:18 -08:00
Derek Sollenberger
b81615148c resolved conflicts for merge of a85d523b to master 2010-01-11 17:12:46 -05:00
Trevor Johns
e8ca26df95 am 7b48a646: am c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair 
Merge commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1'

* commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1':
  Adding index file for BusinessCard sample. This will be displayed in the HTML
 2010-01-11 14:09:50 -08:00
Trevor Johns
7b48a6463f am c7d2c458: Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair 
Merge commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp

* commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193':
  Adding index file for BusinessCard sample. This will be displayed in the HTML
 2010-01-11 14:05:34 -08:00
Trevor Johns
c7d2c45805 Merge "Adding index file for BusinessCard sample. This will be displayed in the HTML documentation when this sample is selected via the Resource tab." into eclair 2010-01-11 14:00:50 -08:00
Xavier Ducrohet
052720a94c am 7f5c515c: am ef54fe9a: Fix compilation error by declaring stride before the first goto 
Merge commit '7f5c515c64a62c400f692ec2c3670a7b16a01a91'

* commit '7f5c515c64a62c400f692ec2c3670a7b16a01a91':
  Fix compilation error by declaring stride before the first goto
 2010-01-11 13:51:21 -08:00
Derek Sollenberger
a85d523be1 am d53b56d1: Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces. 
Merge commit 'd53b56d1806161bd26c2d97b9af67ef0e41f6e25' into eclair-mr2-plus-aosp

* commit 'd53b56d1806161bd26c2d97b9af67ef0e41f6e25':
  Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces.
 2010-01-11 13:10:56 -08:00
Jack Palevich
ee8d825009 am 297e315d: am a8ba4a0e: Merge "Add the tool etc1tool to the sdk." into eclair 
Merge commit '297e315d0d775ddfa039b50189acc82302d1fc00'

* commit '297e315d0d775ddfa039b50189acc82302d1fc00':
  Add the tool etc1tool to the sdk.
 2010-01-11 12:59:47 -08:00
Jack Palevich
a0d68a2e5e am ec2d1b8f: (-s ours) am 84d83ba8: Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair 
Merge commit 'ec2d1b8fb02ce14222b41afb803e29e409d80d67'

* commit 'ec2d1b8fb02ce14222b41afb803e29e409d80d67':
  DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
 2010-01-11 12:59:42 -08:00
Xavier Ducrohet
7f5c515c64 am ef54fe9a: Fix compilation error by declaring stride before the first goto 
Merge commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5' into eclair-plus-aosp

* commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5':
  Fix compilation error by declaring stride before the first goto
 2010-01-11 12:07:57 -08:00
Xavier Ducrohet
ef54fe9aaa Fix compilation error by declaring stride before the first goto 
Change-Id: I242601038dc7290eac0e4745abaa1ec35d859c09
 2010-01-11 12:03:02 -08:00
Trevor Johns
f44d1b040f Adding index file for BusinessCard sample. This will be displayed in the HTML 
documentation when this sample is selected via the Resource tab.
 2010-01-11 11:59:10 -08:00
Tom O'Neill
4ae8e75321 Merge "Clarify importing Android formatting conventions into Eclipse" 2010-01-11 11:41:20 -08:00
Derek Sollenberger
d53b56d180 Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces. 2010-01-11 13:45:50 -05:00
Tom O'Neill
1180ce9090 Clarify importing Android formatting conventions into Eclipse 
This CL takes pity on people like me who are converting to Eclipse for
the first time.

Note the formatting in the file appears to be screwed up by the sites ->
jd conversion.  Thus, I wasn't sure what conventions to use for
representing file names and menu hierarchies.

Change-Id: I3c9612cd747c3c3271ddebb2b4ef08427f8d171e
 2010-01-11 09:01:05 -08:00
Jack Palevich
297e315d0d am a8ba4a0e: Merge "Add the tool etc1tool to the sdk." into eclair 
Merge commit 'a8ba4a0e361b44dd5edf954a8b088b310023eb3b' into eclair-plus-aosp

* commit 'a8ba4a0e361b44dd5edf954a8b088b310023eb3b':
  Add the tool etc1tool to the sdk.
 2010-01-09 21:54:20 -08:00
Jack Palevich
ec2d1b8fb0 am 84d83ba8: Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair 
Merge commit '84d83ba81b076cc6234e3fc92b8367b89fab5561' into eclair-plus-aosp

* commit '84d83ba81b076cc6234e3fc92b8367b89fab5561':
  DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
 2010-01-09 21:54:17 -08:00
Jack Palevich
a8ba4a0e36 Merge "Add the tool etc1tool to the sdk." into eclair 2010-01-09 21:51:27 -08:00
Jack Palevich
84d83ba81b Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair 2010-01-09 21:51:15 -08:00
Ying Wang
9a7ff5b7ce resolved conflicts for merge of 494d8698 to master 2010-01-08 20:47:07 -08:00
Ying Wang
494d869844 am 7e3d6785: Fixes bug of the number of injected monkey events. 
Merge commit '7e3d678570d9e9849a249476275fec0a4bb1be1e' into eclair-plus-aosp

* commit '7e3d678570d9e9849a249476275fec0a4bb1be1e':
  Fixes bug of the number of injected monkey events.
 2010-01-08 18:42:58 -08:00
Ying Wang
7e3d678570 Fixes bug of the number of injected monkey events. 
Returns the actual events number that has been injected,
if any system error has occurred.
 2010-01-08 18:26:53 -08:00
Romain Guy
74192eafec Deprecate fill_parent and introduce match_parent. 
Bug: #2361749.
 2010-01-08 15:11:18 -08:00
Jack Palevich
e1a1faefa9 Add the tool etc1tool to the sdk. 
etc1tool is a command line tool for compressing and decompressing
ETC1 textures. This texture format is commonly supported by OpenGL
ES 2.0 GPUs.
 2010-01-08 15:56:34 +08:00
Jack Palevich
30d42878b3 DO NOT MERGE Tool for compressing/decompressing ETC1 textures. 
The ETC1 texture format is commonly supported by
OpenGL ES 2.0-capable GPUs.

For historical reasons ETC1 texture files have the
default extension .PKM

This tool relies on the libETC1 library to
compress and decompress the image data.
 2010-01-08 14:52:08 +08:00
Dan Egnor
b4e39aebf6 Expand BadBehaviorActivity to add a few new flavors of ANR. 
In addition to the basic sleep-for-20, add activity launch,
ordered broadcast, and service start that go to special bad
versions that sleep for a while to cause the respective sorts
of ANR to trigger.
 2010-01-07 21:17:24 -08:00
Tom O'Neill
f1474e5399 Merge "Match the tutorial documentation more closely" 2010-01-06 16:32:14 -08:00
Neal Nguyen
ee2721ed67 Merge "Framework Tests Cleanup: Removing CTS duplicate files" 2010-01-06 14:05:07 -08:00
Ying Wang
36d415e122 am 19e2f60e: am 9c7692aa: Set ro.monkey if it\'s not set yet. 
Merge commit '19e2f60e4f850661342ff24a87c11f81cb2f2dea'

* commit '19e2f60e4f850661342ff24a87c11f81cb2f2dea':
  Set ro.monkey if it's not set yet.
 2010-01-06 13:56:06 -08:00
Ying Wang
19e2f60e4f am 9c7692aa: Set ro.monkey if it\'s not set yet. 
Merge commit '9c7692aabbf28554810f440fc7ff60fc9c335dc9' into eclair-plus-aosp

* commit '9c7692aabbf28554810f440fc7ff60fc9c335dc9':
  Set ro.monkey if it's not set yet.
 2010-01-06 13:44:28 -08:00
Ying Wang
9c7692aabb Set ro.monkey if it's not set yet. 
http://b/issue?id=1681101
 2010-01-06 10:16:55 -08:00
Jean-Baptiste Queru
0abab884cc Do not use a user tag on apps, as it is ignored. 
The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: Ibe7e0ca043ba0dedcb7d001e22b085733c1f3a46
 2010-01-05 16:29:05 -08:00
Dianne Hackborn
bdb0690de9 Switch to ActivityManager.killBackgroundProcesses() API. 
The new force stop API is not available outside of the system.
 2010-01-05 15:47:12 -08:00
Jean-Baptiste Queru
6161153ff4 Merge "explicit set an "optional" tag" 2010-01-05 12:06:13 -08:00
Fred Quintana
a1bfd230b5 Merge "remove obsolete GLS driver" 2010-01-05 11:59:32 -08:00
Jean-Baptiste Queru
1b9958970b explicit set an "optional" tag 2010-01-05 11:09:46 -08:00
Dan Egnor
5cdd1cc557 Merge "Remove trailing whitespace from XML copyright template" 2010-01-04 14:58:01 -08:00
Fred Quintana
7b6cdf615b remove obsolete GLS driver 2010-01-04 13:52:07 -08:00
Ying Wang
60dc137675 resolved conflicts for merge of e3b115d0 to master 2010-01-04 13:37:36 -08:00
Dan Egnor
f836222e49 Remove trailing whitespace from XML copyright template 2010-01-04 13:30:30 -08:00