Commit Graph

2264 Commits

Author SHA1 Message Date
Xavier Ducrohet
900234fc0a Move ConfigComposite in its own package. 2009-08-19 18:18:37 -07:00
Xavier Ducrohet
ffb7b7f81d Refactor Config UI out of Layout Editor. 2009-08-19 17:52:23 -07:00
Xavier Ducrohet
5a7fc6d9f6 am 14404927: am a457ef41: Merge change 21988 into donut
Merge commit '144049270b26ce1628c6a7e3afe7624588816ba9'

* commit '144049270b26ce1628c6a7e3afe7624588816ba9':
  Add OS version to ping service (win/mac only)
2009-08-19 16:51:08 -07:00
Xavier Ducrohet
144049270b am a457ef41: Merge change 21988 into donut
Merge commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018' into eclair

* commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018':
  Add OS version to ping service (win/mac only)
2009-08-19 16:37:33 -07:00
Android (Google) Code Review
a457ef41e8 Merge change 21988 into donut
* changes:
  Add OS version to ping service (win/mac only)
2009-08-19 16:20:22 -07:00
Xavier Ducrohet
1f49fa9b7c Add OS version to ping service (win/mac only) 2009-08-19 16:14:18 -07:00
Xavier Ducrohet
499436179d am a4876df2: Update some version number for Eclair SDK.
Merge commit 'a4876df288c02ca6e176877ab6b1b0065b069a49'

* commit 'a4876df288c02ca6e176877ab6b1b0065b069a49':
  Update some version number for Eclair SDK.
2009-08-19 11:02:08 -07:00
Xavier Ducrohet
a4876df288 Update some version number for Eclair SDK. 2009-08-18 17:34:01 -07:00
Ramanan Rajeswaran
1a72074641 am 2b0aea21: am d271d9a5: Merge change 21763 into donut
Merge commit '2b0aea21084fe303df36bcc96ed3f454c689f5aa'

* commit '2b0aea21084fe303df36bcc96ed3f454c689f5aa':
  Enable adb forwarding and starting up of monkey server
2009-08-18 17:20:00 -07:00
Ramanan Rajeswaran
2b0aea2108 am d271d9a5: Merge change 21763 into donut
Merge commit 'd271d9a503b181b240250ce2664ff22fbf4e763b' into eclair

* commit 'd271d9a503b181b240250ce2664ff22fbf4e763b':
  Enable adb forwarding and starting up of monkey server
2009-08-18 15:51:35 -07:00
Android (Google) Code Review
d271d9a503 Merge change 21763 into donut
* changes:
  Enable adb forwarding and starting up of monkey server
2009-08-18 15:49:12 -07:00
Xavier Ducrohet
ff334c60b7 am 3ba5c90f: am 9a7b2700: Merge change 21645 into donut
Merge commit '3ba5c90f8f727ed4f27cd65f4e51a5d15406f56d'

* commit '3ba5c90f8f727ed4f27cd65f4e51a5d15406f56d':
  Make SSL error a bit more human readable.
2009-08-18 13:16:18 -07:00
Xavier Ducrohet
3ba5c90f8f am 9a7b2700: Merge change 21645 into donut
Merge commit '9a7b2700fd015252f59a25524f8f6231f9bb1fc4' into eclair

* commit '9a7b2700fd015252f59a25524f8f6231f9bb1fc4':
  Make SSL error a bit more human readable.
2009-08-18 13:11:18 -07:00
Xavier Ducrohet
741069292e am b182b3d8: am b172b1a5: Merge change 21617 into donut
Merge commit 'b182b3d8ce8d16b5242d341df3885dac205f6789'

* commit 'b182b3d8ce8d16b5242d341df3885dac205f6789':
  ADT Export wizard now calls ZipAlign
2009-08-18 13:06:49 -07:00
Ramanan Rajeswaran
db71718554 Enable adb forwarding and starting up of monkey server 2009-08-18 13:02:23 -07:00
Xavier Ducrohet
b182b3d8ce am b172b1a5: Merge change 21617 into donut
Merge commit 'b172b1a5b041394cfdfc11bdadb10ef051f86c08' into eclair

* commit 'b172b1a5b041394cfdfc11bdadb10ef051f86c08':
  ADT Export wizard now calls ZipAlign
2009-08-18 13:00:27 -07:00
Xavier Ducrohet
6d8d974518 am 326aa6aa: am 513c2b51: Merge change 21598 into donut
Merge commit '326aa6aaab53aba4d79a3b4a5807a7dc9a015e24'

* commit '326aa6aaab53aba4d79a3b4a5807a7dc9a015e24':
  Remove WQVGA skin from SDK
2009-08-18 12:08:34 -07:00
Xavier Ducrohet
de16b198a3 am 85947db3: am 62410fc5: Merge change 21571 into donut
Merge commit '85947db31b5ef7e74a487450fc80ad75705034c6'

* commit '85947db31b5ef7e74a487450fc80ad75705034c6':
  Fixed QVGA skin and added WQVGA432 skin.
2009-08-18 12:08:32 -07:00
Raphael
984eafef2b am f4728e36: am b19a49d1: Merge change 21445 into donut
Merge commit 'f4728e364fadec1cacab1a7f0dcad50b85f7a3f5'

* commit 'f4728e364fadec1cacab1a7f0dcad50b85f7a3f5':
  SDK Updater, restart ADB after updating tool/addon package.
2009-08-18 12:08:29 -07:00
Bill Napier
87af34fc25 am 7379a2f3: am 1230661e: Merge change 21527 into donut
Merge commit '7379a2f3c642ffa471dcc1e8bae5cf2ecdc7f6e2'

* commit '7379a2f3c642ffa471dcc1e8bae5cf2ecdc7f6e2':
  Add getvar and listvar commands to monkey to allow inspection of properties on the device.
2009-08-18 12:08:27 -07:00
Raphael
e975193bd6 am 5a141326: am ecc1a3d0: Merge change 21463 into donut
Merge commit '5a1413266c721358773b64fbc046da392eeb0aba'

* commit '5a1413266c721358773b64fbc046da392eeb0aba':
  BUG 1922588: SDK Updater, Needs better license display
2009-08-18 12:08:25 -07:00
Ramanan Rajeswaran
b892d36a6f am 601cf24b: am 5aa76327: Add monkeyrunner to code base
Merge commit '601cf24b8afbd5590f2f632f88f6acbcb3d189c9'

* commit '601cf24b8afbd5590f2f632f88f6acbcb3d189c9':
  Add monkeyrunner to code base
2009-08-18 12:08:23 -07:00
Xia Wang
3949d1cbae am 68b4bfa8: am 12ad9fb1: 1. Add .c extension to native_test.py so that native test in C can also be picked up by testrunner. 2. Add netkeystore_test into continuous test cycle.
Merge commit '68b4bfa8d3217b6598689acde25b5dc4672c53a0'

* commit '68b4bfa8d3217b6598689acde25b5dc4672c53a0':
  1. Add .c extension to native_test.py so that native test in C can also be picked up by testrunner.
2009-08-18 12:08:21 -07:00
Xavier Ducrohet
48f44c4c16 am b7447929: am 25ec7998: Add OSGi.jar to the SDK (required by org.eclipse.jface)
Merge commit 'b74479296bbdba52c75e83c9509fd232e563babb'

* commit 'b74479296bbdba52c75e83c9509fd232e563babb':
  Add OSGi.jar to the SDK (required by org.eclipse.jface)
2009-08-18 12:08:18 -07:00
Xavier Ducrohet
326aa6aaab am 513c2b51: Merge change 21598 into donut
Merge commit '513c2b511627ad743b57af4aa8272788d397697c' into eclair

* commit '513c2b511627ad743b57af4aa8272788d397697c':
  Remove WQVGA skin from SDK
2009-08-18 11:01:32 -07:00
Xavier Ducrohet
85947db31b am 62410fc5: Merge change 21571 into donut
Merge commit '62410fc5a983bd1057622bc51801ad36cd316811' into eclair

* commit '62410fc5a983bd1057622bc51801ad36cd316811':
  Fixed QVGA skin and added WQVGA432 skin.
2009-08-18 11:01:14 -07:00
Raphael
f4728e364f am b19a49d1: Merge change 21445 into donut
Merge commit 'b19a49d1e6214df73d71db5a2341b67760cfdc6a' into eclair

* commit 'b19a49d1e6214df73d71db5a2341b67760cfdc6a':
  SDK Updater, restart ADB after updating tool/addon package.
2009-08-18 11:00:01 -07:00
Bill Napier
7379a2f3c6 am 1230661e: Merge change 21527 into donut
Merge commit '1230661e50f72c6fa32ce60c20094631c34d5ec6' into eclair

* commit '1230661e50f72c6fa32ce60c20094631c34d5ec6':
  Add getvar and listvar commands to monkey to allow inspection of properties on the device.
2009-08-18 10:59:59 -07:00
Raphael
5a1413266c am ecc1a3d0: Merge change 21463 into donut
Merge commit 'ecc1a3d0cf3af3dbbf4c190e1060fc1c0f8fb8a6' into eclair

* commit 'ecc1a3d0cf3af3dbbf4c190e1060fc1c0f8fb8a6':
  BUG 1922588: SDK Updater, Needs better license display
2009-08-18 10:59:46 -07:00
Ramanan Rajeswaran
601cf24b8a am 5aa76327: Add monkeyrunner to code base
Merge commit '5aa76327f5292ce1d1d23e96381b93c0272e4a2c' into eclair

* commit '5aa76327f5292ce1d1d23e96381b93c0272e4a2c':
  Add monkeyrunner to code base
2009-08-18 10:59:43 -07:00
Xia Wang
68b4bfa8d3 am 12ad9fb1: 1. Add .c extension to native_test.py so that native test in C can also be picked up by testrunner. 2. Add netkeystore_test into continuous test cycle.
Merge commit '12ad9fb10e1be799fa47a56ee1f1429b761db6e6' into eclair

* commit '12ad9fb10e1be799fa47a56ee1f1429b761db6e6':
  1. Add .c extension to native_test.py so that native test in C can also be picked up by testrunner.
2009-08-18 10:59:31 -07:00
Xavier Ducrohet
b74479296b am 25ec7998: Add OSGi.jar to the SDK (required by org.eclipse.jface)
Merge commit '25ec799863219bfa1b5b8c71b5033cb450e70918' into eclair

* commit '25ec799863219bfa1b5b8c71b5033cb450e70918':
  Add OSGi.jar to the SDK (required by org.eclipse.jface)
2009-08-18 10:59:10 -07:00
Raphael
77af400adc am d5518ba9: am 7ab6ca54: Merge change 21301 into donut
Merge commit 'd5518ba99a43028d1605355debeadb5a6bba4ab4'

* commit 'd5518ba99a43028d1605355debeadb5a6bba4ab4':
  BUG 1922590 : SDK Updater, customize message for Windows preventing
2009-08-18 10:48:18 -07:00
David 'Digit' Turner
316ab6510f am eea53d17: am 788aa67d: Merge change 21305 into donut
Merge commit 'eea53d173b40909f76edd84d4630d90b3afd18d4'

* commit 'eea53d173b40909f76edd84d4630d90b3afd18d4':
  Bump release version to android-1.6_r1
2009-08-18 10:48:15 -07:00
Xavier Ducrohet
c2eaa45d9f am 363fc3fe: am e058cf98: Merge change 21234 into donut
Merge commit '363fc3fe4074ded7eaee584ebd74f9b562302f8f'

* commit '363fc3fe4074ded7eaee584ebd74f9b562302f8f':
  Revamped QVGA skin and new WVGA 800/854 skins
2009-08-18 10:48:13 -07:00
Xavier Ducrohet
d345b0cc0a am a12ddd82: am 45519a23: Merge change 21230 into donut
Merge commit 'a12ddd82f7d7af95f4f47deab8875bd5b3e4b6ca'

* commit 'a12ddd82f7d7af95f4f47deab8875bd5b3e4b6ca':
  New HVGA skin.
2009-08-18 10:48:10 -07:00
Raphael
d5518ba99a am 7ab6ca54: Merge change 21301 into donut
Merge commit '7ab6ca5451431842a6b4b458aa0f59a9bf4b3b08' into eclair

* commit '7ab6ca5451431842a6b4b458aa0f59a9bf4b3b08':
  BUG 1922590 : SDK Updater, customize message for Windows preventing
2009-08-18 10:39:25 -07:00
David 'Digit' Turner
eea53d173b am 788aa67d: Merge change 21305 into donut
Merge commit '788aa67d1a3a94565b6209a07a023dca182b9b99' into eclair

* commit '788aa67d1a3a94565b6209a07a023dca182b9b99':
  Bump release version to android-1.6_r1
2009-08-18 10:39:17 -07:00
Xavier Ducrohet
363fc3fe40 am e058cf98: Merge change 21234 into donut
Merge commit 'e058cf98bc44cf0492c0eb3da25a61c9419cbdc7' into eclair

* commit 'e058cf98bc44cf0492c0eb3da25a61c9419cbdc7':
  Revamped QVGA skin and new WVGA 800/854 skins
2009-08-18 10:39:09 -07:00
Xavier Ducrohet
a12ddd82f7 am 45519a23: Merge change 21230 into donut
Merge commit '45519a23b06c7f01ce2337816128c9d285f47a73' into eclair

* commit '45519a23b06c7f01ce2337816128c9d285f47a73':
  New HVGA skin.
2009-08-18 10:39:07 -07:00
Android (Google) Code Review
9a7b2700fd Merge change 21645 into donut
* changes:
  Make SSL error a bit more human readable.
2009-08-18 10:30:43 -07:00
Xavier Ducrohet
010890a601 am cff78949: am f07bd569: Merge change 21242 into donut
Merge commit 'cff7894961a403ed226d7154c7ce535ba5e0cb8c'

* commit 'cff7894961a403ed226d7154c7ce535ba5e0cb8c':
  Codename in minsdkversion for release platform shows 'null' in error string
2009-08-18 08:51:27 -07:00
Xavier Ducrohet
32e0a928b3 am d41eb690: am 49ac0f9d: Merge change 21210 into donut
Merge commit 'd41eb690ed8f190745c79fd3488a60a65577863b'

* commit 'd41eb690ed8f190745c79fd3488a60a65577863b':
  Make sure that the android pref folder is always present when queried.
2009-08-18 08:51:25 -07:00
Xavier Ducrohet
ff6bdf6ac6 am 7cf5e539: am afd9ae8e: Merge change 21211 into donut
Merge commit '7cf5e53901a04c23bf19c2ffa502a3bacaa77412'

* commit '7cf5e53901a04c23bf19c2ffa502a3bacaa77412':
  Make the Ant script sign and zipalign release builds.
2009-08-18 08:51:23 -07:00
Xavier Ducrohet
4eca7e4a01 am 1cd05e68: am ac0faba9: Merge change 21220 into donut
Merge commit '1cd05e68aa2bab597569c04f9e4cb12d131ee419'

* commit '1cd05e68aa2bab597569c04f9e4cb12d131ee419':
  Update the version of the tools/docs/platforms
2009-08-18 08:51:21 -07:00
Xavier Ducrohet
cff7894961 am f07bd569: Merge change 21242 into donut
Merge commit 'f07bd569c361969e64aaebd9da1ddab15d86d425' into eclair

* commit 'f07bd569c361969e64aaebd9da1ddab15d86d425':
  Codename in minsdkversion for release platform shows 'null' in error string
2009-08-18 08:44:54 -07:00
Xavier Ducrohet
d41eb690ed am 49ac0f9d: Merge change 21210 into donut
Merge commit '49ac0f9df009ace5175267ad60be51114ee19817' into eclair

* commit '49ac0f9df009ace5175267ad60be51114ee19817':
  Make sure that the android pref folder is always present when queried.
2009-08-18 08:44:22 -07:00
Xavier Ducrohet
7cf5e53901 am afd9ae8e: Merge change 21211 into donut
Merge commit 'afd9ae8e9b3581203806dbba503233be2f768f9f' into eclair

* commit 'afd9ae8e9b3581203806dbba503233be2f768f9f':
  Make the Ant script sign and zipalign release builds.
2009-08-18 08:44:20 -07:00
Xavier Ducrohet
1cd05e68aa am ac0faba9: Merge change 21220 into donut
Merge commit 'ac0faba93338aa49cb5f71650e43de09a44e6b0e' into eclair

* commit 'ac0faba93338aa49cb5f71650e43de09a44e6b0e':
  Update the version of the tools/docs/platforms
2009-08-18 08:44:17 -07:00
Xavier Ducrohet
e0838dc828 am 6c7a3486: am 0d223cab: Merge change 21051 into donut
Merge commit '6c7a34862fbfe3cd09bca81f3053bdbc89d0ab78'

* commit '6c7a34862fbfe3cd09bca81f3053bdbc89d0ab78':
  Add support for the new qualifier in the config selector.
2009-08-18 08:36:06 -07:00