Yu Shan Emily Lau
6a6c533129
Add the simple script log for the statbility stress test.
...
Add the randomize script option.
Change-Id: I7fbbd3b78a2fc5fe5300ac4811540d0cd2070688
2010-08-30 15:31:33 -07:00
Jean-Baptiste Queru
d9ef1df4a8
am e98ed06e: am d9380caf: Merge "Make runtest --path smarter when choosing path to build."
...
Merge commit 'e98ed06e17e28a11609caf133a08b3ced21a049a'
* commit 'e98ed06e17e28a11609caf133a08b3ced21a049a':
Make runtest --path smarter when choosing path to build.
2010-08-30 13:28:09 -07:00
Jean-Baptiste Queru
712e7865b0
resolved conflicts for merge of 85173cc0 to master
...
Change-Id: I0ac3819b7c8a1822f217817ea6b8471cac24044f
2010-08-30 13:24:13 -07:00
Jean-Baptiste Queru
e98ed06e17
am d9380caf: Merge "Make runtest --path smarter when choosing path to build."
...
Merge commit 'd9380caf410ddf4b17a6e5035a89851bc58408f7' into gingerbread-plus-aosp
* commit 'd9380caf410ddf4b17a6e5035a89851bc58408f7':
Make runtest --path smarter when choosing path to build.
2010-08-30 10:33:39 -07:00
Jean-Baptiste Queru
85173cc08a
am be97ad65: Merge "Replaced deprecated Contacts Api with ContactsContract"
...
Merge commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb' into gingerbread-plus-aosp
* commit 'be97ad655dedb392caa06ccc6c528b37ba5169fb':
Replaced deprecated Contacts Api with ContactsContract
2010-08-30 10:25:04 -07:00
Jean-Baptiste Queru
d9380caf41
Merge "Make runtest --path smarter when choosing path to build."
2010-08-30 09:10:24 -07:00
Jean-Baptiste Queru
be97ad655d
Merge "Replaced deprecated Contacts Api with ContactsContract"
2010-08-30 09:04:19 -07:00
Xavier Ducrohet
e1a36a69e8
am 7ddeaf21: am 420b59fe: Fix windows SDK build.
...
Merge commit '7ddeaf2189847cbc6765af552c98439d654d6938'
* commit '7ddeaf2189847cbc6765af552c98439d654d6938':
Fix windows SDK build.
2010-08-27 19:43:59 -07:00
Xavier Ducrohet
7ddeaf2189
am 420b59fe: Fix windows SDK build.
...
Merge commit '420b59fe215f8a912e66759d1c4a252bea3df39d' into gingerbread-plus-aosp
* commit '420b59fe215f8a912e66759d1c4a252bea3df39d':
Fix windows SDK build.
2010-08-27 19:41:51 -07:00
Xavier Ducrohet
420b59fe21
Fix windows SDK build.
...
Location of hierarchyviewer is now in hierarchyviewer2/app/etc
Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
2010-08-27 19:30:38 -07:00
Dianne Hackborn
bee2a75066
am 1f40b600: am 562306ec: Fix build.
...
Merge commit '1f40b600a8201de2f983e0e117c664f63fc68f55'
* commit '1f40b600a8201de2f983e0e117c664f63fc68f55':
Fix build.
2010-08-27 18:11:14 -07:00
Dianne Hackborn
1f40b600a8
am 562306ec: Fix build.
...
Merge commit '562306ecd83526a81aed41ff1db2625d7d3ab271' into gingerbread-plus-aosp
* commit '562306ecd83526a81aed41ff1db2625d7d3ab271':
Fix build.
2010-08-27 17:03:48 -07:00
Dianne Hackborn
562306ecd8
Fix build.
...
Change-Id: Ic030f82e79981792dc3116d318e217ab81ecea3b
2010-08-27 17:00:52 -07:00
Derek Sollenberger
018ba7867d
am 131bf0b0: am 704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
...
Merge commit '131bf0b09ea3725bfe1c605c2fe7229d3d63a9cb'
* commit '131bf0b09ea3725bfe1c605c2fe7229d3d63a9cb':
Disable Proguard for the SampleBrowerPlugin
2010-08-27 16:04:52 -07:00
Brian Muramatsu
c1a98d0750
Merge "Update Android Eclair CTS Download Link to 2.1_r4"
2010-08-27 13:57:29 -07:00
Yu Shan Emily Lau
edf209e65f
am f1598c4c: am ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
...
Merge commit 'f1598c4cf40fb8c00c93acd27ab3230a9c9620e6'
* commit 'f1598c4cf40fb8c00c93acd27ab3230a9c9620e6':
Add the new option for the device sleep time. This is only for the scripted monkey.
2010-08-27 12:15:02 -07:00
Dianne Hackborn
3e4a5c8a5e
Update to follow clipboard APIs.
...
Change-Id: I905a499f2697bea218b6d4c3f8ec339fbe52c916
2010-08-27 11:06:05 -07:00
Dianne Hackborn
eaca8a46d1
am 1cb87dac: am 4f410fb5: Update to follow API.
...
Merge commit '1cb87dac3363386295e1483053563aff2e1ac989'
* commit '1cb87dac3363386295e1483053563aff2e1ac989':
Update to follow API.
2010-08-27 08:29:04 -07:00
Christopher Tate
f36c4e1236
Explicitly enable backup by default in SDK builds
...
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
2010-08-27 08:24:52 -07:00
Derek Sollenberger
131bf0b09e
am 704da604: Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
...
Merge commit '704da60406d259c5a3bfe273755861f80575d7ca' into gingerbread-plus-aosp
* commit '704da60406d259c5a3bfe273755861f80575d7ca':
Disable Proguard for the SampleBrowerPlugin
2010-08-27 07:45:43 -07:00
Derek Sollenberger
704da60406
Merge "Disable Proguard for the SampleBrowerPlugin" into gingerbread
2010-08-27 07:43:54 -07:00
Derek Sollenberger
48c0834ab5
Disable Proguard for the SampleBrowerPlugin
...
The native plugin library makes calls into java files that are
not often stripped out when Proguard optimizes the package.
Change-Id: I6ce8867dc9fa23e8a6adcc8daf9c8fb75f83c16d
2010-08-27 10:40:51 -04:00
Dianne Hackborn
b15335142e
Update preference samples.
...
Change-Id: Ia78d9c0f4f7e58f500aef55413b911904d0c40cd
2010-08-26 17:09:27 -07:00
Yu Shan Emily Lau
f1598c4cf4
am ea7d6e8e: Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
...
Merge commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5' into gingerbread-plus-aosp
* commit 'ea7d6e8e6568b777693c52183e9abf973786a6b5':
Add the new option for the device sleep time. This is only for the scripted monkey.
2010-08-26 15:27:57 -07:00
Yu Shan Emily Lau
ea7d6e8e65
Merge "Add the new option for the device sleep time. This is only for the scripted monkey." into gingerbread
2010-08-26 15:17:36 -07:00
Dianne Hackborn
1cb87dac33
am 4f410fb5: Update to follow API.
...
Merge commit '4f410fb5bfe0bad4760610b771edb33300470041' into gingerbread-plus-aosp
* commit '4f410fb5bfe0bad4760610b771edb33300470041':
Update to follow API.
2010-08-26 14:46:30 -07:00
Dianne Hackborn
4f410fb5bf
Update to follow API.
...
Change-Id: I9d6a1dc64cd4e55bf68994784c4a724aeafd7857
2010-08-26 14:38:20 -07:00
Yu Shan Emily Lau
9ab015751d
Add the new option for the device sleep time. This is only for the scripted monkey.
...
Change-Id: I4a6bd7133bbd2da9594a47e1f5529c5358cd9aed
2010-08-26 14:18:18 -07:00
Raphael Moll
23d595f53c
am 059e4eb3: am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
...
Merge commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455'
* commit '059e4eb3dbcc3ad645a2cd1f1670d92ab3dc1455':
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
2010-08-26 13:14:29 -07:00
Raphael Moll
059e4eb3db
am f08d230e: SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
...
Merge commit 'f08d230ed0d2612e79c121e0afa1e439b5702815' into gingerbread-plus-aosp
* commit 'f08d230ed0d2612e79c121e0afa1e439b5702815':
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
2010-08-26 09:02:13 -07:00
Chet Haase
42d5390018
Merge "Demo for using and testing animation events"
2010-08-25 17:40:44 -07:00
Chet Haase
2ab1da8886
Demo for using and testing animation events
...
Change-Id: I7db791928dc590fd724f4c71565b42bc366e519c
2010-08-25 16:49:54 -07:00
Brian Muramatsu
ce8933413f
Update Android Eclair CTS Download Link to 2.1_r4
...
Bug 2923901
Change-Id: I42b743c04954a77fc060d1a6fc6ec589e7afc72c
2010-08-25 16:18:35 -07:00
Jean-Baptiste Queru
4ade2d71dc
am 40ed6797: am 33462598: am bea98acf: reconcile open-source froyo into google variant
...
Merge commit '40ed6797ee0a734ec7af041b84998c610968503a'
* commit '40ed6797ee0a734ec7af041b84998c610968503a':
Explicitly enable backup by default in SDK builds
2010-08-25 10:17:11 -07:00
Jean-Baptiste Queru
40ed6797ee
am 33462598: am bea98acf: reconcile open-source froyo into google variant
...
Merge commit '33462598d8c20001483f3f2e1bca155fa3a83cd5' into gingerbread-plus-aosp
* commit '33462598d8c20001483f3f2e1bca155fa3a83cd5':
Explicitly enable backup by default in SDK builds
2010-08-25 10:15:11 -07:00
Jean-Baptiste Queru
33462598d8
am bea98acf: reconcile open-source froyo into google variant
...
Merge commit 'bea98acfa2253796aeade605c7020a7cc942af41' into gingerbread
* commit 'bea98acfa2253796aeade605c7020a7cc942af41':
Explicitly enable backup by default in SDK builds
2010-08-25 10:13:14 -07:00
Brad Fitzpatrick
32d72ad800
am 616acdb9: am 06bcd705: Quiet harmless StrictMode violations caused by the Monkey.
...
Merge commit '616acdb9cd78ecd4ae01ff2ccd3694ab8258f226'
* commit '616acdb9cd78ecd4ae01ff2ccd3694ab8258f226':
Quiet harmless StrictMode violations caused by the Monkey.
2010-08-25 10:12:52 -07:00
Brad Fitzpatrick
616acdb9cd
am 06bcd705: Quiet harmless StrictMode violations caused by the Monkey.
...
Merge commit '06bcd705606070aa71425fc557e72592a2405a0a' into gingerbread-plus-aosp
* commit '06bcd705606070aa71425fc557e72592a2405a0a':
Quiet harmless StrictMode violations caused by the Monkey.
2010-08-25 10:10:40 -07:00
Brad Fitzpatrick
06bcd70560
Quiet harmless StrictMode violations caused by the Monkey.
...
The monkey writes to System.out which is effectively a file and is
caught by StrictMode.
BUG=2947447
Change-Id: Iab38917f18baa319dad34d0c788bc9a10a041796
2010-08-25 09:45:49 -07:00
Jean-Baptiste Queru
bea98acfa2
reconcile open-source froyo into google variant
...
Change-Id: I2dcb50be9b2061fb90a10d40e430294233cc5039
2010-08-25 09:37:34 -07:00
Christopher Tate
b668245cf1
Explicitly enable backup by default in SDK builds
...
This change parallels a frameworks/base change that makes the default
backup state at boot "enabled, with LocalTransport as the currently
active transport." Device vendors who wish to ship the Google backup
transport need to explicitly disable backup by default (it is enabled
when the user agrees to the opt-in disclosure).
Change-Id: I6b0c5c059ef58effd5c121107ea3a5edd9e936cc
2010-08-25 08:28:07 -07:00
Chet Haase
989a1180de
Merge "Adding demo for xml animator loading"
2010-08-25 08:17:55 -07:00
Yu Shan Emily Lau
3e9d3728e7
am 6fae0ba4: am 27d0ec1e: Merge "Add the new option for the scripted monkey profile testing." into gingerbread
...
Merge commit '6fae0ba472388269bd31408e7c2f92333e445063'
* commit '6fae0ba472388269bd31408e7c2f92333e445063':
Add the new option for the scripted monkey profile testing.
2010-08-24 20:11:45 -07:00
Yu Shan Emily Lau
6fae0ba472
am 27d0ec1e: Merge "Add the new option for the scripted monkey profile testing." into gingerbread
...
Merge commit '27d0ec1e87dcf41960f87f203c1822e88f99ea38' into gingerbread-plus-aosp
* commit '27d0ec1e87dcf41960f87f203c1822e88f99ea38':
Add the new option for the scripted monkey profile testing.
2010-08-24 20:10:38 -07:00
Yu Shan Emily Lau
27d0ec1e87
Merge "Add the new option for the scripted monkey profile testing." into gingerbread
2010-08-24 20:08:29 -07:00
Brian Carlstrom
8f5dec6ad4
am 0de7bd8d: am 4a1b80c3: Merge "Added a couple of new properties." into gingerbread
...
Merge commit '0de7bd8d434ec62592d4ee881ae3e033090900c4'
* commit '0de7bd8d434ec62592d4ee881ae3e033090900c4':
Added a couple of new properties.
2010-08-24 20:04:39 -07:00
Brian Carlstrom
0de7bd8d43
am 4a1b80c3: Merge "Added a couple of new properties." into gingerbread
...
Merge commit '4a1b80c386fb2d87ae2d47f6b4c22599227d010f' into gingerbread-plus-aosp
* commit '4a1b80c386fb2d87ae2d47f6b4c22599227d010f':
Added a couple of new properties.
2010-08-24 20:02:24 -07:00
Brian Carlstrom
4a1b80c386
Merge "Added a couple of new properties." into gingerbread
2010-08-24 19:58:19 -07:00
Chet Haase
0366ddf4d3
Adding demo for xml animator loading
...
Change-Id: I77d4e4f3b26c47e7973dd64282c12a9d6c3b5dd1
2010-08-24 19:50:12 -07:00
Yu Shan Emily Lau
6035a57a97
Add the new option for the scripted monkey profile testing.
...
Change-Id: I1013a1a0daed948f509d9a29077f0e282baf1a10
2010-08-24 19:49:38 -07:00