Raphael
7979131634
am 1061c0c7: Merge change I69afafa4 into eclair
...
Merge commit '1061c0c7dc20479626aa8b2d71485c9e17e7daf7' into eclair-plus-aosp
* commit '1061c0c7dc20479626aa8b2d71485c9e17e7daf7':
ADT: Create project from existing sample in New Project Wizard
2009-10-07 11:42:38 -07:00
Xavier Ducrohet
90a358ae86
am 90ee703e: Fix resource resolution in the graphical layout editor.
...
Merge commit '90ee703e945cedaa222e8e5a2aba6333afff21b6' into eclair-plus-aosp
* commit '90ee703e945cedaa222e8e5a2aba6333afff21b6':
Fix resource resolution in the graphical layout editor.
2009-10-07 11:42:28 -07:00
Xavier Ducrohet
fcaaf6d8f8
am d280d236: Monintor resolution/size chooser dialog
...
Merge commit 'd280d2363e412c43b1a7bfe044044d70d8895154' into eclair-plus-aosp
* commit 'd280d2363e412c43b1a7bfe044044d70d8895154':
Monintor resolution/size chooser dialog
2009-10-07 11:41:54 -07:00
Xavier Ducrohet
bda2828a56
am d13d440d: Emulator launch options dialog.
...
Merge commit 'd13d440d43a744ab6e596e52cf53eef79d222d01' into eclair-plus-aosp
* commit 'd13d440d43a744ab6e596e52cf53eef79d222d01':
Emulator launch options dialog.
2009-10-07 11:40:54 -07:00
Raphael
9659a64d1f
am ef133787: SDK: Fix CustomLocale to properly setup Language+Country
...
Merge commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560' into eclair-plus-aosp
* commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
SDK: Fix CustomLocale to properly setup Language+Country
2009-10-07 11:39:33 -07:00
Jeff Sharkey
c9c380a17d
am 480332f6: Revise template to match spec per jham.
...
Merge commit '480332f6c5ee0da552426716abff5ddd87074a5f' into eclair-plus-aosp
* commit '480332f6c5ee0da552426716abff5ddd87074a5f':
Revise template to match spec per jham.
2009-10-07 11:36:58 -07:00
David 'Digit' Turner
c63199ed40
am cc230ba0: Ensure the version of \'awk\' detected by host-setup.sh is used during the build
...
Merge commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee' into eclair-plus-aosp
* commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee':
Ensure the version of 'awk' detected by host-setup.sh is used during the build
2009-10-07 11:35:22 -07:00
David 'Digit' Turner
28af85b9a6
am 79adc9fc: Merge change Ia78a7753 into eclair
...
Merge commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245' into eclair-plus-aosp
* commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245':
Remove bash-specific operator from build/host-setup.sh.
2009-10-07 11:35:08 -07:00
Xavier Ducrohet
121bb65df3
am f0737030: Fix Android Manifest parser.
...
Merge commit 'f0737030570be15c1789d00db3593eb78cee9fbc' into eclair-plus-aosp
* commit 'f0737030570be15c1789d00db3593eb78cee9fbc':
Fix Android Manifest parser.
2009-10-07 11:34:21 -07:00
Raphael
2e0f6b80de
am 2ace885b: ADT Manifest Editor: Fix for uses-sdk dup that won\'t go away.
...
Merge commit '2ace885b2945aba76266bc54ad9fa59fb4e05187' into eclair-plus-aosp
* commit '2ace885b2945aba76266bc54ad9fa59fb4e05187':
ADT Manifest Editor: Fix for uses-sdk dup that won't go away.
2009-10-07 11:33:12 -07:00
Raphael
f320249b15
am 657bdd7d: Merge change I8a575e49 into eclair
...
Merge commit '657bdd7d2851cd3b09f156c4abd085614efdc593' into eclair-plus-aosp
* commit '657bdd7d2851cd3b09f156c4abd085614efdc593':
Fix CustomLocale to work with soft keyboard.
2009-10-07 11:32:26 -07:00
Xavier Ducrohet
1c4e0ab42c
am 2cdd16b7: fix the build
...
Merge commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652' into eclair-plus-aosp
* commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652':
fix the build
2009-10-07 11:32:15 -07:00
Raphael
06bba0adfe
am 1233e408: Merge change Ie3124796 into eclair
...
Merge commit '1233e408f77ad8752afa1387a94c8e2b378b6629' into eclair-plus-aosp
* commit '1233e408f77ad8752afa1387a94c8e2b378b6629':
Ignore adt/eclipse project files in CustomLocale
2009-10-07 11:32:06 -07:00
Xavier Ducrohet
442c5e5e9a
am 227b8768: Load default GLE device profiles from the SDK.
...
Merge commit '227b8768fa8accff8a9e3555351af05d41ad7840' into eclair-plus-aosp
* commit '227b8768fa8accff8a9e3555351af05d41ad7840':
Load default GLE device profiles from the SDK.
2009-10-07 11:32:01 -07:00
Chad Fawcett
041c6fc2c6
Tweaks to sample .classpath to reduce errors.
...
Removed the IM Provider, added some keystore/vpn paths.
2009-10-07 10:52:59 -04:00
Android (Google) Code Review
7ce7a7835d
Merge change I47bf273a into eclair
...
* changes:
Update AVD creation UI to be easier for skin/sdcard.
2009-10-06 20:19:28 -04:00
Android (Google) Code Review
740e6ef010
Merge change Iafd22833 into eclair
...
* changes:
Add git ignore file for ninepatch eclipse project.
2009-10-06 20:19:02 -04:00
Xavier Ducrohet
2eae036a59
Update AVD creation UI to be easier for skin/sdcard.
...
BUG: 2162198
Change-Id: I47bf273a730a1bf6e0c3f47fb5247f02d06259a5
2009-10-06 17:06:51 -07:00
Xavier Ducrohet
32eed32acd
Add git ignore file for ninepatch eclipse project.
...
Change-Id: Iafd228336791a4a5b3b9443ba7ea075f8bf1d8a0
2009-10-06 16:59:38 -07:00
Raphael
f4971e75d2
am ca35b275: Merge change I15034878 into eclair
...
Merge commit 'ca35b27533f920f304c6065537ffc5185c2022e5' into eclair-mr2
* commit 'ca35b27533f920f304c6065537ffc5185c2022e5':
Fix Windows SDK build broken by layoutopt change.
2009-10-06 16:56:30 -07:00
Android (Google) Code Review
ca35b27533
Merge change I15034878 into eclair
...
* changes:
Fix Windows SDK build broken by layoutopt change.
2009-10-06 19:46:08 -04:00
Raphael
40d4b03ee5
Fix Windows SDK build broken by layoutopt change.
...
Change-Id: I1503487861ef20dead3de62548feea6328e0d60d
2009-10-06 16:43:05 -07:00
Romain Guy
ad1af627ea
am ece784c5: Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
...
Merge commit 'ece784c583edbbeb56e8a74d4ddf039121d0df71' into eclair-mr2
* commit 'ece784c583edbbeb56e8a74d4ddf039121d0df71':
Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
2009-10-06 16:33:57 -07:00
Romain Guy
ece784c583
Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
...
Change-Id: I2ab9b3c6b57744563c87cb8457c55afd0cbfcb57
2009-10-06 16:22:58 -07:00
Marco Nelissen
42dbb8b92b
Three implementations of a live wallpaper showing a spinning cube.
...
One very basic, one slightly more elaborate (selectable shape, settings panel), and one that uses renderscript.
2009-10-06 16:11:00 -07:00
Xavier Ducrohet
09c9ce619c
am b5c18403: Merge change Idc3d3b2f into eclair
...
Merge commit 'b5c1840392bf93edd8caaefb7136b46f2b369773' into eclair-mr2
* commit 'b5c1840392bf93edd8caaefb7136b46f2b369773':
Moved the test data to their own package.
2009-10-06 15:28:16 -07:00
Android (Google) Code Review
b5c1840392
Merge change Idc3d3b2f into eclair
...
* changes:
Moved the test data to their own package.
2009-10-06 18:19:28 -04:00
Romain Guy
0a4a1a549b
am 2aaa22e0: Merge change Id7515f9a into eclair
...
Merge commit '2aaa22e0575faf6c83990233333fbf010fa46ef3' into eclair-mr2
* commit '2aaa22e0575faf6c83990233333fbf010fa46ef3':
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
2009-10-06 15:05:06 -07:00
Android (Google) Code Review
2aaa22e057
Merge change Id7515f9a into eclair
...
* changes:
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
2009-10-06 17:56:15 -04:00
Xavier Ducrohet
be4c214e44
am 8f242703: Merge change I56443773 into eclair
...
Merge commit '8f242703341e616f9239706a27f5ecb675f808e7' into eclair-mr2
* commit '8f242703341e616f9239706a27f5ecb675f808e7':
Add support for loading 9-patch from a stream.
2009-10-06 12:44:24 -07:00
Xavier Ducrohet
80954af311
am 89482588: Merge change Iddb7f466 into eclair
...
Merge commit '894825887e9668872c1925704afcf3340b7c009b' into eclair-mr2
* commit '894825887e9668872c1925704afcf3340b7c009b':
Put kxml back in adt-test
2009-10-06 12:44:20 -07:00
Android (Google) Code Review
8f24270334
Merge change I56443773 into eclair
...
* changes:
Add support for loading 9-patch from a stream.
2009-10-06 15:35:46 -04:00
Xavier Ducrohet
db9d3e2baf
Add support for loading 9-patch from a stream.
...
This will be used by the tests.
Also added the eclipse project files.
Change-Id: I56443773d90594475fc3f14464d48e56d5a1bbb5
2009-10-06 12:10:42 -07:00
Xavier Ducrohet
3f71486cbd
Moved the test data to their own package.
...
This allows us to select the whole package for binary inclusion
in adt-test (which doesn't automatically take any non java file for
packaging)
Change-Id: Idc3d3b2f27623de1b0fccd7e01dd88948923081c
2009-10-06 12:06:46 -07:00
Romain Guy
1e2cbdfa84
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
...
This change also refactors the uix library to remove an unnecessary class (LayoutNode.)
The refactoring helps writing cleaner script by accessing only the node object instead
of xml and node. This change also augment the capabilities of the node in Groovy scripts.
Change-Id: Id7515f9a79826909834d82496a6d9dfbc19988ad
2009-10-06 11:42:02 -07:00
Android (Google) Code Review
894825887e
Merge change Iddb7f466 into eclair
...
* changes:
Put kxml back in adt-test
2009-10-06 14:16:58 -04:00
Romain Guy
8e2c602625
am 16a56b8c: Fix NPE in layoutopt when trying to open non-XML files.
...
Merge commit '16a56b8ccd39c812c8c7b86bd83ec9c492d19de9' into eclair-mr2
* commit '16a56b8ccd39c812c8c7b86bd83ec9c492d19de9':
Fix NPE in layoutopt when trying to open non-XML files.
2009-10-06 11:11:42 -07:00
Romain Guy
16a56b8ccd
Fix NPE in layoutopt when trying to open non-XML files.
...
Change-Id: I59900c35996ce4465e2ecfd2eb26a19e3fa66403
2009-10-06 10:51:05 -07:00
Xavier Ducrohet
cce979fcf5
Put kxml back in adt-test
...
Since adt doesn't export the package, it's just easier that way.
Change-Id: Iddb7f4660ccc0bc51374128a544975596cb051aa
2009-10-06 10:45:18 -07:00
Romain Guy
426a5b44d8
am d9050e61: Merge change Idc9b152e into eclair
...
Merge commit 'd9050e6102fb37c8f5df02dbfd17cac728b9f0e4' into eclair-mr2
* commit 'd9050e6102fb37c8f5df02dbfd17cac728b9f0e4':
Add layoutopt to the SDK.
2009-10-06 10:14:25 -07:00
Android (Google) Code Review
d9050e6102
Merge change Idc9b152e into eclair
...
* changes:
Add layoutopt to the SDK.
2009-10-06 13:05:53 -04:00
Xavier Ducrohet
1651a351c0
am 67d9bcdf: Only create folder if not present.
...
Merge commit '67d9bcdf5cfe8c2862280ea6e55c4beed05432ef' into eclair-mr2
* commit '67d9bcdf5cfe8c2862280ea6e55c4beed05432ef':
Only create folder if not present.
2009-10-05 21:06:37 -07:00
Xavier Ducrohet
67d9bcdf5c
Only create folder if not present.
...
Change-Id: I77673e0f43d7a00f42e2a97663bd9aed2aaf09f2
2009-10-05 20:55:13 -07:00
Xavier Ducrohet
fab088f454
am 8251e4ef: Merge change Iab62c8e9 into eclair
...
Merge commit '8251e4ef4672be54a3f38748c05fd66c967c64b4' into eclair-mr2
* commit '8251e4ef4672be54a3f38748c05fd66c967c64b4':
Add layoutlib.jar to the classpath of adt-tests
2009-10-05 20:20:11 -07:00
Android (Google) Code Review
8251e4ef46
Merge change Iab62c8e9 into eclair
...
* changes:
Add layoutlib.jar to the classpath of adt-tests
2009-10-05 23:09:40 -04:00
Xavier Ducrohet
4aab78e0b9
Add layoutlib.jar to the classpath of adt-tests
...
Change-Id: Iab62c8e9849873e91640484c70110660aabd4b8e
2009-10-05 20:08:31 -07:00
Xavier Ducrohet
c3bcbabdcf
am ee7c4739: Merge change Ic1eff784 into eclair
...
Merge commit 'ee7c473929c62bb9f9f0e21e9ca850174b9041a1' into eclair-mr2
* commit 'ee7c473929c62bb9f9f0e21e9ca850174b9041a1':
Fix script (and build)
2009-10-05 19:44:34 -07:00
Romain Guy
9d489ddff9
Add layoutopt to the SDK.
...
Change-Id: Idc9b152e2a5abffaa9feb2cf70791d8288cfa1dd
2009-10-05 19:38:40 -07:00
Android (Google) Code Review
ee7c473929
Merge change Ic1eff784 into eclair
...
* changes:
Fix script (and build)
2009-10-05 22:35:24 -04:00
Xavier Ducrohet
ef6dcb646c
Fix script (and build)
...
Change-Id: Ic1eff7843219c42867e477ad8bfbdf89167a0061
2009-10-05 19:33:35 -07:00