OSDN Git Service
Eric Rowe [Thu, 21 Jan 2010 22:54:48 +0000 (14:54 -0800)]
am
329f4007: (-s ours) am
7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
Merge commit '
329f40076426033ca998a7ef7b98bfd6dc51ed2e'
* commit '
329f40076426033ca998a7ef7b98bfd6dc51ed2e':
DO NOT MERGE Create way to run monkey with multiple scripts.
Dianne Hackborn [Wed, 20 Jan 2010 21:43:01 +0000 (13:43 -0800)]
Start implementing UI for changing requested policies.
Derek Sollenberger [Thu, 21 Jan 2010 20:04:58 +0000 (15:04 -0500)]
Removing unused parameter from NP_Initialize.
Mathias Agopian [Wed, 20 Jan 2010 23:25:55 +0000 (15:25 -0800)]
fix [
2179436] Maps does not display compass when option is turned on
remove the compass option from SpareParts
Eric Rowe [Wed, 20 Jan 2010 00:02:09 +0000 (16:02 -0800)]
Merge commit '
f7964404' into manualmerge
David Turner [Tue, 19 Jan 2010 08:01:46 +0000 (00:01 -0800)]
am
a84a9656: am
23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
Merge commit '
a84a9656b33c3e90a0747aff26272a7a316bc298'
* commit '
a84a9656b33c3e90a0747aff26272a7a316bc298':
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
Dianne Hackborn [Sun, 17 Jan 2010 23:18:42 +0000 (15:18 -0800)]
Merge "Initial sample code for writing a device policy."
Dianne Hackborn [Wed, 13 Jan 2010 02:17:18 +0000 (18:17 -0800)]
Initial sample code for writing a device policy.
Fred Quintana [Fri, 15 Jan 2010 19:05:13 +0000 (11:05 -0800)]
Merge "rename testHasFeatures to hasFeatures"
Andrew Stadler [Fri, 15 Jan 2010 07:04:54 +0000 (23:04 -0800)]
Add browser intermediates to fix eclipse build
Needed because EventLogTags have moved.
Fred Quintana [Fri, 15 Jan 2010 02:11:17 +0000 (18:11 -0800)]
rename testHasFeatures to hasFeatures
Eric Rowe [Fri, 15 Jan 2010 01:12:28 +0000 (17:12 -0800)]
am
7d961f86: DO NOT MERGE Create way to run monkey with multiple scripts.
Merge commit '
7d961f86208b35c12867a049d4bb815da72167d3' into eclair-plus-aosp
* commit '
7d961f86208b35c12867a049d4bb815da72167d3':
DO NOT MERGE Create way to run monkey with multiple scripts.
Eric Rowe [Wed, 28 Oct 2009 22:25:45 +0000 (15:25 -0700)]
DO NOT MERGE Create way to run monkey with multiple scripts.
By giving multiple -f arguments, the monkey will randomly choose between the
scripts. Also, add the --setup argument which will run a setup script before
starting to play the other scripts in random order.
Marco Nelissen [Fri, 15 Jan 2010 00:04:35 +0000 (16:04 -0800)]
Force LANG to C in the findunusedresources script, otherwise it takes forever to run.
Fred Quintana [Thu, 14 Jan 2010 22:18:25 +0000 (14:18 -0800)]
Merge "add support for testing testFeatures()"
Fred Quintana [Thu, 14 Jan 2010 20:22:55 +0000 (12:22 -0800)]
add support for testing testFeatures()
Derek Sollenberger [Thu, 14 Jan 2010 19:31:00 +0000 (11:31 -0800)]
am
aebdb460: am
1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys.
Merge commit '
aebdb4608541e3ffb158283bbc249b586ad9aa8f'
* commit '
aebdb4608541e3ffb158283bbc249b586ad9aa8f':
Adding a new sub-plugin that gives visual feedback for navigation keys.
Derek Sollenberger [Thu, 14 Jan 2010 19:23:01 +0000 (11:23 -0800)]
am
1bc5ab62: Adding a new sub-plugin that gives visual feedback for navigation keys.
Merge commit '
1bc5ab625c5ca84a3e0f240b58327d8084af22a8' into eclair-mr2-plus-aosp
* commit '
1bc5ab625c5ca84a3e0f240b58327d8084af22a8':
Adding a new sub-plugin that gives visual feedback for navigation keys.
Derek Sollenberger [Thu, 14 Jan 2010 16:44:37 +0000 (11:44 -0500)]
Adding a new sub-plugin that gives visual feedback for navigation keys.
Eric Rowe [Thu, 14 Jan 2010 03:29:32 +0000 (19:29 -0800)]
am
c1d00a99: Merge "Fix how the monkey counts events for scripts." into eclair
Merge commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e' into eclair-plus-aosp
* commit '
c1d00a99f3dcacf7b0235e386a2aa0902e07179e':
Fix how the monkey counts events for scripts.
Eric Rowe [Thu, 14 Jan 2010 03:25:21 +0000 (19:25 -0800)]
Merge "Fix how the monkey counts events for scripts." into eclair
Eric Rowe [Wed, 13 Jan 2010 23:55:53 +0000 (15:55 -0800)]
Fix how the monkey counts events for scripts.
Instead of the monkey counting up to the count times the number of events in the
script, the monkey will now only increment the count when the script reaches the
end of the file. This allows us to have multiple script files with differing
event counts in each.
Conflicts:
cmds/monkey/src/com/android/commands/monkey/Monkey.java
David Turner [Thu, 14 Jan 2010 01:25:42 +0000 (17:25 -0800)]
am
23d8ded2: Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
Merge commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c' into eclair-plus-aosp
* commit '
23d8ded2e1fcf6e74a793b2931539fc71d4e7b6c':
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
David Turner [Thu, 14 Jan 2010 01:21:11 +0000 (17:21 -0800)]
Merge "Update documentation for OpenGL ES 1.0 / 1.1 / 2.0" into eclair
David 'Digit' Turner [Thu, 14 Jan 2010 00:50:57 +0000 (16:50 -0800)]
Update documentation for OpenGL ES 1.0 / 1.1 / 2.0
Eric Rowe [Wed, 13 Jan 2010 23:45:04 +0000 (15:45 -0800)]
am
8315bb49: (-s ours) am
b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Merge commit '
8315bb4933c49d45f6b080cc8fd46f0bfadeee51'
* commit '
8315bb4933c49d45f6b080cc8fd46f0bfadeee51':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Wed, 13 Jan 2010 23:41:28 +0000 (15:41 -0800)]
am
b2fa7700: DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Merge commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197' into eclair-plus-aosp
* commit '
b2fa770013cf1b6b8bf0619a946a54feafec5197':
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Eric Rowe [Tue, 20 Oct 2009 01:06:38 +0000 (18:06 -0700)]
DO NOT MERGE Modify Monkey so that scripts can use raw and user events.
Fix javadoc comment in MonkeySourceRandom.java and combine raw events and user
events in MonkeySourceScript.java. Also, fix bug where too few arguments in
the script causes a RuntimeException.
Raphael Moll [Tue, 12 Jan 2010 23:43:18 +0000 (15:43 -0800)]
am
9edfe975: am
2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
9edfe9759827ec86584b72b038c7ff5f9cf054c0'
* commit '
9edfe9759827ec86584b72b038c7ff5f9cf054c0':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:38:37 +0000 (15:38 -0800)]
am
2b9a0444: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739' into eclair-plus-aosp
* commit '
2b9a0444eaa9a3ba3e527990babb6a44f1ae5739':
Add etc1tool to Windows SDK.
Raphael Moll [Tue, 12 Jan 2010 23:32:03 +0000 (15:32 -0800)]
Merge "Add etc1tool to Windows SDK." into eclair
Xavier Ducrohet [Tue, 12 Jan 2010 21:12:19 +0000 (13:12 -0800)]
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.
Xavier Ducrohet [Tue, 12 Jan 2010 20:46:21 +0000 (12:46 -0800)]
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.
Xavier Ducrohet [Tue, 12 Jan 2010 20:32:12 +0000 (12:32 -0800)]
Make the SDK packaging put the samples in the root folder.
Change-Id: Icb88f88d503de9690ba210c0bfabdc0598021860
Raphael [Tue, 12 Jan 2010 19:11:07 +0000 (11:11 -0800)]
Add etc1tool to Windows SDK.
SDK BUG
2368918
This depends on Change I1b4f5e39 from build/core.
Change-Id: I8348514506742aa70cdee057e94069a67357a689
Marco Nelissen [Tue, 12 Jan 2010 17:44:39 +0000 (09:44 -0800)]
Set the property to enable stagefright in the simulator.
Dan Egnor [Mon, 11 Jan 2010 22:24:45 +0000 (14:24 -0800)]
Fix build (was broken by bad up merge)
Derek Sollenberger [Mon, 11 Jan 2010 22:13:18 +0000 (14:13 -0800)]
Merge "resolved conflicts for merge of
a85d523b to master"
Derek Sollenberger [Mon, 11 Jan 2010 22:12:46 +0000 (17:12 -0500)]
resolved conflicts for merge of
a85d523b to master
Trevor Johns [Mon, 11 Jan 2010 22:09:50 +0000 (14:09 -0800)]
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
Trevor Johns [Mon, 11 Jan 2010 22:05:34 +0000 (14:05 -0800)]
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
Trevor Johns [Mon, 11 Jan 2010 22:00:50 +0000 (14:00 -0800)]
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
Xavier Ducrohet [Mon, 11 Jan 2010 21:51:21 +0000 (13:51 -0800)]
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
Derek Sollenberger [Mon, 11 Jan 2010 21:10:56 +0000 (13:10 -0800)]
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.
Jack Palevich [Mon, 11 Jan 2010 20:59:47 +0000 (12:59 -0800)]
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.
Jack Palevich [Mon, 11 Jan 2010 20:59:42 +0000 (12:59 -0800)]
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.
Xavier Ducrohet [Mon, 11 Jan 2010 20:07:57 +0000 (12:07 -0800)]
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
Xavier Ducrohet [Mon, 11 Jan 2010 20:00:41 +0000 (12:00 -0800)]
Fix compilation error by declaring stride before the first goto
Change-Id: I242601038dc7290eac0e4745abaa1ec35d859c09
Trevor Johns [Fri, 8 Jan 2010 00:44:43 +0000 (16:44 -0800)]
Adding index file for BusinessCard sample. This will be displayed in the HTML
documentation when this sample is selected via the Resource tab.
Tom O'Neill [Mon, 11 Jan 2010 19:41:20 +0000 (11:41 -0800)]
Merge "Clarify importing Android formatting conventions into Eclipse"
Derek Sollenberger [Mon, 11 Jan 2010 17:31:49 +0000 (12:31 -0500)]
Removed dependence on java interfaces and use only one surface for both embedded and fullscreen surfaces.
Tom O'Neill [Mon, 11 Jan 2010 17:01:05 +0000 (09:01 -0800)]
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
Jack Palevich [Sun, 10 Jan 2010 05:54:20 +0000 (21:54 -0800)]
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.
Jack Palevich [Sun, 10 Jan 2010 05:54:17 +0000 (21:54 -0800)]
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.
Jack Palevich [Sun, 10 Jan 2010 05:51:27 +0000 (21:51 -0800)]
Merge "Add the tool etc1tool to the sdk." into eclair
Jack Palevich [Sun, 10 Jan 2010 05:51:15 +0000 (21:51 -0800)]
Merge "DO NOT MERGE Tool for compressing/decompressing ETC1 textures." into eclair
Ying Wang [Sat, 9 Jan 2010 04:47:07 +0000 (20:47 -0800)]
resolved conflicts for merge of
494d8698 to master
Ying Wang [Sat, 9 Jan 2010 02:42:58 +0000 (18:42 -0800)]
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.
Ying Wang [Tue, 29 Dec 2009 23:41:09 +0000 (15:41 -0800)]
Fixes bug of the number of injected monkey events.
Returns the actual events number that has been injected,
if any system error has occurred.
Romain Guy [Fri, 8 Jan 2010 23:05:33 +0000 (15:05 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Jack Palevich [Fri, 8 Jan 2010 07:56:34 +0000 (15:56 +0800)]
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.
Jack Palevich [Fri, 8 Jan 2010 06:52:08 +0000 (14:52 +0800)]
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.
Dan Egnor [Fri, 8 Jan 2010 05:17:24 +0000 (21:17 -0800)]
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.
Tom O'Neill [Thu, 7 Jan 2010 00:32:14 +0000 (16:32 -0800)]
Merge "Match the tutorial documentation more closely"
Neal Nguyen [Wed, 6 Jan 2010 22:05:07 +0000 (14:05 -0800)]
Merge "Framework Tests Cleanup: Removing CTS duplicate files"
Ying Wang [Wed, 6 Jan 2010 21:56:06 +0000 (13:56 -0800)]
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.
Ying Wang [Wed, 6 Jan 2010 21:44:28 +0000 (13:44 -0800)]
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.
Ying Wang [Wed, 6 Jan 2010 18:16:55 +0000 (10:16 -0800)]
Set ro.monkey if it's not set yet.
http://b/issue?id=
1681101
Jean-Baptiste Queru [Wed, 6 Jan 2010 00:27:15 +0000 (16:27 -0800)]
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
Dianne Hackborn [Tue, 5 Jan 2010 02:49:11 +0000 (18:49 -0800)]
Switch to ActivityManager.killBackgroundProcesses() API.
The new force stop API is not available outside of the system.
Jean-Baptiste Queru [Tue, 5 Jan 2010 20:06:13 +0000 (12:06 -0800)]
Merge "explicit set an "optional" tag"
Fred Quintana [Tue, 5 Jan 2010 19:59:32 +0000 (11:59 -0800)]
Merge "remove obsolete GLS driver"
Jean-Baptiste Queru [Tue, 5 Jan 2010 19:09:46 +0000 (11:09 -0800)]
explicit set an "optional" tag
Dan Egnor [Mon, 4 Jan 2010 22:58:01 +0000 (14:58 -0800)]
Merge "Remove trailing whitespace from XML copyright template"
Fred Quintana [Fri, 18 Dec 2009 18:19:09 +0000 (10:19 -0800)]
remove obsolete GLS driver
Ying Wang [Mon, 4 Jan 2010 21:37:36 +0000 (13:37 -0800)]
resolved conflicts for merge of
e3b115d0 to master
Dan Egnor [Mon, 4 Jan 2010 21:30:30 +0000 (13:30 -0800)]
Remove trailing whitespace from XML copyright template
Ying Wang [Mon, 4 Jan 2010 20:58:44 +0000 (12:58 -0800)]
am
48f0d899: Annouce that Monkey is running.
Merge commit '
48f0d8993b5e871dd2695e983266aa655801769e' into eclair-plus-aosp
* commit '
48f0d8993b5e871dd2695e983266aa655801769e':
Annouce that Monkey is running.
Ying Wang [Wed, 30 Dec 2009 22:37:04 +0000 (14:37 -0800)]
Annouce that Monkey is running.
http://b/issue?id=
1681101
Grace Kloba [Mon, 4 Jan 2010 18:03:34 +0000 (10:03 -0800)]
am
653b97e7: am
a0e762ca: free the NPObject in NPP_Destroy.
Merge commit '
653b97e701546e816f75167280bf87b665a47b2c'
* commit '
653b97e701546e816f75167280bf87b665a47b2c':
free the NPObject in NPP_Destroy.
Grace Kloba [Mon, 4 Jan 2010 17:59:45 +0000 (09:59 -0800)]
am
a0e762ca: free the NPObject in NPP_Destroy.
Merge commit '
a0e762caeaca275ed8390e9ee1cfb5e9149e07b7' into eclair-mr2-plus-aosp
* commit '
a0e762caeaca275ed8390e9ee1cfb5e9149e07b7':
free the NPObject in NPP_Destroy.
Jack Palevich [Thu, 31 Dec 2009 06:29:37 +0000 (14:29 +0800)]
Fix compiler error by ensuring a variable is always initialized.
Jack Palevich [Thu, 24 Dec 2009 08:18:25 +0000 (16:18 +0800)]
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.
Grace Kloba [Sun, 27 Dec 2009 21:21:41 +0000 (13:21 -0800)]
free the NPObject in NPP_Destroy.
Neal Nguyen [Thu, 24 Dec 2009 02:18:34 +0000 (18:18 -0800)]
Framework Tests Cleanup: Removing CTS duplicate files
Updating test_defs.xml to remove the class attribute for
AndroidTests wrapper class that is going away.
Android (Google) Code Review [Tue, 22 Dec 2009 10:33:40 +0000 (02:33 -0800)]
Merge change I8e509908
* changes:
Remove unnecessary matrix stack manipulations.
Jack Palevich [Tue, 22 Dec 2009 10:32:05 +0000 (18:32 +0800)]
Remove unnecessary matrix stack manipulations.
glDrawTexiOES does not use the matix stack, so no need to modify it.
Dan Egnor [Thu, 17 Dec 2009 01:10:26 +0000 (17:10 -0800)]
Add some more buttons to Bad Behavior:
- crash system server
- report a Log.wtf()
Update Monkey for changes to IActivityController interface.
Tom O'Neill [Thu, 17 Dec 2009 19:20:00 +0000 (11:20 -0800)]
Match the tutorial documentation more closely
Just undoing some white space changes that my previous CL introduced, in
order to keep the formatting the same between the tutorial documentation
and the actual code.
Dan Morrill [Sun, 15 Nov 2009 23:46:36 +0000 (15:46 -0800)]
Additional content massaging based on feedback received.
Grace Kloba [Wed, 16 Dec 2009 22:24:17 +0000 (14:24 -0800)]
am
6be651ee: am
3bc69e62: Merge change Ib59457e0 into eclair-mr2
Merge commit '
6be651ee000270b56b285f60a6bda9c090cfbb9f'
* commit '
6be651ee000270b56b285f60a6bda9c090cfbb9f':
Change full screen surface to Opaque as it is required
Grace Kloba [Wed, 16 Dec 2009 22:21:19 +0000 (14:21 -0800)]
am
3bc69e62: Merge change Ib59457e0 into eclair-mr2
Merge commit '
3bc69e6256b616514871276e24bf98f37b3f89ad' into eclair-mr2-plus-aosp
* commit '
3bc69e6256b616514871276e24bf98f37b3f89ad':
Change full screen surface to Opaque as it is required
Android (Google) Code Review [Wed, 16 Dec 2009 22:16:45 +0000 (14:16 -0800)]
Merge change Ib59457e0 into eclair-mr2
* changes:
Change full screen surface to Opaque as it is required by the new plugin model.
Grace Kloba [Wed, 16 Dec 2009 19:38:53 +0000 (11:38 -0800)]
Change full screen surface to Opaque as it is required
by the new plugin model.
Comment out the video as it is not working and causes
crash when touch.
Android (Google) Code Review [Wed, 16 Dec 2009 19:29:36 +0000 (11:29 -0800)]
Merge change Ie8b10efd
* changes:
Finish adding Makefiles for the Notepad tutorial.
Ying Wang [Wed, 16 Dec 2009 19:12:46 +0000 (11:12 -0800)]
am
564c9930: am
53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2
Merge commit '
564c993069fe049a755be7ecffa510fe64a1917e'
* commit '
564c993069fe049a755be7ecffa510fe64a1917e':
Package blacklist/whitelist file support for Monkey.
Ying Wang [Wed, 16 Dec 2009 18:47:41 +0000 (10:47 -0800)]
am
53a8ae60: Merge changes I84cafc84,Idc388c56 into eclair-mr2
Merge commit '
53a8ae6060ad02b9e2747455d3b5e4229a82e051' into eclair-mr2-plus-aosp
* commit '
53a8ae6060ad02b9e2747455d3b5e4229a82e051':
Package blacklist/whitelist file support for Monkey.
Android (Google) Code Review [Wed, 16 Dec 2009 18:43:43 +0000 (10:43 -0800)]
Merge changes I84cafc84,Idc388c56 into eclair-mr2
* changes:
Merge commit 'goog/eclair-mr2' into play-with-monkey
Package blacklist/whitelist file support for Monkey.
Tom O'Neill [Tue, 15 Dec 2009 19:27:15 +0000 (11:27 -0800)]
Finish adding Makefiles for the Notepad tutorial.
Add the missing makefiles for the non-solution versions of the tutorial
code. Required providing missing imports in Notepadv2. Also standardized
white spaces using Source > Correct Indentation in Eclipse and a few
manual changes. This was done to minimize differences such as:
diff -r Notepadv1 Notepadv1Solution
diff -r Notepadv1Solution/src/com/android/demo/notepad1/ Notepadv2/src/com/android/demo/notepad2/
Change-Id: Ie8b10efd61f2200b3c741ea500a6924710ab54ed
Dirk Dougherty [Wed, 16 Dec 2009 07:27:22 +0000 (23:27 -0800)]
Merge commit '
e897c1b4' into manualmerge
Conflicts:
samples/ApiDemos/src/com/example/android/apis/app/_index.html