Xavier Ducrohet
007aece284
am f519910b: Merge change 26983 into eclair
...
Merge commit 'f519910b5624f7d7d7a16db482bc205c1b548837' into eclair-plus-aosp
* commit 'f519910b5624f7d7d7a16db482bc205c1b548837':
Fix colSpan for screenshot display from 3 to 4 in DDMS.
2009-09-25 10:59:40 -07:00
Xavier Ducrohet
70f5f03e62
am e223b7b3: am 61676a40: Merge change 26540 into eclair
...
Merge commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563'
* commit 'e223b7b371b4d75d2ad5d78713084bde0fe66563':
Make the Density enum use the int value from the api Density enum.
2009-09-25 10:58:59 -07:00
Xavier Ducrohet
391b1a52b4
am 9dac83d6: am 00652320: Merge change 26751 into eclair
...
Merge commit '9dac83d6109531da86ce22389a5465dfc6d70a8c'
* commit '9dac83d6109531da86ce22389a5465dfc6d70a8c':
Hide APK split UI (not ready yet)
2009-09-25 10:58:30 -07:00
Piotr Gurgul
aa459697d1
am c0109500: am 5b6f3cbe: Add --no-locals to dx when dexing instrumented classes
...
Merge commit 'c01095003cd3232323b191adeaa9093c4940cc42'
* commit 'c01095003cd3232323b191adeaa9093c4940cc42':
Add --no-locals to dx when dexing instrumented classes
2009-09-25 10:56:50 -07:00
Piotr Gurgul
5b47911df6
am 284e84b6: am 95a32505: Merge change 26649 into eclair
...
Merge commit '284e84b677f0e8588bf5d3ebc44b615d922b493f'
* commit '284e84b677f0e8588bf5d3ebc44b615d922b493f':
Define tested.project.dir property for existing samples
2009-09-25 10:54:06 -07:00
Brett Chabot
b6f7e7c84e
am 51d9d2df: am 9f7ae08e: Add cts-media test definition in eclair.
...
Merge commit '51d9d2dff3c6f28aeb3610749eda105ae688a9d7'
* commit '51d9d2dff3c6f28aeb3610749eda105ae688a9d7':
Add cts-media test definition in eclair.
2009-09-25 10:50:49 -07:00
Android (Google) Code Review
f519910b56
Merge change 26983 into eclair
...
* changes:
Fix colSpan for screenshot display from 3 to 4 in DDMS.
2009-09-25 13:49:47 -04:00
Marco Nelissen
5fdfb55129
am 1d448a8f: am 265513f5: Merge change 26604 into eclair
...
Merge commit '1d448a8f83f78cf48449bb806861224160ff85f9'
* commit '1d448a8f83f78cf48449bb806861224160ff85f9':
Fix the simulator. libhardware now needs a property named "default" to be set to the value "default", otherwise it won't fall back to the default implementation for a module.
2009-09-25 08:51:27 -07:00
Xavier Ducrohet
9cd9d69f8a
am 6ef34c54: am 68cc2b00: Merge change 26490 into eclair
...
Merge commit '6ef34c54db7e39817efa06c76865c937b79b3630'
* commit '6ef34c54db7e39817efa06c76865c937b79b3630':
Fix possible NPE in DDMS plugin init.
2009-09-25 08:51:23 -07:00
Xavier Ducrohet
89c98869bd
am 68c32ee4: am d582592e: Merge change 26495 into eclair
...
Merge commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd'
* commit '68c32ee43e88e19b42caaeddb620a7f2cbf482dd':
Disable menu items based on device/app selection.
2009-09-25 08:47:35 -07:00
Xavier Ducrohet
1c349c6970
am 7b26a0e0: am c733a529: Merge change 26521 into eclair
...
Merge commit '7b26a0e06634347011a357b22234a700ea4cf854'
* commit '7b26a0e06634347011a357b22234a700ea4cf854':
Force update to the next plugin.
2009-09-25 08:47:31 -07:00
Xavier Ducrohet
87490c270c
am 7856a59e: am 350187ab: Create Density based resource values when needed.
...
Merge commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6'
* commit '7856a59e6896f0f96f9c01a6a7aaa09579a108f6':
Create Density based resource values when needed.
2009-09-25 08:47:17 -07:00
Xavier Ducrohet
bb32d2fe52
am 154bc29a: am 038300d9: Merge change 26471 into eclair
...
Merge commit '154bc29a03771667c39457e2476df30ee55eda56'
* commit '154bc29a03771667c39457e2476df30ee55eda56':
Fix the qualifier match algorithm.
2009-09-25 08:46:59 -07:00
Piotr Gurgul
ad6cb0043a
am d3868d38: am fa0062da: Add legacy support for application.package property
...
Merge commit 'd3868d38033cd94a826a47852a8164c9b87ea2a6'
* commit 'd3868d38033cd94a826a47852a8164c9b87ea2a6':
Add legacy support for application.package property
2009-09-25 08:44:22 -07:00
Piotr Gurgul
dd38dd51a6
Add info about location of the coverage report
...
Target 'coverage' outputs now path to the generated coverage report.
Change-Id: I442c0ff002c5d269cf1f573674105691df9caec5
2009-09-24 21:37:00 -07:00
Raphael
4c49f4e36c
am bf95b308: Merge change 26996 into eclair
...
Merge commit 'bf95b3085438418b876ec5fb0ba0349c5fc133c0' into eclair-plus-aosp
* commit 'bf95b3085438418b876ec5fb0ba0349c5fc133c0':
JarUtils: Ignore visual source safe files in resources
2009-09-24 20:43:12 -07:00
Android (Google) Code Review
bf95b30854
Merge change 26996 into eclair
...
* changes:
JarUtils: Ignore visual source safe files in resources
2009-09-24 23:33:56 -04:00
Raphael
fbdd134b92
JarUtils: Ignore visual source safe files in resources
...
BUG 1895888
Change-Id: I75af6ef9ba22701fae9e4c2b08f11b8a8c2aaaa6
2009-09-24 19:56:39 -07:00
Xavier Ducrohet
aa1939f868
Fix colSpan for screenshot display from 3 to 4 in DDMS.
...
Change-Id: I4cf92b2f6ee66cd6f8e9b224879d8459e82949b6
2009-09-24 19:13:26 -07:00
Piotr Gurgul
6f7e418083
am 09f517d4: Merge change 26976 into eclair
...
Merge commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e' into eclair-plus-aosp
* commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e':
Add tested.project.dir to classpath for install and debug
2009-09-24 18:45:47 -07:00
Android (Google) Code Review
09f517d43e
Merge change 26976 into eclair
...
* changes:
Add tested.project.dir to classpath for install and debug
2009-09-24 21:35:55 -04:00
Piotr Gurgul
bca3ef5c25
Add tested.project.dir to classpath for install and debug
...
Now buildfile recognizes whether targets 'debug' or 'install' are being run for
an ordinary or test project and for the test projects classpath is extended
to enclose the tested project. Tested project is being compiled if necessary.
2009-09-24 18:17:22 -07:00
Xavier Ducrohet
f0581300ba
am 14ecfe10: Merge change 26915 into eclair
...
Merge commit '14ecfe10515807d57ba110671b760024cc5d1af8' into eclair-plus-aosp
* commit '14ecfe10515807d57ba110671b760024cc5d1af8':
Fixed screenshot command line tool to deal with new RawImage
2009-09-24 16:49:31 -07:00
Android (Google) Code Review
14ecfe1051
Merge change 26915 into eclair
...
* changes:
Fixed screenshot command line tool to deal with new RawImage
2009-09-24 19:41:23 -04:00
Brett Chabot
80d7bbd305
am 7d223329: Merge change 26741 into eclair
...
Merge commit '7d2233294aefeb69ad4a17392bbd65044d22f258' into eclair-plus-aosp
* commit '7d2233294aefeb69ad4a17392bbd65044d22f258':
Add workaround to runtest to build cts dependencies.
2009-09-24 16:14:17 -07:00
Raphael
3776994ce0
am a5115b64: Merge change 26885 into eclair
...
Merge commit 'a5115b646e651228566b3a2823260cd7f70a882c' into eclair-plus-aosp
* commit 'a5115b646e651228566b3a2823260cd7f70a882c':
Tell the SDK that ApiDemoes requires Eclair preview.
2009-09-24 16:14:13 -07:00
Android (Google) Code Review
7d2233294a
Merge change 26741 into eclair
...
* changes:
Add workaround to runtest to build cts dependencies.
2009-09-24 19:04:50 -04:00
Xavier Ducrohet
eef2447cfd
Fixed screenshot command line tool to deal with new RawImage
...
Also added a rotate method to DDMS.
Change-Id: I9ec2774ff0679b8b4f044341470b3dfa527f9680
2009-09-24 14:49:49 -07:00
Android (Google) Code Review
a5115b646e
Merge change 26885 into eclair
...
* changes:
Tell the SDK that ApiDemoes requires Eclair preview.
2009-09-24 17:21:44 -04:00
Xavier Ducrohet
07c5b18f76
am f9e2be14: Merge change 26901 into eclair
...
Merge commit 'f9e2be14764832f81a90f1f03ca9460be05191b3' into eclair-plus-aosp
* commit 'f9e2be14764832f81a90f1f03ca9460be05191b3':
Move the screenshot button above the image
2009-09-24 14:16:37 -07:00
Xavier Ducrohet
3d2fbef573
am 5eff9966: Merge change 26893 into eclair
...
Merge commit '5eff99663c35031975b33e25ab74e2a710231c0a' into eclair-plus-aosp
* commit '5eff99663c35031975b33e25ab74e2a710231c0a':
Make archquery use the same VM as DDMS/Traceview
2009-09-24 14:16:32 -07:00
Android (Google) Code Review
f9e2be1476
Merge change 26901 into eclair
...
* changes:
Move the screenshot button above the image
2009-09-24 17:09:28 -04:00
Android (Google) Code Review
5eff99663c
Merge change 26893 into eclair
...
* changes:
Make archquery use the same VM as DDMS/Traceview
2009-09-24 17:09:23 -04:00
Brett Chabot
2477b388ec
Add workaround to runtest to build cts dependencies.
...
BUG 2141242
2009-09-24 13:23:50 -07:00
Xavier Ducrohet
5ec5c213a9
Move the screenshot button above the image
...
This will help when taking screenshots of large screen devices
on laptop screens.
Change-Id: Ief7b03d2f1711970e76f4dfe6086e3ea0d606c99
2009-09-24 13:20:42 -07:00
Xavier Ducrohet
f92c16e287
Make archquery use the same VM as DDMS/Traceview
...
archquery is used to figure out whether the VM is 32 or 64 bit, but on
MacOS X, it used the normal "java" command while the application was
forced to use java 1.5
This could lead to cases where archquery ran in 1.6 64bit but the app
in 1.5 32 bit, creating a mismatch and make the app using the wrong
SWT version.
2009-09-24 12:27:37 -07:00
Raphael
50dc6c7556
Tell the SDK that ApiDemoes requires Eclair preview.
...
After the preview we'll change it to the final API level.
BUG 2141157
2009-09-24 11:52:40 -07:00
Xavier Ducrohet
07324ef191
am b936faf6: Merge change 26773 into eclair
...
Merge commit 'b936faf6e6a3e10408f257f948241cf984d7652a' into eclair-plus-aosp
* commit 'b936faf6e6a3e10408f257f948241cf984d7652a':
Disable clipping toggle when not supported.
2009-09-23 23:42:31 -07:00
Xavier Ducrohet
df254a6a3a
am b9b29878: Merge change 26740 into eclair
...
Merge commit 'b9b298782a9d33085e6df5d1d7c588178b4fb07a' into eclair-plus-aosp
* commit 'b9b298782a9d33085e6df5d1d7c588178b4fb07a':
Add warning on mismatch minSdkVersion.
2009-09-23 23:42:26 -07:00
Android (Google) Code Review
b936faf6e6
Merge change 26773 into eclair
...
* changes:
Disable clipping toggle when not supported.
2009-09-24 02:35:11 -04:00
Android (Google) Code Review
b9b298782a
Merge change 26740 into eclair
...
* changes:
Add warning on mismatch minSdkVersion.
2009-09-24 02:34:55 -04:00
Xavier Ducrohet
e223b7b371
am 61676a40: Merge change 26540 into eclair
...
Merge commit '61676a4061ef0400baa0c75c44a06bf740a55dc6' into eclair-plus-aosp
* commit '61676a4061ef0400baa0c75c44a06bf740a55dc6':
Make the Density enum use the int value from the api Density enum.
2009-09-23 20:42:28 -07:00
Xavier Ducrohet
0d3e110b36
Disable clipping toggle when not supported.
...
This is only supported in Eclair+, so the toggle button
is disable if the edited file is donut or before.
Change-Id: I8bf1f8a8aa3604f269cb226d788c5e1438a5ae0b
2009-09-23 20:40:36 -07:00
Xavier Ducrohet
d0306ecd58
Add warning on mismatch minSdkVersion.
...
This is for both Ant and ADT.
For Ant, also added a check for non-integer values when the platform
is not a preview.
BUG:2118374
Change-Id: Ic8ec533d66a31d9e4b51c9c38b5eaab97bca7414
2009-09-23 20:38:33 -07:00
Android (Google) Code Review
61676a4061
Merge change 26540 into eclair
...
* changes:
Make the Density enum use the int value from the api Density enum.
2009-09-23 23:34:38 -04:00
Xavier Ducrohet
9dac83d610
am 00652320: Merge change 26751 into eclair
...
Merge commit '006523204335a8c18ab57dbcd34a81a95a11d31f' into eclair-plus-aosp
* commit '006523204335a8c18ab57dbcd34a81a95a11d31f':
Hide APK split UI (not ready yet)
2009-09-23 19:57:43 -07:00
Android (Google) Code Review
0065232043
Merge change 26751 into eclair
...
* changes:
Hide APK split UI (not ready yet)
2009-09-23 22:49:47 -04:00
Piotr Gurgul
c01095003c
am 5b6f3cbe: Add --no-locals to dx when dexing instrumented classes
...
Merge commit '5b6f3cbe4b88a98262a8b30b546543b8394e1f67' into eclair-plus-aosp
* commit '5b6f3cbe4b88a98262a8b30b546543b8394e1f67':
Add --no-locals to dx when dexing instrumented classes
2009-09-23 18:34:29 -07:00
Xavier Ducrohet
019685753e
Hide APK split UI (not ready yet)
...
Change-Id: I2ace823139710e836c72cc323427024b54384e38
2009-09-23 18:22:49 -07:00
Piotr Gurgul
5b6f3cbe4b
Add --no-locals to dx when dexing instrumented classes
...
Emma instrumentation modifies .class files in that way they cannot be processed
by dx without --no-locals option.
2009-09-23 18:20:25 -07:00