OSDN Git Service
Xavier Ducrohet [Fri, 25 Sep 2009 18:27:20 +0000 (11:27 -0700)]
am
007aece2: am
f519910b: Merge change 26983 into eclair
Merge commit '
007aece2843d42eb04aba591f35dd106af40e04c'
* commit '
007aece2843d42eb04aba591f35dd106af40e04c':
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Raphael [Fri, 25 Sep 2009 18:17:13 +0000 (11:17 -0700)]
am
4c49f4e3: am
bf95b308: Merge change 26996 into eclair
Merge commit '
4c49f4e36c555987d3f6dcf0f7ecfda8ae893282'
* commit '
4c49f4e36c555987d3f6dcf0f7ecfda8ae893282':
JarUtils: Ignore visual source safe files in resources
Piotr Gurgul [Fri, 25 Sep 2009 18:15:44 +0000 (11:15 -0700)]
am
6f7e4180: am
09f517d4: Merge change 26976 into eclair
Merge commit '
6f7e4180833abd1a20fd6f39b32312aa2001075b'
* commit '
6f7e4180833abd1a20fd6f39b32312aa2001075b':
Add tested.project.dir to classpath for install and debug
Xavier Ducrohet [Fri, 25 Sep 2009 18:14:18 +0000 (11:14 -0700)]
am
f0581300: am
14ecfe10: Merge change 26915 into eclair
Merge commit '
f0581300ba2ae450bb03452d09b1fedfb4c9b7b2'
* commit '
f0581300ba2ae450bb03452d09b1fedfb4c9b7b2':
Fixed screenshot command line tool to deal with new RawImage
Brett Chabot [Fri, 25 Sep 2009 18:13:31 +0000 (11:13 -0700)]
am
80d7bbd3: am
7d223329: Merge change 26741 into eclair
Merge commit '
80d7bbd3054846238654f8e0dc7cfa9901e99417'
* commit '
80d7bbd3054846238654f8e0dc7cfa9901e99417':
Add workaround to runtest to build cts dependencies.
Raphael [Fri, 25 Sep 2009 18:13:27 +0000 (11:13 -0700)]
am
3776994c: am
a5115b64: Merge change 26885 into eclair
Merge commit '
3776994ce00c8f2423a7eb94641fb7c8a025a331'
* commit '
3776994ce00c8f2423a7eb94641fb7c8a025a331':
Tell the SDK that ApiDemoes requires Eclair preview.
Xavier Ducrohet [Fri, 25 Sep 2009 18:11:05 +0000 (11:11 -0700)]
am
07c5b18f: am
f9e2be14: Merge change 26901 into eclair
Merge commit '
07c5b18f7690417baa370063034425246ba39071'
* commit '
07c5b18f7690417baa370063034425246ba39071':
Move the screenshot button above the image
Xavier Ducrohet [Fri, 25 Sep 2009 18:11:01 +0000 (11:11 -0700)]
am
3d2fbef5: am
5eff9966: Merge change 26893 into eclair
Merge commit '
3d2fbef573fca6ae45937ae68fdcffdce5b92e59'
* commit '
3d2fbef573fca6ae45937ae68fdcffdce5b92e59':
Make archquery use the same VM as DDMS/Traceview
Xavier Ducrohet [Fri, 25 Sep 2009 18:01:40 +0000 (11:01 -0700)]
am
07324ef1: am
b936faf6: Merge change 26773 into eclair
Merge commit '
07324ef191c687573dcc071fc5afe915a64d89e1'
* commit '
07324ef191c687573dcc071fc5afe915a64d89e1':
Disable clipping toggle when not supported.
Xavier Ducrohet [Fri, 25 Sep 2009 18:01:36 +0000 (11:01 -0700)]
am
df254a6a: am
b9b29878: Merge change 26740 into eclair
Merge commit '
df254a6a3a031bde29172a0e0288ad25bfc2712b'
* commit '
df254a6a3a031bde29172a0e0288ad25bfc2712b':
Add warning on mismatch minSdkVersion.
Xavier Ducrohet [Fri, 25 Sep 2009 17:59:40 +0000 (10:59 -0700)]
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.
Xavier Ducrohet [Fri, 25 Sep 2009 17:58:59 +0000 (10:58 -0700)]
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.
Xavier Ducrohet [Fri, 25 Sep 2009 17:58:30 +0000 (10:58 -0700)]
am
9dac83d6: am
00652320: Merge change 26751 into eclair
Merge commit '
9dac83d6109531da86ce22389a5465dfc6d70a8c'
* commit '
9dac83d6109531da86ce22389a5465dfc6d70a8c':
Hide APK split UI (not ready yet)
Piotr Gurgul [Fri, 25 Sep 2009 17:56:50 +0000 (10:56 -0700)]
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
Piotr Gurgul [Fri, 25 Sep 2009 17:54:06 +0000 (10:54 -0700)]
am
284e84b6: am
95a32505: Merge change 26649 into eclair
Merge commit '
284e84b677f0e8588bf5d3ebc44b615d922b493f'
* commit '
284e84b677f0e8588bf5d3ebc44b615d922b493f':
Define tested.project.dir property for existing samples
Brett Chabot [Fri, 25 Sep 2009 17:50:49 +0000 (10:50 -0700)]
am
51d9d2df: am
9f7ae08e: Add cts-media test definition in eclair.
Merge commit '
51d9d2dff3c6f28aeb3610749eda105ae688a9d7'
* commit '
51d9d2dff3c6f28aeb3610749eda105ae688a9d7':
Add cts-media test definition in eclair.
Android (Google) Code Review [Fri, 25 Sep 2009 17:49:47 +0000 (13:49 -0400)]
Merge change 26983 into eclair
* changes:
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Marco Nelissen [Fri, 25 Sep 2009 15:51:27 +0000 (08:51 -0700)]
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.
Xavier Ducrohet [Fri, 25 Sep 2009 15:51:23 +0000 (08:51 -0700)]
am
6ef34c54: am
68cc2b00: Merge change 26490 into eclair
Merge commit '
6ef34c54db7e39817efa06c76865c937b79b3630'
* commit '
6ef34c54db7e39817efa06c76865c937b79b3630':
Fix possible NPE in DDMS plugin init.
Xavier Ducrohet [Fri, 25 Sep 2009 15:47:35 +0000 (08:47 -0700)]
am
68c32ee4: am
d582592e: Merge change 26495 into eclair
Merge commit '
68c32ee43e88e19b42caaeddb620a7f2cbf482dd'
* commit '
68c32ee43e88e19b42caaeddb620a7f2cbf482dd':
Disable menu items based on device/app selection.
Xavier Ducrohet [Fri, 25 Sep 2009 15:47:31 +0000 (08:47 -0700)]
am
7b26a0e0: am
c733a529: Merge change 26521 into eclair
Merge commit '
7b26a0e06634347011a357b22234a700ea4cf854'
* commit '
7b26a0e06634347011a357b22234a700ea4cf854':
Force update to the next plugin.
Xavier Ducrohet [Fri, 25 Sep 2009 15:47:17 +0000 (08:47 -0700)]
am
7856a59e: am
350187ab: Create Density based resource values when needed.
Merge commit '
7856a59e6896f0f96f9c01a6a7aaa09579a108f6'
* commit '
7856a59e6896f0f96f9c01a6a7aaa09579a108f6':
Create Density based resource values when needed.
Xavier Ducrohet [Fri, 25 Sep 2009 15:46:59 +0000 (08:46 -0700)]
am
154bc29a: am
038300d9: Merge change 26471 into eclair
Merge commit '
154bc29a03771667c39457e2476df30ee55eda56'
* commit '
154bc29a03771667c39457e2476df30ee55eda56':
Fix the qualifier match algorithm.
Piotr Gurgul [Fri, 25 Sep 2009 15:44:22 +0000 (08:44 -0700)]
am
d3868d38: am
fa0062da: Add legacy support for application.package property
Merge commit '
d3868d38033cd94a826a47852a8164c9b87ea2a6'
* commit '
d3868d38033cd94a826a47852a8164c9b87ea2a6':
Add legacy support for application.package property
Raphael [Fri, 25 Sep 2009 03:43:12 +0000 (20:43 -0700)]
am
bf95b308: Merge change 26996 into eclair
Merge commit '
bf95b3085438418b876ec5fb0ba0349c5fc133c0' into eclair-plus-aosp
* commit '
bf95b3085438418b876ec5fb0ba0349c5fc133c0':
JarUtils: Ignore visual source safe files in resources
Android (Google) Code Review [Fri, 25 Sep 2009 03:33:56 +0000 (23:33 -0400)]
Merge change 26996 into eclair
* changes:
JarUtils: Ignore visual source safe files in resources
Raphael [Fri, 25 Sep 2009 02:56:39 +0000 (19:56 -0700)]
JarUtils: Ignore visual source safe files in resources
BUG
1895888
Change-Id: I75af6ef9ba22701fae9e4c2b08f11b8a8c2aaaa6
Xavier Ducrohet [Fri, 25 Sep 2009 02:13:26 +0000 (19:13 -0700)]
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Change-Id: I4cf92b2f6ee66cd6f8e9b224879d8459e82949b6
Piotr Gurgul [Fri, 25 Sep 2009 01:45:47 +0000 (18:45 -0700)]
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
Android (Google) Code Review [Fri, 25 Sep 2009 01:35:55 +0000 (21:35 -0400)]
Merge change 26976 into eclair
* changes:
Add tested.project.dir to classpath for install and debug
Piotr Gurgul [Fri, 25 Sep 2009 01:17:22 +0000 (18:17 -0700)]
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.
Xavier Ducrohet [Thu, 24 Sep 2009 23:49:31 +0000 (16:49 -0700)]
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
Android (Google) Code Review [Thu, 24 Sep 2009 23:41:23 +0000 (19:41 -0400)]
Merge change 26915 into eclair
* changes:
Fixed screenshot command line tool to deal with new RawImage
Brett Chabot [Thu, 24 Sep 2009 23:14:17 +0000 (16:14 -0700)]
am
7d223329: Merge change 26741 into eclair
Merge commit '
7d2233294aefeb69ad4a17392bbd65044d22f258' into eclair-plus-aosp
* commit '
7d2233294aefeb69ad4a17392bbd65044d22f258':
Add workaround to runtest to build cts dependencies.
Raphael [Thu, 24 Sep 2009 23:14:13 +0000 (16:14 -0700)]
am
a5115b64: Merge change 26885 into eclair
Merge commit '
a5115b646e651228566b3a2823260cd7f70a882c' into eclair-plus-aosp
* commit '
a5115b646e651228566b3a2823260cd7f70a882c':
Tell the SDK that ApiDemoes requires Eclair preview.
Android (Google) Code Review [Thu, 24 Sep 2009 23:04:50 +0000 (19:04 -0400)]
Merge change 26741 into eclair
* changes:
Add workaround to runtest to build cts dependencies.
Xavier Ducrohet [Thu, 24 Sep 2009 21:33:45 +0000 (14:33 -0700)]
Fixed screenshot command line tool to deal with new RawImage
Also added a rotate method to DDMS.
Change-Id: I9ec2774ff0679b8b4f044341470b3dfa527f9680
Android (Google) Code Review [Thu, 24 Sep 2009 21:21:44 +0000 (17:21 -0400)]
Merge change 26885 into eclair
* changes:
Tell the SDK that ApiDemoes requires Eclair preview.
Xavier Ducrohet [Thu, 24 Sep 2009 21:16:37 +0000 (14:16 -0700)]
am
f9e2be14: Merge change 26901 into eclair
Merge commit '
f9e2be14764832f81a90f1f03ca9460be05191b3' into eclair-plus-aosp
* commit '
f9e2be14764832f81a90f1f03ca9460be05191b3':
Move the screenshot button above the image
Xavier Ducrohet [Thu, 24 Sep 2009 21:16:32 +0000 (14:16 -0700)]
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
Android (Google) Code Review [Thu, 24 Sep 2009 21:09:28 +0000 (17:09 -0400)]
Merge change 26901 into eclair
* changes:
Move the screenshot button above the image
Android (Google) Code Review [Thu, 24 Sep 2009 21:09:23 +0000 (17:09 -0400)]
Merge change 26893 into eclair
* changes:
Make archquery use the same VM as DDMS/Traceview
Brett Chabot [Thu, 24 Sep 2009 01:05:28 +0000 (18:05 -0700)]
Add workaround to runtest to build cts dependencies.
BUG
2141242
Xavier Ducrohet [Thu, 24 Sep 2009 20:20:42 +0000 (13:20 -0700)]
Move the screenshot button above the image
This will help when taking screenshots of large screen devices
on laptop screens.
Change-Id: Ief7b03d2f1711970e76f4dfe6086e3ea0d606c99
Xavier Ducrohet [Thu, 24 Sep 2009 19:16:03 +0000 (12:16 -0700)]
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.
Raphael [Thu, 24 Sep 2009 18:52:40 +0000 (11:52 -0700)]
Tell the SDK that ApiDemoes requires Eclair preview.
After the preview we'll change it to the final API level.
BUG
2141157
Xavier Ducrohet [Thu, 24 Sep 2009 06:42:31 +0000 (23:42 -0700)]
am
b936faf6: Merge change 26773 into eclair
Merge commit '
b936faf6e6a3e10408f257f948241cf984d7652a' into eclair-plus-aosp
* commit '
b936faf6e6a3e10408f257f948241cf984d7652a':
Disable clipping toggle when not supported.
Xavier Ducrohet [Thu, 24 Sep 2009 06:42:26 +0000 (23:42 -0700)]
am
b9b29878: Merge change 26740 into eclair
Merge commit '
b9b298782a9d33085e6df5d1d7c588178b4fb07a' into eclair-plus-aosp
* commit '
b9b298782a9d33085e6df5d1d7c588178b4fb07a':
Add warning on mismatch minSdkVersion.
Android (Google) Code Review [Thu, 24 Sep 2009 06:35:11 +0000 (02:35 -0400)]
Merge change 26773 into eclair
* changes:
Disable clipping toggle when not supported.
Android (Google) Code Review [Thu, 24 Sep 2009 06:34:55 +0000 (02:34 -0400)]
Merge change 26740 into eclair
* changes:
Add warning on mismatch minSdkVersion.
Xavier Ducrohet [Thu, 24 Sep 2009 03:42:28 +0000 (20:42 -0700)]
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.
Xavier Ducrohet [Thu, 24 Sep 2009 03:33:13 +0000 (20:33 -0700)]
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
Xavier Ducrohet [Thu, 24 Sep 2009 00:53:24 +0000 (17:53 -0700)]
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
Android (Google) Code Review [Thu, 24 Sep 2009 03:34:38 +0000 (23:34 -0400)]
Merge change 26540 into eclair
* changes:
Make the Density enum use the int value from the api Density enum.
Xavier Ducrohet [Thu, 24 Sep 2009 02:57:43 +0000 (19:57 -0700)]
am
00652320: Merge change 26751 into eclair
Merge commit '
006523204335a8c18ab57dbcd34a81a95a11d31f' into eclair-plus-aosp
* commit '
006523204335a8c18ab57dbcd34a81a95a11d31f':
Hide APK split UI (not ready yet)
Android (Google) Code Review [Thu, 24 Sep 2009 02:49:47 +0000 (22:49 -0400)]
Merge change 26751 into eclair
* changes:
Hide APK split UI (not ready yet)
Piotr Gurgul [Thu, 24 Sep 2009 01:34:29 +0000 (18:34 -0700)]
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
Xavier Ducrohet [Thu, 24 Sep 2009 01:22:49 +0000 (18:22 -0700)]
Hide APK split UI (not ready yet)
Change-Id: I2ace823139710e836c72cc323427024b54384e38
Piotr Gurgul [Wed, 23 Sep 2009 22:51:44 +0000 (15:51 -0700)]
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.
Piotr Gurgul [Wed, 23 Sep 2009 22:38:33 +0000 (15:38 -0700)]
am
95a32505: Merge change 26649 into eclair
Merge commit '
95a32505be164e0424d01fdd2b06c04cd54e6f06' into eclair-plus-aosp
* commit '
95a32505be164e0424d01fdd2b06c04cd54e6f06':
Define tested.project.dir property for existing samples
Android (Google) Code Review [Wed, 23 Sep 2009 22:30:28 +0000 (18:30 -0400)]
Merge change 26649 into eclair
* changes:
Define tested.project.dir property for existing samples
Xavier Ducrohet [Wed, 23 Sep 2009 04:01:14 +0000 (21:01 -0700)]
Make the Density enum use the int value from the api Density enum.
Change-Id: I13cace9a3fd7d17171ebe1e8b98c31adfa8509dc
Brett Chabot [Wed, 23 Sep 2009 20:27:34 +0000 (13:27 -0700)]
am
9f7ae08e: Add cts-media test definition in eclair.
Merge commit '
9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb' into eclair-plus-aosp
* commit '
9f7ae08eb147fd2a77c80b8c395a32b1d1bcaafb':
Add cts-media test definition in eclair.
Piotr Gurgul [Wed, 23 Sep 2009 19:15:05 +0000 (12:15 -0700)]
Define tested.project.dir property for existing samples
As now test projects are recognized by presence of the property
tested.project.dir, it has been manually added for existing
test project samples.
Brett Chabot [Wed, 23 Sep 2009 18:38:25 +0000 (11:38 -0700)]
Add cts-media test definition in eclair.
Xavier Ducrohet [Wed, 23 Sep 2009 18:36:39 +0000 (11:36 -0700)]
am
d88e95f9: am
dd9683a8: Merge change 26441 into eclair
Merge commit '
d88e95f92cdc46db8671dbcef242632c5b80fe7c'
* commit '
d88e95f92cdc46db8671dbcef242632c5b80fe7c':
Add support for Keyboard state "Soft"
Piotr Gurgul [Wed, 23 Sep 2009 18:35:35 +0000 (11:35 -0700)]
am
dccc44df: am
07fc39ed: Merge change 26440 into eclair
Merge commit '
dccc44df44448cc249080cbc350faa9cd7cbcb3e'
* commit '
dccc44df44448cc249080cbc350faa9cd7cbcb3e':
Add auto-generated tested.project.dir property
Xavier Ducrohet [Wed, 23 Sep 2009 18:35:31 +0000 (11:35 -0700)]
am
a6aae918: am
37240333: Merge change 26436 into eclair
Merge commit '
a6aae9183198f7725b34cf8686cb4640af560fd6'
* commit '
a6aae9183198f7725b34cf8686cb4640af560fd6':
Add a new skin to the SDK.
Piotr Gurgul [Wed, 23 Sep 2009 18:29:52 +0000 (11:29 -0700)]
am
b824d519: am
36ee5daf: Merge change 26329 into eclair
Merge commit '
b824d519146a813dff72f4baa4a1c7abbf78b962'
* commit '
b824d519146a813dff72f4baa4a1c7abbf78b962':
Distinguish jar folders and jar files in ApkBuilder script
Marco Nelissen [Wed, 23 Sep 2009 17:44:24 +0000 (10:44 -0700)]
am
265513f5: Merge change 26604 into eclair
Merge commit '
265513f5d3388f14c80a46d2fe033e0d93a9fdf1' into eclair-plus-aosp
* commit '
265513f5d3388f14c80a46d2fe033e0d93a9fdf1':
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.
Xavier Ducrohet [Wed, 23 Sep 2009 17:44:19 +0000 (10:44 -0700)]
am
68cc2b00: Merge change 26490 into eclair
Merge commit '
68cc2b0084e81cdf4156a57ebd43f06da4918ccc' into eclair-plus-aosp
* commit '
68cc2b0084e81cdf4156a57ebd43f06da4918ccc':
Fix possible NPE in DDMS plugin init.
Android (Google) Code Review [Wed, 23 Sep 2009 17:38:42 +0000 (13:38 -0400)]
Merge change 26604 into eclair
* changes:
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.
Android (Google) Code Review [Wed, 23 Sep 2009 17:33:35 +0000 (13:33 -0400)]
Merge change 26490 into eclair
* changes:
Fix possible NPE in DDMS plugin init.
Marco Nelissen [Wed, 23 Sep 2009 16:52:22 +0000 (09:52 -0700)]
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.
Xavier Ducrohet [Wed, 23 Sep 2009 00:06:31 +0000 (17:06 -0700)]
Fix possible NPE in DDMS plugin init.
Change-Id: Ie1649b319948514473e11c27b4ad126ffe2d40ef
Xavier Ducrohet [Wed, 23 Sep 2009 03:35:07 +0000 (20:35 -0700)]
am
d582592e: Merge change 26495 into eclair
Merge commit '
d582592ea58188ad3b43523326dda5f9ae2669c7' into eclair-plus-aosp
* commit '
d582592ea58188ad3b43523326dda5f9ae2669c7':
Disable menu items based on device/app selection.
Xavier Ducrohet [Wed, 23 Sep 2009 03:35:03 +0000 (20:35 -0700)]
am
c733a529: Merge change 26521 into eclair
Merge commit '
c733a52949c8f98e57ca360cb421f480487ff774' into eclair-plus-aosp
* commit '
c733a52949c8f98e57ca360cb421f480487ff774':
Force update to the next plugin.
Android (Google) Code Review [Wed, 23 Sep 2009 03:24:32 +0000 (23:24 -0400)]
Merge change 26495 into eclair
* changes:
Disable menu items based on device/app selection.
Android (Google) Code Review [Wed, 23 Sep 2009 03:06:48 +0000 (23:06 -0400)]
Merge change 26521 into eclair
* changes:
Force update to the next plugin.
Xavier Ducrohet [Wed, 23 Sep 2009 03:01:24 +0000 (20:01 -0700)]
am
350187ab: Create Density based resource values when needed.
Merge commit '
350187ab93e12031ddcd57e5faa2312e6099ebba' into eclair-plus-aosp
* commit '
350187ab93e12031ddcd57e5faa2312e6099ebba':
Create Density based resource values when needed.
Xavier Ducrohet [Wed, 23 Sep 2009 01:32:17 +0000 (18:32 -0700)]
Create Density based resource values when needed.
This will let the layoutlib know when to scale bitmaps
that are not in the native density of the rendering.
Change-Id: I08c99666460b5b5a3ed8d0aac7fa1b7c0136fd6b
Xavier Ducrohet [Wed, 23 Sep 2009 02:51:44 +0000 (19:51 -0700)]
am
038300d9: Merge change 26471 into eclair
Merge commit '
038300d95f69ab2ddf56526bcfc5f1028c40e6f2' into eclair-plus-aosp
* commit '
038300d95f69ab2ddf56526bcfc5f1028c40e6f2':
Fix the qualifier match algorithm.
Android (Google) Code Review [Wed, 23 Sep 2009 02:40:48 +0000 (22:40 -0400)]
Merge change 26471 into eclair
* changes:
Fix the qualifier match algorithm.
Xavier Ducrohet [Wed, 23 Sep 2009 01:45:44 +0000 (18:45 -0700)]
Force update to the next plugin.
Change-Id: I2f1042a087ca6227396a41d23eed26525fbbbbf6
Piotr Gurgul [Wed, 23 Sep 2009 00:53:54 +0000 (17:53 -0700)]
am
fa0062da: Add legacy support for application.package property
Merge commit '
fa0062da90e158b18a4250a003304bf40832423a' into eclair-plus-aosp
* commit '
fa0062da90e158b18a4250a003304bf40832423a':
Add legacy support for application.package property
Xavier Ducrohet [Wed, 23 Sep 2009 00:38:24 +0000 (17:38 -0700)]
Disable menu items based on device/app selection.
Change-Id: I78572430c68f2c1952a118814d4b467182004e23
Piotr Gurgul [Wed, 23 Sep 2009 00:28:26 +0000 (17:28 -0700)]
Add legacy support for application.package property
application.package in android_rules.xml and android_test_rules.xml has been
replaced by manifest.package which value is taken from AndroidManifest.xml.
This is because old versions of build.properties contain already
application.package property which has precedence over the extracted one
and overrides it.
Change-Id: I909e145926169922ec6ec0e179ad88c413aa85b2
Xavier Ducrohet [Tue, 22 Sep 2009 22:04:35 +0000 (15:04 -0700)]
Fix the qualifier match algorithm.
Add proper support for density and keyboard state match.
Change-Id: I410aba52ee0f0d9df31fa2abdc9485054595263f
Xavier Ducrohet [Tue, 22 Sep 2009 22:04:55 +0000 (15:04 -0700)]
am
dd9683a8: Merge change 26441 into eclair
Merge commit '
dd9683a8247c8e14619d068f81d10dea10e4decb' into eclair-plus-aosp
* commit '
dd9683a8247c8e14619d068f81d10dea10e4decb':
Add support for Keyboard state "Soft"
Android (Google) Code Review [Tue, 22 Sep 2009 21:57:40 +0000 (17:57 -0400)]
Merge change 26441 into eclair
* changes:
Add support for Keyboard state "Soft"
Piotr Gurgul [Tue, 22 Sep 2009 21:28:51 +0000 (14:28 -0700)]
am
07fc39ed: Merge change 26440 into eclair
Merge commit '
07fc39edda5e53bb3ddd980a05ab2c6573685feb' into eclair-plus-aosp
* commit '
07fc39edda5e53bb3ddd980a05ab2c6573685feb':
Add auto-generated tested.project.dir property
Xavier Ducrohet [Tue, 22 Sep 2009 21:28:47 +0000 (14:28 -0700)]
am
37240333: Merge change 26436 into eclair
Merge commit '
3724033353aa535248659ad86f4d4c1c2a10fb75' into eclair-plus-aosp
* commit '
3724033353aa535248659ad86f4d4c1c2a10fb75':
Add a new skin to the SDK.
Android (Google) Code Review [Tue, 22 Sep 2009 21:21:05 +0000 (17:21 -0400)]
Merge change 26440 into eclair
* changes:
Add auto-generated tested.project.dir property
Android (Google) Code Review [Tue, 22 Sep 2009 21:18:17 +0000 (17:18 -0400)]
Merge change 26436 into eclair
* changes:
Add a new skin to the SDK.
Xavier Ducrohet [Tue, 22 Sep 2009 21:16:26 +0000 (14:16 -0700)]
Add support for Keyboard state "Soft"
Change-Id: Ief65b3988973fb3b3d9edbbb99df9354ffe85663
Piotr Gurgul [Tue, 22 Sep 2009 20:58:28 +0000 (13:58 -0700)]
Add auto-generated tested.project.dir property
Adds tested.project.dir=".." to ProjectDir/tests/build.properties in order
to indicate automatically that this is a test project and point the
tested project directory.
Xavier Ducrohet [Tue, 22 Sep 2009 20:51:14 +0000 (13:51 -0700)]
Add a new skin to the SDK.
Change-Id: I988a5a4bf372c0f8608facf64314ada1e9ee791e
Piotr Gurgul [Tue, 22 Sep 2009 18:52:04 +0000 (11:52 -0700)]
am
36ee5daf: Merge change 26329 into eclair
Merge commit '
36ee5dafd0e106e40f6f1d3e3dffd60315ea659f' into eclair-plus-aosp
* commit '
36ee5dafd0e106e40f6f1d3e3dffd60315ea659f':
Distinguish jar folders and jar files in ApkBuilder script
Android (Google) Code Review [Tue, 22 Sep 2009 18:44:28 +0000 (14:44 -0400)]
Merge change 26329 into eclair
* changes:
Distinguish jar folders and jar files in ApkBuilder script
Piotr Gurgul [Tue, 22 Sep 2009 18:31:51 +0000 (11:31 -0700)]
am
d176d42d: am
3cbe2b79: Add automatic application package extraction from manifest
Merge commit '
d176d42d6716072da81c4334c53b99c2201ef0f2'
* commit '
d176d42d6716072da81c4334c53b99c2201ef0f2':
Add automatic application package extraction from manifest
OSDN Git Service
