Robert Greenwalt
e4aa9eb0e8
am d53aa9b9: Add Conn Man testing tools.
...
Merge commit 'd53aa9b917790c9f3480dd749b11707bd5c0f87a'
* commit 'd53aa9b917790c9f3480dd749b11707bd5c0f87a':
Add Conn Man testing tools.
2009-10-12 12:36:32 -07:00
Romain Guy
0b9c3dfb38
am ca69cda6: am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.
...
Merge commit 'ca69cda6f8c4c098dbd178929322d53646215339'
* commit 'ca69cda6f8c4c098dbd178929322d53646215339':
Fix the MergeRootFrameLayout rule by checking the presence of padding.
2009-10-12 12:33:32 -07:00
Xavier Ducrohet
4fe754022a
am c8546767: am 7ce7a783: Merge change I47bf273a into eclair
...
Merge commit 'c85467672fe53721222828b458716f9f9303808d'
* commit 'c85467672fe53721222828b458716f9f9303808d':
Update AVD creation UI to be easier for skin/sdcard.
2009-10-12 12:33:27 -07:00
Xavier Ducrohet
140bb97828
am 1a3566d5: am 740e6ef0: Merge change Iafd22833 into eclair
...
Merge commit '1a3566d530930679e8e025d2f869d015ab1cfe86'
* commit '1a3566d530930679e8e025d2f869d015ab1cfe86':
Add git ignore file for ninepatch eclipse project.
2009-10-12 12:33:22 -07:00
Raphael
529192dc0d
am f4971e75: am ca35b275: Merge change I15034878 into eclair
...
Merge commit 'f4971e75d235e918d4dd28f421a7c3b66ac84068'
* commit 'f4971e75d235e918d4dd28f421a7c3b66ac84068':
Fix Windows SDK build broken by layoutopt change.
2009-10-12 12:33:16 -07:00
Romain Guy
0f00352243
am ad1af627: am ece784c5: Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
...
Merge commit 'ad1af627ea393b2ba295daa58bccceab69a0452d'
* commit 'ad1af627ea393b2ba295daa58bccceab69a0452d':
Fix error in InefficientWeight rule. It would wrongly assume 0dip != 0dip.
2009-10-12 11:48:55 -07:00
Xavier Ducrohet
7d13d4319f
am 09c9ce61: am b5c18403: Merge change Idc3d3b2f into eclair
...
Merge commit '09c9ce619c4f51de2b4c4e42eecea33065dc0c97'
* commit '09c9ce619c4f51de2b4c4e42eecea33065dc0c97':
Moved the test data to their own package.
2009-10-12 11:46:21 -07:00
Romain Guy
5cd8a0b57d
am 0a4a1a54: am 2aaa22e0: Merge change Id7515f9a into eclair
...
Merge commit '0a4a1a549bd8bb9cd7d5002aada9bd42396956d3'
* commit '0a4a1a549bd8bb9cd7d5002aada9bd42396956d3':
New rules for layoutopt: IncorrectHeight/WidthIn[Horizontal]ScrollView, UselessView.
2009-10-12 11:45:45 -07:00
Xavier Ducrohet
585f26db2d
am be4c214e: am 8f242703: Merge change I56443773 into eclair
...
Merge commit 'be4c214e448191fff13eb749991d82409df4ba1e'
* commit 'be4c214e448191fff13eb749991d82409df4ba1e':
Add support for loading 9-patch from a stream.
2009-10-12 11:45:40 -07:00
Xavier Ducrohet
a57e3ddde3
am 80954af3: am 89482588: Merge change Iddb7f466 into eclair
...
Merge commit '80954af3113209f033334762ad98d82f15635994'
* commit '80954af3113209f033334762ad98d82f15635994':
Put kxml back in adt-test
2009-10-12 11:45:36 -07:00
Romain Guy
a6a360f2dd
am 8e2c6026: am 16a56b8c: Fix NPE in layoutopt when trying to open non-XML files.
...
Merge commit '8e2c602625c12e93ef9e4891e90d1737c90c0eba'
* commit '8e2c602625c12e93ef9e4891e90d1737c90c0eba':
Fix NPE in layoutopt when trying to open non-XML files.
2009-10-12 11:41:58 -07:00
Romain Guy
7733721242
am 426a5b44: am d9050e61: Merge change Idc9b152e into eclair
...
Merge commit '426a5b44d8d7a7679feae836e98b7e94704fbcf8'
* commit '426a5b44d8d7a7679feae836e98b7e94704fbcf8':
Add layoutopt to the SDK.
2009-10-12 11:40:41 -07:00
Xavier Ducrohet
030b98cf62
am 1651a351: am 67d9bcdf: Only create folder if not present.
...
Merge commit '1651a351c0b7159c88dbc8145d1d24f06e340718'
* commit '1651a351c0b7159c88dbc8145d1d24f06e340718':
Only create folder if not present.
2009-10-12 11:37:30 -07:00
Xavier Ducrohet
7c07042bea
am fab088f4: am 8251e4ef: Merge change Iab62c8e9 into eclair
...
Merge commit 'fab088f454ee2f2ea07cc37e21dd6209e2b9b569'
* commit 'fab088f454ee2f2ea07cc37e21dd6209e2b9b569':
Add layoutlib.jar to the classpath of adt-tests
2009-10-12 11:37:19 -07:00
Xavier Ducrohet
63d548b260
am c3bcbabd: am ee7c4739: Merge change Ic1eff784 into eclair
...
Merge commit 'c3bcbabdcf23176ac842253b60eaad02322198ad'
* commit 'c3bcbabdcf23176ac842253b60eaad02322198ad':
Fix script (and build)
2009-10-12 11:37:12 -07:00
Romain Guy
81a9c9c63d
am 104f9a74: am b7e69d20: Merge change Ic8fe0b36 into eclair
...
Merge commit '104f9a747d5ec5b7b4334ab9123dea6752a519f2'
* commit '104f9a747d5ec5b7b4334ab9123dea6752a519f2':
Add 3 more rules to layoutopt/uix:
2009-10-12 11:35:35 -07:00
Dianne Hackborn
b4bb414ceb
am 6677ac27: am d2fc4352: Merge change I6b618094 into eclair
...
Merge commit '6677ac27773768e006f69abd03aeafc92d66661a'
* commit '6677ac27773768e006f69abd03aeafc92d66661a':
Fix build.
2009-10-12 11:35:27 -07:00
Xavier Ducrohet
f033e77533
am 62611904: am 24bf2fa3: Add tests from layoutlib to adt-tests
...
Merge commit '6261190466f72703801652e7dcc69e093fba47f8'
* commit '6261190466f72703801652e7dcc69e093fba47f8':
Add tests from layoutlib to adt-tests
2009-10-12 11:35:03 -07:00
Xavier Ducrohet
60baa8afa3
am 9eb66652: am b6e85c05: Merge change Ieb4e722b into eclair
...
Merge commit '9eb66652e46d3424d42ee39897f5140a8305f609'
* commit '9eb66652e46d3424d42ee39897f5140a8305f609':
Add sdklib tests to the adt-tests Unit tests.
2009-10-12 11:33:05 -07:00
Brett Chabot
949d6e129e
am af86962d: am 6cc64cd2: Merge change I90b4c0e7 into eclair
...
Merge commit 'af86962d86160a9ab35f1bc9b4b373556ed0a099'
* commit 'af86962d86160a9ab35f1bc9b4b373556ed0a099':
Fix Eclipse sample tests.
2009-10-12 11:33:00 -07:00
Jack Palevich
68e943ef9a
am c2c1efc0: Merge change I27666897 into eclair-mr2
...
Merge commit 'c2c1efc02fcba6e68fd38282788c9cda204dde40'
* commit 'c2c1efc02fcba6e68fd38282788c9cda204dde40':
Make robot.png a raw resource.
2009-10-12 11:32:55 -07:00
Jack Palevich
bd3e51e101
am 888dfd73: Merge change Ia7a9186b into eclair-mr2
...
Merge commit '888dfd731b8d403c2003c38485d60b1fd1dd5e76'
* commit '888dfd731b8d403c2003c38485d60b1fd1dd5e76':
Remove non-working high-res robot texture.
2009-10-12 11:31:35 -07:00
Xavier Ducrohet
1b5d63be54
am 0dda405c: am e96bc57a: Merge change I7d761ffa into eclair
...
Merge commit '0dda405c6ec7ae2040f884ec71ad89bbc8ce7110'
* commit '0dda405c6ec7ae2040f884ec71ad89bbc8ce7110':
Fix best match resource selection when there's only one match.
2009-10-12 11:30:14 -07:00
Romain Guy
752f3ab16a
am 8fbe805f: am 06d3ec15: Only process XML files in layoutopt.
...
Merge commit '8fbe805f161c71e4dc471b2104484f221674de28'
* commit '8fbe805f161c71e4dc471b2104484f221674de28':
Only process XML files in layoutopt.
2009-10-12 11:30:09 -07:00
Romain Guy
fad2cff3b6
am 1db3cfa4: am d01b8dd3: Merge change I5dfb2567 into eclair
...
Merge commit '1db3cfa4f846ee01c55e3ac5e1ea0807bcde6345'
* commit '1db3cfa4f846ee01c55e3ac5e1ea0807bcde6345':
Add new rules to layoutopt: UseCompoundDrawables and UselessLayout.
2009-10-12 11:30:04 -07:00
Derek Sollenberger
62618ffbfa
am 4c46bf95: Merge change I108ad940 into eclair-mr2
...
Merge commit '4c46bf9558d928568905eeeda26657b80cbc399d'
* commit '4c46bf9558d928568905eeeda26657b80cbc399d':
Adding a full screen video sample plugin. Also cleaned up surface plugins to use the provided JavaVM.
2009-10-12 11:29:53 -07:00
Fred Quintana
3640a33afa
am db8fdbec: account manager api review changes
...
Merge commit 'db8fdbec4268697653d5688d0a0092483b3832f1'
* commit 'db8fdbec4268697653d5688d0a0092483b3832f1':
account manager api review changes
2009-10-12 11:29:40 -07:00
Romain Guy
a2ee84d03c
am 06f70393: Merge change I8e4697e1 into eclair
...
Merge commit '06f70393bd6c10c24136492a4616019822c63299'
* commit '06f70393bd6c10c24136492a4616019822c63299':
New layout optimization tool. Run layoutopt on the command line.
2009-10-12 11:25:58 -07:00
Raphael
a0f3732197
am 1061c0c7: Merge change I69afafa4 into eclair
...
Merge commit '1061c0c7dc20479626aa8b2d71485c9e17e7daf7'
* commit '1061c0c7dc20479626aa8b2d71485c9e17e7daf7':
ADT: Create project from existing sample in New Project Wizard
2009-10-12 11:23:44 -07:00
Xavier Ducrohet
3633f5c9f1
am 90ee703e: Fix resource resolution in the graphical layout editor.
...
Merge commit '90ee703e945cedaa222e8e5a2aba6333afff21b6'
* commit '90ee703e945cedaa222e8e5a2aba6333afff21b6':
Fix resource resolution in the graphical layout editor.
2009-10-12 11:23:39 -07:00
Xavier Ducrohet
3912060947
am d280d236: Monintor resolution/size chooser dialog
...
Merge commit 'd280d2363e412c43b1a7bfe044044d70d8895154'
* commit 'd280d2363e412c43b1a7bfe044044d70d8895154':
Monintor resolution/size chooser dialog
2009-10-12 11:23:34 -07:00
Xavier Ducrohet
3b10d94a49
am d13d440d: Emulator launch options dialog.
...
Merge commit 'd13d440d43a744ab6e596e52cf53eef79d222d01'
* commit 'd13d440d43a744ab6e596e52cf53eef79d222d01':
Emulator launch options dialog.
2009-10-12 11:23:30 -07:00
Raphael
15fdd346a2
am ef133787: SDK: Fix CustomLocale to properly setup Language+Country
...
Merge commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560'
* commit 'ef1337876b2dfbf76dc7e45e035f4a25ebc0f560':
SDK: Fix CustomLocale to properly setup Language+Country
2009-10-12 11:23:25 -07:00
Jeff Sharkey
65ab5053c9
am 480332f6: Revise template to match spec per jham.
...
Merge commit '480332f6c5ee0da552426716abff5ddd87074a5f'
* commit '480332f6c5ee0da552426716abff5ddd87074a5f':
Revise template to match spec per jham.
2009-10-12 11:23:15 -07:00
David 'Digit' Turner
ce3ff41ba0
am cc230ba0: Ensure the version of \'awk\' detected by host-setup.sh is used during the build
...
Merge commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee'
* commit 'cc230ba07c05ba5eec6412136ffebc4dd58e3aee':
Ensure the version of 'awk' detected by host-setup.sh is used during the build
2009-10-12 11:23:11 -07:00
David 'Digit' Turner
3264e24b22
am 79adc9fc: Merge change Ia78a7753 into eclair
...
Merge commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245'
* commit '79adc9fc9040760a722f2cc5fd15a517f4cbb245':
Remove bash-specific operator from build/host-setup.sh.
2009-10-12 11:23:06 -07:00
Xavier Ducrohet
cfa2b8acd3
am f0737030: Fix Android Manifest parser.
...
Merge commit 'f0737030570be15c1789d00db3593eb78cee9fbc'
* commit 'f0737030570be15c1789d00db3593eb78cee9fbc':
Fix Android Manifest parser.
2009-10-12 11:23:01 -07:00
Raphael
122c3dd9c6
am 2ace885b: ADT Manifest Editor: Fix for uses-sdk dup that won\'t go away.
...
Merge commit '2ace885b2945aba76266bc54ad9fa59fb4e05187'
* commit '2ace885b2945aba76266bc54ad9fa59fb4e05187':
ADT Manifest Editor: Fix for uses-sdk dup that won't go away.
2009-10-12 11:22:56 -07:00
Raphael
4e53735ede
am 657bdd7d: Merge change I8a575e49 into eclair
...
Merge commit '657bdd7d2851cd3b09f156c4abd085614efdc593'
* commit '657bdd7d2851cd3b09f156c4abd085614efdc593':
Fix CustomLocale to work with soft keyboard.
2009-10-12 11:22:52 -07:00
Xavier Ducrohet
cd53b3bc5a
am 2cdd16b7: fix the build
...
Merge commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652'
* commit '2cdd16b77f18b7e240c41e8bc95ba0d844767652':
fix the build
2009-10-12 11:22:47 -07:00
Raphael
9729e97806
am 1233e408: Merge change Ie3124796 into eclair
...
Merge commit '1233e408f77ad8752afa1387a94c8e2b378b6629'
* commit '1233e408f77ad8752afa1387a94c8e2b378b6629':
Ignore adt/eclipse project files in CustomLocale
2009-10-12 11:22:42 -07:00
Xavier Ducrohet
6a368fcf3e
am 227b8768: Load default GLE device profiles from the SDK.
...
Merge commit '227b8768fa8accff8a9e3555351af05d41ad7840'
* commit '227b8768fa8accff8a9e3555351af05d41ad7840':
Load default GLE device profiles from the SDK.
2009-10-12 11:22:37 -07:00
Nicolas Catania
4a5dc7e0c3
Minor cleanup, fix documentation.
...
Refactored the tests for the makefile existence in a
separate function.
Ran checkdoc and fixed errors.
2009-10-09 09:29:33 -07:00
Robert Greenwalt
d53aa9b917
Add Conn Man testing tools.
...
First test toggles wifi on/off forever (must have wifi associated to start,
or at least a remembered network in range)
Second test toggles the screen on off so you can test wifi cycle from that point.
Lastly adds some network-feature tests using mms or hipri net features.
bug: 2170806
2009-10-07 14:14:45 -07:00
Romain Guy
ca69cda6f8
am 9bda7101: Fix the MergeRootFrameLayout rule by checking the presence of padding.
...
Merge commit '9bda7101b8c7007e65f0a744d93e4e446086f3ec' into eclair-mr2
* commit '9bda7101b8c7007e65f0a744d93e4e446086f3ec':
Fix the MergeRootFrameLayout rule by checking the presence of padding.
2009-10-07 12:42:20 -07:00
Xavier Ducrohet
c85467672f
am 7ce7a783: Merge change I47bf273a into eclair
...
Merge commit '7ce7a7835d1f2c835451f3222b14ab44350d66ba' into eclair-mr2
* commit '7ce7a7835d1f2c835451f3222b14ab44350d66ba':
Update AVD creation UI to be easier for skin/sdcard.
2009-10-07 12:42:16 -07:00
Xavier Ducrohet
1a3566d530
am 740e6ef0: Merge change Iafd22833 into eclair
...
Merge commit '740e6ef010d99b782632a8476e65d5c667cad85a' into eclair-mr2
* commit '740e6ef010d99b782632a8476e65d5c667cad85a':
Add git ignore file for ninepatch eclipse project.
2009-10-07 12:42:12 -07:00
Romain Guy
9bda7101b8
Fix the MergeRootFrameLayout rule by checking the presence of padding.
...
Change-Id: I3a8b257025e74f6899233d9b99f7f86b5675e997
2009-10-07 12:31:17 -07: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