Commit Graph

2305 Commits

Author SHA1 Message Date
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
Piotr Gurgul
284e84b677 am 95a32505: Merge change 26649 into eclair
Merge commit '95a32505be164e0424d01fdd2b06c04cd54e6f06' into eclair-plus-aosp

* commit '95a32505be164e0424d01fdd2b06c04cd54e6f06':
  Define tested.project.dir property for existing samples
2009-09-23 15:38:33 -07:00
Android (Google) Code Review
95a32505be Merge change 26649 into eclair
* changes:
  Define tested.project.dir property for existing samples
2009-09-23 18:30:28 -04:00
Xavier Ducrohet
252ad3146a Make the Density enum use the int value from the api Density enum.
Change-Id: I13cace9a3fd7d17171ebe1e8b98c31adfa8509dc
2009-09-23 15:11:32 -07:00
Brett Chabot
51d9d2dff3 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.
2009-09-23 13:27:34 -07:00
Piotr Gurgul
979d5abe06 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.
2009-09-23 12:15:05 -07:00
Brett Chabot
9f7ae08eb1 Add cts-media test definition in eclair. 2009-09-23 11:38:25 -07:00
Xavier Ducrohet
53f75a0e84 am d88e95f9: am dd9683a8: Merge change 26441 into eclair
Merge commit 'd88e95f92cdc46db8671dbcef242632c5b80fe7c'

* commit 'd88e95f92cdc46db8671dbcef242632c5b80fe7c':
  Add support for Keyboard state "Soft"
2009-09-23 11:36:39 -07:00
Piotr Gurgul
194010621f am dccc44df: am 07fc39ed: Merge change 26440 into eclair
Merge commit 'dccc44df44448cc249080cbc350faa9cd7cbcb3e'

* commit 'dccc44df44448cc249080cbc350faa9cd7cbcb3e':
  Add auto-generated tested.project.dir property
2009-09-23 11:35:35 -07:00
Xavier Ducrohet
0094ad1ab4 am a6aae918: am 37240333: Merge change 26436 into eclair
Merge commit 'a6aae9183198f7725b34cf8686cb4640af560fd6'

* commit 'a6aae9183198f7725b34cf8686cb4640af560fd6':
  Add a new skin to the SDK.
2009-09-23 11:35:31 -07:00
Piotr Gurgul
221bc2dd35 am b824d519: am 36ee5daf: Merge change 26329 into eclair
Merge commit 'b824d519146a813dff72f4baa4a1c7abbf78b962'

* commit 'b824d519146a813dff72f4baa4a1c7abbf78b962':
  Distinguish jar folders and jar files in ApkBuilder script
2009-09-23 11:29:52 -07:00
Marco Nelissen
1d448a8f83 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.
2009-09-23 10:44:24 -07:00
Xavier Ducrohet
6ef34c54db am 68cc2b00: Merge change 26490 into eclair
Merge commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc' into eclair-plus-aosp

* commit '68cc2b0084e81cdf4156a57ebd43f06da4918ccc':
  Fix possible NPE in DDMS plugin init.
2009-09-23 10:44:19 -07:00
Android (Google) Code Review
265513f5d3 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.
2009-09-23 13:38:42 -04:00
Android (Google) Code Review
68cc2b0084 Merge change 26490 into eclair
* changes:
  Fix possible NPE in DDMS plugin init.
2009-09-23 13:33:35 -04:00
Marco Nelissen
bbabb3ae5b 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-23 09:52:22 -07:00
Xavier Ducrohet
c29e58952e Fix possible NPE in DDMS plugin init.
Change-Id: Ie1649b319948514473e11c27b4ad126ffe2d40ef
2009-09-22 20:37:24 -07:00
Xavier Ducrohet
68c32ee43e am d582592e: Merge change 26495 into eclair
Merge commit 'd582592ea58188ad3b43523326dda5f9ae2669c7' into eclair-plus-aosp

* commit 'd582592ea58188ad3b43523326dda5f9ae2669c7':
  Disable menu items based on device/app selection.
2009-09-22 20:35:07 -07:00
Xavier Ducrohet
7b26a0e066 am c733a529: Merge change 26521 into eclair
Merge commit 'c733a52949c8f98e57ca360cb421f480487ff774' into eclair-plus-aosp

* commit 'c733a52949c8f98e57ca360cb421f480487ff774':
  Force update to the next plugin.
2009-09-22 20:35:03 -07:00
Android (Google) Code Review
d582592ea5 Merge change 26495 into eclair
* changes:
  Disable menu items based on device/app selection.
2009-09-22 23:24:32 -04:00
Android (Google) Code Review
c733a52949 Merge change 26521 into eclair
* changes:
  Force update to the next plugin.
2009-09-22 23:06:48 -04:00
Xavier Ducrohet
7856a59e68 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.
2009-09-22 20:01:24 -07:00
Xavier Ducrohet
350187ab93 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
2009-09-22 19:51:52 -07:00
Xavier Ducrohet
154bc29a03 am 038300d9: Merge change 26471 into eclair
Merge commit '038300d95f69ab2ddf56526bcfc5f1028c40e6f2' into eclair-plus-aosp

* commit '038300d95f69ab2ddf56526bcfc5f1028c40e6f2':
  Fix the qualifier match algorithm.
2009-09-22 19:51:44 -07:00
Android (Google) Code Review
038300d95f Merge change 26471 into eclair
* changes:
  Fix the qualifier match algorithm.
2009-09-22 22:40:48 -04:00
Xavier Ducrohet
a96c9885d7 Force update to the next plugin.
Change-Id: I2f1042a087ca6227396a41d23eed26525fbbbbf6
2009-09-22 18:45:44 -07:00
Piotr Gurgul
d3868d3803 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
2009-09-22 17:53:54 -07:00
Xavier Ducrohet
9f6551b303 Disable menu items based on device/app selection.
Change-Id: I78572430c68f2c1952a118814d4b467182004e23
2009-09-22 17:38:24 -07:00
Piotr Gurgul
fa0062da90 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
2009-09-22 17:31:14 -07:00
Xavier Ducrohet
cf51575c5e Fix the qualifier match algorithm.
Add proper support for density and keyboard state match.

Change-Id: I410aba52ee0f0d9df31fa2abdc9485054595263f
2009-09-22 16:46:19 -07:00
Xavier Ducrohet
d88e95f92c am dd9683a8: Merge change 26441 into eclair
Merge commit 'dd9683a8247c8e14619d068f81d10dea10e4decb' into eclair-plus-aosp

* commit 'dd9683a8247c8e14619d068f81d10dea10e4decb':
  Add support for Keyboard state "Soft"
2009-09-22 15:04:55 -07:00
Android (Google) Code Review
dd9683a824 Merge change 26441 into eclair
* changes:
  Add support for Keyboard state "Soft"
2009-09-22 17:57:40 -04:00
Piotr Gurgul
dccc44df44 am 07fc39ed: Merge change 26440 into eclair
Merge commit '07fc39edda5e53bb3ddd980a05ab2c6573685feb' into eclair-plus-aosp

* commit '07fc39edda5e53bb3ddd980a05ab2c6573685feb':
  Add auto-generated tested.project.dir property
2009-09-22 14:28:51 -07:00
Xavier Ducrohet
a6aae91831 am 37240333: Merge change 26436 into eclair
Merge commit '3724033353aa535248659ad86f4d4c1c2a10fb75' into eclair-plus-aosp

* commit '3724033353aa535248659ad86f4d4c1c2a10fb75':
  Add a new skin to the SDK.
2009-09-22 14:28:47 -07:00
Android (Google) Code Review
07fc39edda Merge change 26440 into eclair
* changes:
  Add auto-generated tested.project.dir property
2009-09-22 17:21:05 -04:00
Android (Google) Code Review
3724033353 Merge change 26436 into eclair
* changes:
  Add a new skin to the SDK.
2009-09-22 17:18:17 -04:00
Xavier Ducrohet
14fff84f14 Add support for Keyboard state "Soft"
Change-Id: Ief65b3988973fb3b3d9edbbb99df9354ffe85663
2009-09-22 14:16:26 -07:00
Piotr Gurgul
28265ed42f 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.
2009-09-22 13:58:28 -07:00
Xavier Ducrohet
1da1bd86b8 Add a new skin to the SDK.
Change-Id: I988a5a4bf372c0f8608facf64314ada1e9ee791e
2009-09-22 13:51:14 -07:00
Piotr Gurgul
b824d51914 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
2009-09-22 11:52:04 -07:00
Android (Google) Code Review
36ee5dafd0 Merge change 26329 into eclair
* changes:
  Distinguish jar folders and jar files in ApkBuilder script
2009-09-22 14:44:28 -04:00
Piotr Gurgul
a9841ee872 am d176d42d: am 3cbe2b79: Add automatic application package extraction from manifest
Merge commit 'd176d42d6716072da81c4334c53b99c2201ef0f2'

* commit 'd176d42d6716072da81c4334c53b99c2201ef0f2':
  Add automatic application package extraction from manifest
2009-09-22 11:31:51 -07:00
Piotr Gurgul
666d24cc3c Distinguish jar folders and jar files in ApkBuilder script
Checking if -rj parameter value is a directory or a file
and calling the appropriate function for each of them.
2009-09-22 11:28:43 -07:00
Piotr Gurgul
d176d42d67 am 3cbe2b79: Add automatic application package extraction from manifest
Merge commit '3cbe2b7943c0437ffb8c2a03a679c0ca8b9f527e' into eclair-plus-aosp

* commit '3cbe2b7943c0437ffb8c2a03a679c0ca8b9f527e':
  Add automatic application package extraction from manifest
2009-09-22 11:21:16 -07:00
Piotr Gurgul
3cbe2b7943 Add automatic application package extraction from manifest
Automatic extraction of the application.package property has been added
leveradging xpath ant task. This reduces redundancy, removes hardcoded
application.package and solves bug with uninstalling test application
package. In order to function properly needs removing application.package
from build.properties file.
2009-09-21 21:44:00 -07:00
Brett Chabot
aa43a95aa6 am f0a3ecf8: am 780a7fa1: Merge change 26298 into eclair
Merge commit 'f0a3ecf86798284ce0d5f5b82d5bf01f0d8b7162'

* commit 'f0a3ecf86798284ce0d5f5b82d5bf01f0d8b7162':
  Add build path info to runtest --list_tests
2009-09-21 19:50:05 -07:00
Brett Chabot
f0a3ecf867 am 780a7fa1: Merge change 26298 into eclair
Merge commit '780a7fa1f51a9d42e644401ef69b79e151198794' into eclair-plus-aosp

* commit '780a7fa1f51a9d42e644401ef69b79e151198794':
  Add build path info to runtest --list_tests
2009-09-21 19:40:56 -07:00