Merge commit 'd98ba32eeff587a30396fa24728a1150de9dc305' into eclair-plus-aosp
* commit 'd98ba32eeff587a30396fa24728a1150de9dc305':
DO NOT MERGE Fix bug where monkey always tries to run multiple scripts.
Merge commit '7d961f86208b35c12867a049d4bb815da72167d3' into eclair-plus-aosp
* commit '7d961f86208b35c12867a049d4bb815da72167d3':
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.
Merge commit 'aebdb4608541e3ffb158283bbc249b586ad9aa8f'
* commit 'aebdb4608541e3ffb158283bbc249b586ad9aa8f':
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.
Merge commit 'c1d00a99f3dcacf7b0235e386a2aa0902e07179e' into eclair-plus-aosp
* commit 'c1d00a99f3dcacf7b0235e386a2aa0902e07179e':
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
Merge commit '8315bb4933c49d45f6b080cc8fd46f0bfadeee51'
* commit '8315bb4933c49d45f6b080cc8fd46f0bfadeee51':
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.
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.
Merge commit '2b9a0444eaa9a3ba3e527990babb6a44f1ae5739' into eclair-plus-aosp
* commit '2b9a0444eaa9a3ba3e527990babb6a44f1ae5739':
Add etc1tool to Windows SDK.
Merge commit '7ae4c4026a3e0596d32983003594abb0d3df80cc'
* commit '7ae4c4026a3e0596d32983003594abb0d3df80cc':
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.
Merge commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1'
* commit '7b48a6463f960bf63f43e46900ef92bc3b867aa1':
Adding index file for BusinessCard sample. This will be displayed in the HTML
Merge commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193' into eclair-plus-aosp
* commit 'c7d2c4580552a4921ed1f1fa78b0a180eb995193':
Adding index file for BusinessCard sample. This will be displayed in the HTML
Merge commit '7f5c515c64a62c400f692ec2c3670a7b16a01a91'
* commit '7f5c515c64a62c400f692ec2c3670a7b16a01a91':
Fix compilation error by declaring stride before the first goto
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.
Merge commit 'ec2d1b8fb02ce14222b41afb803e29e409d80d67'
* commit 'ec2d1b8fb02ce14222b41afb803e29e409d80d67':
DO NOT MERGE Tool for compressing/decompressing ETC1 textures.
Merge commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5' into eclair-plus-aosp
* commit 'ef54fe9aaab4124e61850062d2212b20c20c8ea5':
Fix compilation error by declaring stride before the first goto
