Commit Graph

2351 Commits

Author SHA1 Message Date
Chung-yih Wang
26f313aeeb am 6d74e724: am 84dcb451: Add unit test for new keystore.
Merge commit '6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1'

* commit '6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1':
  Add unit test for new keystore.
2009-10-01 11:48:35 -07:00
Xavier Ducrohet
57e3fc9de2 am 085f4f29: (-s ours) am 3b5cbc54: am fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '085f4f29da60da8bed71b5f8ab2ba3b56cd4923e'

* commit '085f4f29da60da8bed71b5f8ab2ba3b56cd4923e':
  Merge the new Ant script rules and template from Eclair (do not merge)
2009-10-01 11:46:45 -07:00
Raphael
837d7a1a03 am 4db669b9: am 603899e5: Merge change I95a34d28 into eclair
Merge commit '4db669b91e576c9eaeb8e44af594953f85de3788'

* commit '4db669b91e576c9eaeb8e44af594953f85de3788':
  ADT XML String Refactoring: fix refusing to edit @+id/blah.
2009-10-01 11:46:41 -07:00
Xavier Ducrohet
88f6ea9835 am 64b1e85c: (-s ours) am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '64b1e85ce910c4282cc5ca94f800f6103ace2d0b'

* commit '64b1e85ce910c4282cc5ca94f800f6103ace2d0b':
  Move to 1.6_r2 (DO NOT MERGE)
2009-10-01 11:46:36 -07:00
Daniel Sandler
26d17bc870 am b4e1e2e2: am 6f53211d: Merge change Ie022d478 into eclair
Merge commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9'

* commit 'b4e1e2e24c48c0a90bc4645113b164b419f31aa9':
  hdpi artwork for development/{apps,samples}.
2009-10-01 11:44:06 -07:00
Xavier Ducrohet
4e9aab460f am c41c521c: am fa4fb905: Merge change I96ff4429 into eclair
Merge commit 'c41c521cf324562a01c3939da2ed128d3772e332'

* commit 'c41c521cf324562a01c3939da2ed128d3772e332':
  Add support for 'android update test-project'.
2009-10-01 11:42:17 -07:00
Brett Chabot
c6ee4b844c am 8bc47e6e: am 7571d11b: Merge change I2cdb052a into eclair
Merge commit '8bc47e6e3da18df72110630eb6fdde82caa7d30d'

* commit '8bc47e6e3da18df72110630eb6fdde82caa7d30d':
  Import testrunner changes from puppetmaster to keep them in sync.
2009-10-01 11:40:17 -07:00
Omari Stephens
7da81d950c am 855489d1: am e377fa60: Merge change I17a9df5a into eclair
Merge commit '855489d1f98d7dd19e49acfc6b6c2d186334e998'

* commit '855489d1f98d7dd19e49acfc6b6c2d186334e998':
  Add contacts tests to the continuous test cycle
2009-10-01 11:40:12 -07:00
Raphael
27de6db35b am e73b8485: am 5ea7700f: Merge change Id5af7cf2 into eclair
Merge commit 'e73b8485a926ba1b4ec438b57e89c9c84200945a'

* commit 'e73b8485a926ba1b4ec438b57e89c9c84200945a':
  Add xdpi and ydpi to layout-configs XML Schema.
2009-10-01 11:38:34 -07:00
David 'Digit' Turner
6b7ed58b8b am 0f4c48a4: am b6d2a499: am 3c8d2e27: Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '0f4c48a4c7398e9d678c5212ba73155e0694b61d'

* commit '0f4c48a4c7398e9d678c5212ba73155e0694b61d':
  Fix the skins to do proper dpad rotation in landscape mode.
2009-10-01 11:37:53 -07:00
Xavier Ducrohet
2b601c2853 am 0287e8dc: am 1028accb: Merge change Ic86de6e9 into eclair
Merge commit '0287e8dc7605bb12f8e5fa9403414b034eb5ae19'

* commit '0287e8dc7605bb12f8e5fa9403414b034eb5ae19':
  Fix NPE when opening new layout file.
2009-10-01 11:14:45 -07:00
Dianne Hackborn
ad77c03f3e am f93f4d9c: am 5bc6141c: Add development setting for compatibility mode.
Merge commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b'

* commit 'f93f4d9c8b35c3c6ab1ea3ad57a3893cd443128b':
  Add development setting for compatibility mode.
2009-10-01 11:11:06 -07:00
Chung-yih Wang
6d74e724d0 am 84dcb451: Add unit test for new keystore.
Merge commit '84dcb451c210d6e93f5f516c27b781c067544895' into eclair-plus-aosp

* commit '84dcb451c210d6e93f5f516c27b781c067544895':
  Add unit test for new keystore.
2009-09-29 21:25:56 -07:00
Chung-yih Wang
84dcb451c2 Add unit test for new keystore.
+ change the package path.
+ add continuous flag.
2009-09-30 12:14:48 +08:00
Xavier Ducrohet
085f4f29da am 3b5cbc54: am fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit '3b5cbc5472c96deb80d90fde815bff486fd82cba' into eclair-plus-aosp

* commit '3b5cbc5472c96deb80d90fde815bff486fd82cba':
  Merge the new Ant script rules and template from Eclair (do not merge)
2009-09-29 18:36:15 -07:00
Raphael
4db669b91e am 603899e5: Merge change I95a34d28 into eclair
Merge commit '603899e5a9c50bcfd2149c7932050fda0524ec6b' into eclair-plus-aosp

* commit '603899e5a9c50bcfd2149c7932050fda0524ec6b':
  ADT XML String Refactoring: fix refusing to edit @+id/blah.
2009-09-29 18:36:11 -07:00
Xavier Ducrohet
64b1e85ce9 am 1fed4884: am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '1fed48849dcadedb68211c5d55c1b452d05b98bc' into eclair-plus-aosp

* commit '1fed48849dcadedb68211c5d55c1b452d05b98bc':
  Move to 1.6_r2 (DO NOT MERGE)
2009-09-29 18:36:07 -07:00
Xavier Ducrohet
3b5cbc5472 am fff9ff69: (-s ours) Merge the new Ant script rules and template from Eclair (do not merge)
Merge commit 'fff9ff696709e17ad73ae654e511907282bfc0fd' into eclair

* commit 'fff9ff696709e17ad73ae654e511907282bfc0fd':
  Merge the new Ant script rules and template from Eclair (do not merge)
2009-09-29 18:25:27 -07:00
Xavier Ducrohet
fff9ff6967 Merge the new Ant script rules and template from Eclair (do not merge) 2009-09-29 18:06:01 -07:00
Android (Google) Code Review
603899e5a9 Merge change I95a34d28 into eclair
* changes:
  ADT XML String Refactoring: fix refusing to edit @+id/blah.
2009-09-29 21:05:44 -04:00
Xavier Ducrohet
1fed48849d am 559f26b0: (-s ours) Move to 1.6_r2 (DO NOT MERGE)
Merge commit '559f26b0a5e80da467d97d42280c22e5044d7f30' into eclair

* commit '559f26b0a5e80da467d97d42280c22e5044d7f30':
  Move to 1.6_r2 (DO NOT MERGE)
2009-09-29 18:04:57 -07:00
Daniel Sandler
b4e1e2e24c am 6f53211d: Merge change Ie022d478 into eclair
Merge commit '6f53211d6d9095c67107ac72def6d405e33b7fac' into eclair-plus-aosp

* commit '6f53211d6d9095c67107ac72def6d405e33b7fac':
  hdpi artwork for development/{apps,samples}.
2009-09-29 18:01:01 -07:00
Android (Google) Code Review
6f53211d6d Merge change Ie022d478 into eclair
* changes:
  hdpi artwork for development/{apps,samples}.
2009-09-29 20:51:06 -04:00
Daniel Sandler
75ab82e25f hdpi artwork for development/{apps,samples}.
(drop dated 29-Sep-2009)

Change-Id: Ie022d478ed4eafc641e475dad94f507a6c358595
2009-09-29 20:41:24 -04:00
Xavier Ducrohet
c41c521cf3 am fa4fb905: Merge change I96ff4429 into eclair
Merge commit 'fa4fb905877d879f2a593e0726108784f204dc5d' into eclair-plus-aosp

* commit 'fa4fb905877d879f2a593e0726108784f204dc5d':
  Add support for 'android update test-project'.
2009-09-29 16:54:24 -07:00
Android (Google) Code Review
fa4fb90587 Merge change I96ff4429 into eclair
* changes:
  Add support for 'android update test-project'.
2009-09-29 19:46:01 -04:00
Raphael
c737e421e9 ADT XML String Refactoring: fix refusing to edit @+id/blah.
It correctly only refuses to edit @string/blah now.

This CL also does a bit of refactoring; I extracted some methods
and a class to make it a bit easier to read.

BUG 2066460

Change-Id: I95a34d28d6390ab0cc075f05ea83ceec04993ae9
2009-09-29 16:43:53 -07:00
Xavier Ducrohet
559f26b0a5 Move to 1.6_r2 (DO NOT MERGE) 2009-09-29 15:42:46 -07:00
Brett Chabot
8bc47e6e3d am 7571d11b: Merge change I2cdb052a into eclair
Merge commit '7571d11b7016b4dada3ad4db218c7d29214a13ba' into eclair-plus-aosp

* commit '7571d11b7016b4dada3ad4db218c7d29214a13ba':
  Import testrunner changes from puppetmaster to keep them in sync.
2009-09-29 15:38:35 -07:00
Omari Stephens
855489d1f9 am e377fa60: Merge change I17a9df5a into eclair
Merge commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f' into eclair-plus-aosp

* commit 'e377fa60d19b76a81b245f0e525652cdd22eb95f':
  Add contacts tests to the continuous test cycle
2009-09-29 15:38:31 -07:00
Android (Google) Code Review
7571d11b70 Merge change I2cdb052a into eclair
* changes:
  Import testrunner changes from puppetmaster to keep them in sync.
2009-09-29 18:35:53 -04:00
Brett Chabot
1d9928aaf7 Import testrunner changes from puppetmaster to keep them in sync. 2009-09-29 15:34:20 -07:00
Android (Google) Code Review
e377fa60d1 Merge change I17a9df5a into eclair
* changes:
  Add contacts tests to the continuous test cycle
2009-09-29 18:30:34 -04:00
Raphael
e73b8485a9 am 5ea7700f: Merge change Id5af7cf2 into eclair
Merge commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c' into eclair-plus-aosp

* commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c':
  Add xdpi and ydpi to layout-configs XML Schema.
2009-09-29 15:13:11 -07:00
Android (Google) Code Review
5ea7700ffa Merge change Id5af7cf2 into eclair
* changes:
  Add xdpi and ydpi to layout-configs XML Schema.
2009-09-29 18:05:10 -04:00
Raphael
9b8a8056d1 Add xdpi and ydpi to layout-configs XML Schema.
Also validate that whitespace around tokens is accepted.

BUG 2138329

Change-Id: Id5af7cf2b0689f05327a0cf0b17a525ceba78a12
2009-09-29 14:41:45 -07:00
David 'Digit' Turner
0f4c48a4c7 am b6d2a499: am 3c8d2e27: Fix the skins to do proper dpad rotation in landscape mode.
Merge commit 'b6d2a4990a21b78355ff95d62fd698b1dddbd793' into eclair-plus-aosp

* commit 'b6d2a4990a21b78355ff95d62fd698b1dddbd793':
  Fix the skins to do proper dpad rotation in landscape mode.
2009-09-29 14:37:58 -07:00
David 'Digit' Turner
b6d2a4990a am 3c8d2e27: Fix the skins to do proper dpad rotation in landscape mode.
Merge commit '3c8d2e272b71cca814dd694c3ba548f4a2a3a0a0' into eclair

* commit '3c8d2e272b71cca814dd694c3ba548f4a2a3a0a0':
  Fix the skins to do proper dpad rotation in landscape mode.
2009-09-29 14:28:08 -07:00
Omari Stephens
17a9df5a1d Add contacts tests to the continuous test cycle 2009-09-29 14:17:34 -07:00
David 'Digit' Turner
3c8d2e272b Fix the skins to do proper dpad rotation in landscape mode. 2009-09-29 13:19:40 -07:00
Jean-Michel Trivi
481fc7807a am 2296cfbd: am 8c77415e: Merge change Ic94b435b into eclair
Merge commit '2296cfbd37e696bd32e92c88a30dd290c7470018'

* commit '2296cfbd37e696bd32e92c88a30dd290c7470018':
  Fix bug 2142296 where the user couldn't back out of the JetBoy demo.
2009-09-29 11:10:58 -07:00
Xavier Ducrohet
4adb47c83b am ebe66dfe: am 9e4715e6: Fix ADT to use the new sdklib API
Merge commit 'ebe66dfea999e2e7bfe53f022938fbc273428b3d'

* commit 'ebe66dfea999e2e7bfe53f022938fbc273428b3d':
  Fix ADT to use the new sdklib API
2009-09-29 11:09:45 -07:00
Xavier Ducrohet
e0f44e7dbe am 064380b1: am 7d762002: Merge change I097b444e into eclair
Merge commit '064380b1edb326a6feb9d26b28bd590304eb1d7d'

* commit '064380b1edb326a6feb9d26b28bd590304eb1d7d':
  Fix ApiDemo Layout rendering test
2009-09-29 11:08:41 -07:00
Xavier Ducrohet
4caec81666 am 8f608886: am eafb009b: Merge change I663d4cb7 into eclair
Merge commit '8f60888662e3728c16415aabb75d869757cf5639'

* commit '8f60888662e3728c16415aabb75d869757cf5639':
  Update the project creation (from the command line):
2009-09-29 11:07:47 -07:00
Xavier Ducrohet
41552a06bf am 947561b3: am c124b2ab: Merge change Ib1b01007 into eclair
Merge commit '947561b337e35d7645f4efdb238fbc6f8281b3d5'

* commit '947561b337e35d7645f4efdb238fbc6f8281b3d5':
  Parse add-on supplied layout devices.
2009-09-29 11:07:43 -07:00
David 'Digit' Turner
60f1b901a6 am 51c5bc22: am fce2633d: Merge change I1dbeeca5 into eclair
Merge commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f'

* commit '51c5bc22bee411cf17ecdec88c8f1c4258594f1f':
  Fix NDK usage of libgcc.a when building shared libraries
2009-09-29 11:06:55 -07:00
Xavier Ducrohet
147d538482 am 708c5b4f: am e6ca35d4: Fix ResourceQualifier tests.
Merge commit '708c5b4fa4384b032984031e439a2edd7ba0d7d9'

* commit '708c5b4fa4384b032984031e439a2edd7ba0d7d9':
  Fix ResourceQualifier tests.
2009-09-29 11:06:28 -07:00
Xavier Ducrohet
0287e8dc76 am 1028accb: Merge change Ic86de6e9 into eclair
Merge commit '1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp

* commit '1028accb55919c0a84a4871002efb19a202c475c':
  Fix NPE when opening new layout file.
2009-09-29 10:18:55 -07:00
Android (Google) Code Review
1028accb55 Merge change Ic86de6e9 into eclair
* changes:
  Fix NPE when opening new layout file.
2009-09-29 13:09:41 -04:00
Dianne Hackborn
f93f4d9c8b am 5bc6141c: Add development setting for compatibility mode.
Merge commit '5bc6141cb29913d344b4a7881956af8b5074f560' into eclair-plus-aosp

* commit '5bc6141cb29913d344b4a7881956af8b5074f560':
  Add development setting for compatibility mode.
2009-09-29 00:15:28 -07:00