Commit Graph

4138 Commits

Author SHA1 Message Date
Guang Zhu
e4d2f17a07 am 1a3ab7bf: (-s ours) Merge "code coverage improvement (DO NOT MERGE)" into kraken 2010-05-18 18:46:43 -07:00
Guang Zhu
1a3ab7bfaf Merge "code coverage improvement (DO NOT MERGE)" into kraken 2010-05-18 18:44:16 -07:00
Dianne Hackborn
d9d107e815 am 689868ac: Small fix to surface window sample. 2010-05-18 18:37:20 -07:00
Dianne Hackborn
689868ac47 Small fix to surface window sample.
Change-Id: Iaae90aaf8cfdb71c6201eba8a436450a75b2b732
2010-05-18 18:33:05 -07:00
Vladimir Chtchetkine
47f7d4cb7b Merge "Add Samsung VID/PID to android_winusb.inf fixing bug 2687489" 2010-05-18 14:06:16 -07:00
Vladimir Chtchetkine
deef918041 Add Samsung VID/PID to android_winusb.inf fixing bug 2687489
Change-Id: I31baae3400ef8ef04270fd17352ee81cd244d779
2010-05-18 13:45:36 -07:00
Dianne Hackborn
a2abe6de26 am 5ee6d7a1: Merge "Add new demo of taking over a window\'s surface." into kraken 2010-05-18 12:24:57 -07:00
Dianne Hackborn
5ee6d7a18c Merge "Add new demo of taking over a window's surface." into kraken 2010-05-18 12:21:39 -07:00
Bill Napier
73b2f1902c Add in method to ScriptRunner to also get a variable result from the interpreter.
Change-Id: Ib14d48992b66371a6702a7dac621bf3a62d1a936
2010-05-18 11:22:18 -07:00
The Android Open Source Project
83094202ca am f8402ac0: am 253290a7: merge from open-source master 2010-05-18 11:02:06 -07:00
The Android Open Source Project
f8402ac032 am 253290a7: merge from open-source master
Merge commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b' into kraken

* commit '253290a70f2b8f9ca4f0e79b18d9c3f7fe82561b':
  Removed bad BuildPaths (not existing Directories after checkout)
2010-05-18 10:59:19 -07:00
The Android Open Source Project
253290a70f merge from open-source master
Change-Id: I5780767c96fbc775ce0dbbcfddb0c2e84bbfaf41
2010-05-18 10:56:24 -07:00
Guang Zhu
863870c168 code coverage improvement (DO NOT MERGE)
* automatically detect if emma is on device
* build emma into libcore if necessary
* stop runtime before adb sync and restart afterwards

Change-Id: Id5087fdd6c0345f2b9b76658a5083b9260af061e
2010-05-18 10:54:47 -07:00
Dianne Hackborn
988a7192ac Add new demo of taking over a window's surface.
Change-Id: If76f577d2a314018d7dc7980ffa446b7cf050037
2010-05-18 10:46:32 -07:00
The Android Open Source Project
562d456ba8 am 3dcb1f7a: am c043a97c: merge from open-source master 2010-05-18 09:34:21 -07:00
The Android Open Source Project
3dcb1f7ab4 am c043a97c: merge from open-source master
Merge commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce' into kraken

* commit 'c043a97c9f3e1a2c8b5a95df70b89c711a1087ce':
  Removed Calls to deprecated API
  Removed Duplicate Build Paths
2010-05-18 09:31:32 -07:00
The Android Open Source Project
c043a97c9f merge from open-source master
Change-Id: Ib0c6bef7b527a79c9902046889e29a4bccd0ab87
2010-05-18 09:27:19 -07:00
Christian Mehlmauer
ec867a8c35 Removed bad BuildPaths (not existing Directories after checkout)
Change-Id: Ia21cb1927dfc8851f728ef3a2175cbdf701f7641
2010-05-18 06:53:36 +02:00
Bill Napier
423b66f5ca Add proper dependencies for Test target.
Change-Id: I44cd7b13d0d96181908826423cd2b3a320b9cc65
2010-05-17 21:17:41 -07:00
Bill Napier
77b7b8e457 Merge "Update ScriptRunner to correctly pass in the name of the sript being started (so jython's sys.argv will work). Add in JythinUtils Unit Tests to validate JythonUtils correctness." 2010-05-17 17:05:57 -07:00
Dan Morrill
53c6408442 More "final" content changes for source.android.com relaunch.
Change-Id: Ic66dc400c955d270e79af5e0edfa1fdce1036fcb
2010-05-17 16:10:24 -07:00
Dan Morrill
77c2413282 Tweaking a FAQ per feedback.
Change-Id: I6bc90b8d4e78c67014ed6f7e92387ace1a7ebd39
2010-05-17 16:09:58 -07:00
Jean-Baptiste Queru
0195941e06 Merge "Removed Duplicate Build Paths" 2010-05-17 15:02:56 -07:00
Christian Mehlmauer
b88f42b361 Removed Calls to deprecated API
Change-Id: Ia94734637df6aa7b8b08417c49a3485f34f1b94c
2010-05-17 23:43:43 +02:00
Bill Napier
8d34ed1098 Update ScriptRunner to correctly pass in the name of the sript being started (so jython's sys.argv will work).
Add in JythinUtils Unit Tests to validate JythonUtils correctness.

Change-Id: I41ea78b3efbb8649840b46c279f3e91f12b960ac
2010-05-17 11:11:15 -07:00
Christian Mehlmauer
165b906aa5 Removed Duplicate Build Paths
Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
2010-05-16 22:46:34 +02:00
Bill Napier
4a70a96512 Add in a collection of useful functions for interacting with the Jython Interpreter.
Change-Id: I1cef598fe8f057ed050452e4928196f815e574b5
2010-05-14 13:34:04 -07:00
Bill Napier
c1cc043114 Merge "Annotation to allow auto-documenting of jython language bindings for MonkeyRunner API's." 2010-05-14 13:11:26 -07:00
Bill Napier
18b698912a Annotation to allow auto-documenting of jython language bindings for MonkeyRunner API's.
Change-Id: Ia0af839df646036a7ecd9f9c6ba02f98dc911f45
2010-05-14 12:42:50 -07:00
Dianne Hackborn
68f9ae5d18 New API demo of Fragment.startActivityForResult().
Change-Id: I87c5851bfaf3fa84bf57c101bab05b9a1911585d
2010-05-14 10:28:30 -07:00
Ben Murdoch
3b6f45dbd2 Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590
Change-Id: Id521afd66935db6149a341f89ab6b4d7440e4695
2010-05-14 10:24:06 +01:00
Dianne Hackborn
edb8628b41 Update fragment API demos for new fragment APIs:
- Correctly work with state saving and restoring.
- Add new sample showing a fragment that is retained across activities.

Change-Id: I7b1e02135177e69e9fff23fcc55e86d93a75c7e0
2010-05-13 11:13:47 -07:00
The Android Open Source Project
5b4766d4a2 am 08d31102: am 99096976: merge from open-source master 2010-05-12 09:51:39 -07:00
The Android Open Source Project
08d3110279 am 99096976: merge from open-source master
Merge commit '99096976d0ed8436c0eacdefae0ffb606bd573c5' into kraken

* commit '99096976d0ed8436c0eacdefae0ffb606bd573c5':
  Added missing --pct-syskeys to processOptions in Monkey
2010-05-12 09:36:11 -07:00
The Android Open Source Project
99096976d0 merge from open-source master
Change-Id: I4bbf0fccef174a7f0eb8241b422f846ea21c3349
2010-05-12 09:27:49 -07:00
Dirk Dougherty
8dcf7716c0 am 529ba2e5: am 8bfa91f0: am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds. 2010-05-11 10:27:58 -07:00
Dirk Dougherty
529ba2e5f2 am 8bfa91f0: am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Merge commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164' into kraken

* commit '8bfa91f076b667223920d8b68c8ab0f6e8dbc164':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
2010-05-11 10:23:32 -07:00
Dirk Dougherty
8bfa91f076 am 56c8df1b: sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Merge commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d' into froyo-plus-aosp

* commit '56c8df1b0637c380bd7aa3f9a928430abfba2c7d':
  sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
2010-05-11 10:18:43 -07:00
Johan Alfven
f515f1a6c8 Added missing --pct-syskeys to processOptions in Monkey
According to the developer guidelines
http://developer.android.com/guide/developing/tools/monkey.html
it should be possible to run monkey with option --pct-syskeys <percent>
to adjust percentage of "system" key events. (These are keys that are
generally reserved for use by the system, such as Home, Back,
Start Call, End Call, or Volume controls.) However, when trying
to run monkey with that option it fails with:
** Error: Unknown option: --pct-syskeys
The function processOptions in file Monkey.java was missing the
option --pct-syskeys.

Change-Id: I5d328fc93dfe67ed7a905735d6762c7f91c69838
2010-05-11 09:11:43 +02:00
Dirk Dougherty
56c8df1b06 sdk change: add index for tictactoe library and app. fix output path for spinner sample app in sdk builds.
Change-Id: I51d412e1e78e6bd672eb419d53310eb1194672a3
2010-05-10 16:12:24 -07:00
Scott Main
4518a7eae6 am 07155b40: am 46ea5655: am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles) 2010-05-10 13:51:41 -07:00
Scott Main
3f9bf30749 am 689176f3: am e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample (make it v2) 2010-05-10 13:51:36 -07:00
Scott Main
07155b40b4 am 46ea5655: am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
Merge commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac' into kraken

* commit '46ea565515a1ab4f3bc4107eae8c0e909b634dac':
  change searchable dictionary folder name back to normal (exclude "v2", which
2010-05-10 13:48:59 -07:00
Scott Main
689176f33b am e7506f83: am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Merge commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6' into kraken

* commit 'e7506f830636bfb3425b0efb6f8a8675cb1717c6':
  add version code and name to searchable dictionary sample (make it v2)
2010-05-10 13:48:57 -07:00
Scott Main
46ea565515 am 6807387d: change searchable dictionary folder name back to normal (exclude "v2", which should instead be used only for HTML titles)
Merge commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0' into froyo-plus-aosp

* commit '6807387d71dbcad1577edc3b2a88e11eda0aa8c0':
  change searchable dictionary folder name back to normal (exclude "v2", which
2010-05-10 13:47:14 -07:00
Scott Main
e7506f8306 am 1b2c8084: add version code and name to searchable dictionary sample (make it v2)
Merge commit '1b2c80841221bb69ca0384974fab462156cfc07d' into froyo-plus-aosp

* commit '1b2c80841221bb69ca0384974fab462156cfc07d':
  add version code and name to searchable dictionary sample (make it v2)
2010-05-10 13:47:12 -07:00
Scott Main
6807387d71 change searchable dictionary folder name back to normal (exclude "v2", which
should instead be used only for HTML titles)

Change-Id: Ia5c08478d91fb8aa6246fcbca3d68337becadf65
2010-05-10 12:46:19 -07:00
Scott Main
1b2c808412 add version code and name to searchable dictionary sample (make it v2)
Change-Id: Ie19c107528ef0df715936303baeda002efaef6cb
2010-05-10 12:34:08 -07:00
Xavier Ducrohet
4b0af94a9a am 54d1f9c9: am 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo 2010-05-10 09:50:58 -07:00
Xavier Ducrohet
54d1f9c9cf am 33c1d23b: am ca2327f1: Merge "Fix target for library sample" into froyo
Merge commit '33c1d23b012e9351667c85b2769b838a7f12b727' into kraken

* commit '33c1d23b012e9351667c85b2769b838a7f12b727':
  Fix target for library sample
2010-05-10 09:47:30 -07:00