OSDN Git Service
Xavier Ducrohet [Thu, 28 Jan 2010 02:39:38 +0000 (18:39 -0800)]
am
786767f6: am
ae6a39ce: Merge "Add support for packaging gdbserver in the apk in Ant." into eclair
Merge commit '
786767f6fedc1f41e4dbc622cacf2427385eb1b9'
* commit '
786767f6fedc1f41e4dbc622cacf2427385eb1b9':
Add support for packaging gdbserver in the apk in Ant.
Xavier Ducrohet [Thu, 28 Jan 2010 02:39:28 +0000 (18:39 -0800)]
am
a7d03d38: am
1dd249c8: Merge "ADT: Add missing NSL comment." into eclair
Merge commit '
a7d03d383dfb410a4ea7e3eb3c2f7fd8c16d75cc'
* commit '
a7d03d383dfb410a4ea7e3eb3c2f7fd8c16d75cc':
ADT: Add missing NSL comment.
Raphael Moll [Thu, 28 Jan 2010 02:39:18 +0000 (18:39 -0800)]
am
442a3114: am
57042dd0: Merge "SDK Updater: refuse installing an addon without a matching platform." into eclair
Merge commit '
442a3114422f82f513f08c0302b5450a40cceade'
* commit '
442a3114422f82f513f08c0302b5450a40cceade':
SDK Updater: refuse installing an addon without a matching platform.
Xavier Ducrohet [Thu, 28 Jan 2010 01:27:10 +0000 (17:27 -0800)]
am
e2040280: am
fc6b8898: Merge "ADT: Make the builders add gdbserver with the native libs if needed." into eclair
Merge commit '
e2040280e5c87f2af29ff9f9910425fb800d9d02'
* commit '
e2040280e5c87f2af29ff9f9910425fb800d9d02':
ADT: Make the builders add gdbserver with the native libs if needed.
The Android Open Source Project [Thu, 28 Jan 2010 00:15:53 +0000 (16:15 -0800)]
Raphael Moll [Wed, 27 Jan 2010 23:52:53 +0000 (15:52 -0800)]
am
aaa48347: am
626101ea: Merge "SDK Updater: support min-api-level in Extra packages." into eclair
Merge commit '
aaa48347f16c35c749e9358656f2075bded79c5b'
* commit '
aaa48347f16c35c749e9358656f2075bded79c5b':
SDK Updater: support min-api-level in Extra packages.
Andy McFadden [Wed, 27 Jan 2010 23:21:17 +0000 (15:21 -0800)]
Merge "Strawman support for streaming method profiling."
Andy McFadden [Tue, 26 Jan 2010 15:37:22 +0000 (07:37 -0800)]
Strawman support for streaming method profiling.
This will send MPSS/MPSE packets instead of MPRS/MPRE when the client VM
supports them. At least, it would if the property check weren't
hard-wired to false, which is done because the MPSE handling in DDMS is
incomplete (currently just dumps the first 100 chars so you can see that
it really got something).
For bug
2160407.
Xavier Ducrohet [Wed, 27 Jan 2010 03:47:48 +0000 (19:47 -0800)]
Update version numbers for Tools-r6 / ADT 0.9.7
Change-Id: I2cd2e75f97369d2d8a69e7717a49a59784c1fffd
Xavier Ducrohet [Tue, 26 Jan 2010 07:35:06 +0000 (23:35 -0800)]
am
98f19555: am
32cfca58: Merge "ADT: fix potential NPE when launching app." into eclair
Merge commit '
98f19555674296bec52f439b972497c4f6c4aad1'
* commit '
98f19555674296bec52f439b972497c4f6c4aad1':
ADT: fix potential NPE when launching app.
Xavier Ducrohet [Tue, 26 Jan 2010 07:34:55 +0000 (23:34 -0800)]
am
5b2602a9: am
fe14931d: Make "android update test-project" create all necessary files.
Merge commit '
5b2602a9b501ad806683a5a7309622543813977d'
* commit '
5b2602a9b501ad806683a5a7309622543813977d':
Make "android update test-project" create all necessary files.
Xavier Ducrohet [Mon, 25 Jan 2010 16:58:39 +0000 (08:58 -0800)]
am
2e08725e: am
9f11429c: Fix issue with absolute path in -nf parameter of apkbuilder.
Merge commit '
2e08725e882577dfb5a8905438958a47940ba3e9'
* commit '
2e08725e882577dfb5a8905438958a47940ba3e9':
Fix issue with absolute path in -nf parameter of apkbuilder.
Xavier Ducrohet [Fri, 22 Jan 2010 17:44:51 +0000 (09:44 -0800)]
am
045c5017: am
d1e2dff8: ADT: Fix arrayoutofboundexception
Merge commit '
045c5017621346766439d58ed51488cec72b61aa'
* commit '
045c5017621346766439d58ed51488cec72b61aa':
ADT: Fix arrayoutofboundexception
Ken Shirriff [Fri, 22 Jan 2010 07:10:47 +0000 (23:10 -0800)]
Add com.android.calendar to sync authorities.
bug
2388178
Xavier Ducrohet [Thu, 21 Jan 2010 23:50:38 +0000 (15:50 -0800)]
am
ae6a39ce: Merge "Add support for packaging gdbserver in the apk in Ant." into eclair
Merge commit '
ae6a39ce1586268b2ac5a00afa868d3f187dd0ef' into eclair-plus-aosp
* commit '
ae6a39ce1586268b2ac5a00afa868d3f187dd0ef':
Add support for packaging gdbserver in the apk in Ant.
Xavier Ducrohet [Thu, 21 Jan 2010 23:50:34 +0000 (15:50 -0800)]
am
1dd249c8: Merge "ADT: Add missing NSL comment." into eclair
Merge commit '
1dd249c856f458fbc83dab4a663aa57690b5c35a' into eclair-plus-aosp
* commit '
1dd249c856f458fbc83dab4a663aa57690b5c35a':
ADT: Add missing NSL comment.
Xavier Ducrohet [Thu, 21 Jan 2010 23:45:43 +0000 (15:45 -0800)]
Merge "Add support for packaging gdbserver in the apk in Ant." into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 23:45:37 +0000 (15:45 -0800)]
Merge "ADT: Add missing NSL comment." into eclair
Raphael Moll [Thu, 21 Jan 2010 23:34:53 +0000 (15:34 -0800)]
am
57042dd0: Merge "SDK Updater: refuse installing an addon without a matching platform." into eclair
Merge commit '
57042dd0e97a21a4df052e6f54783b9674562dfc' into eclair-plus-aosp
* commit '
57042dd0e97a21a4df052e6f54783b9674562dfc':
SDK Updater: refuse installing an addon without a matching platform.
Raphael Moll [Thu, 21 Jan 2010 23:32:08 +0000 (15:32 -0800)]
Merge "SDK Updater: refuse installing an addon without a matching platform." into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 23:27:49 +0000 (15:27 -0800)]
ADT: Add missing NSL comment.
Change-Id: Ib660a0c039f359b5c3fd2a39680e6c343e496dcd
Xavier Ducrohet [Thu, 21 Jan 2010 20:30:36 +0000 (12:30 -0800)]
Add support for packaging gdbserver in the apk in Ant.
This must only be done in debug so there's a new flag
to detect debug mode. Support for this is added to the
build script, the Ant task and ApkBuilder itself.
Change-Id: Iaebdc60cc3e8fa08c8cb75c885a6a0db556bfd86
Xavier Ducrohet [Thu, 21 Jan 2010 23:09:37 +0000 (15:09 -0800)]
am
fc6b8898: Merge "ADT: Make the builders add gdbserver with the native libs if needed." into eclair
Merge commit '
fc6b889892240f473c581edc9ad8d6670faba4a4' into eclair-plus-aosp
* commit '
fc6b889892240f473c581edc9ad8d6670faba4a4':
ADT: Make the builders add gdbserver with the native libs if needed.
Xavier Ducrohet [Thu, 21 Jan 2010 22:58:33 +0000 (14:58 -0800)]
Merge "ADT: Make the builders add gdbserver with the native libs if needed." into eclair
Raphael [Thu, 21 Jan 2010 22:29:38 +0000 (14:29 -0800)]
am
cb30ba7b: am
a72ddb57: ADT GRE: create base class for IViewRule.
Merge commit '
cb30ba7b09747ac3c948266db4ea2eb19fd6e962'
* commit '
cb30ba7b09747ac3c948266db4ea2eb19fd6e962':
ADT GRE: create base class for IViewRule.
Raphael [Thu, 21 Jan 2010 22:28:29 +0000 (14:28 -0800)]
am
28ad8a42: am
1a9d3049: ADT GRE: Move gscripts package.
Merge commit '
28ad8a4261c24ba52f95e54a61cb1b47fcd08ef9'
* commit '
28ad8a4261c24ba52f95e54a61cb1b47fcd08ef9':
ADT GRE: Move gscripts package.
Raphael [Thu, 21 Jan 2010 21:36:45 +0000 (13:36 -0800)]
SDK Updater: refuse installing an addon without a matching platform.
This adds support for already installed archives as well as missing
platform archives when computing dependencies.
Change-Id: I40c7838d650af0d2e2aaee6bb1e0f2b4b84760c9
Xavier Ducrohet [Thu, 21 Jan 2010 19:35:34 +0000 (11:35 -0800)]
ADT: Make the builders add gdbserver with the native libs if needed.
Change-Id: I0324919b4c1cc0ce0b597b46dac5e875f8322a1e
The Android Open Source Project [Thu, 21 Jan 2010 19:21:34 +0000 (11:21 -0800)]
merge from open-source master
Raphael Moll [Thu, 21 Jan 2010 18:51:42 +0000 (10:51 -0800)]
am
626101ea: Merge "SDK Updater: support min-api-level in Extra packages." into eclair
Merge commit '
626101eadcf09ed6f471c923e1cf8deba1cd6b56' into eclair-plus-aosp
* commit '
626101eadcf09ed6f471c923e1cf8deba1cd6b56':
SDK Updater: support min-api-level in Extra packages.
Raphael Moll [Thu, 21 Jan 2010 18:36:44 +0000 (10:36 -0800)]
Merge "SDK Updater: support min-api-level in Extra packages." into eclair
Xavier Ducrohet [Thu, 21 Jan 2010 18:02:42 +0000 (10:02 -0800)]
am
32cfca58: Merge "ADT: fix potential NPE when launching app." into eclair
Merge commit '
32cfca5838558c0beb9b771e3b2e880047eb8053' into eclair-plus-aosp
* commit '
32cfca5838558c0beb9b771e3b2e880047eb8053':
ADT: fix potential NPE when launching app.
Xavier Ducrohet [Thu, 21 Jan 2010 18:02:37 +0000 (10:02 -0800)]
am
fe14931d: Make "android update test-project" create all necessary files.
Merge commit '
fe14931d3c5c50a57d7cb705dfc57f919972fce6' into eclair-plus-aosp
* commit '
fe14931d3c5c50a57d7cb705dfc57f919972fce6':
Make "android update test-project" create all necessary files.
Xavier Ducrohet [Thu, 21 Jan 2010 17:50:51 +0000 (09:50 -0800)]
Merge "ADT: fix potential NPE when launching app." into eclair
Raphael [Thu, 21 Jan 2010 01:40:56 +0000 (17:40 -0800)]
SDK Updater: support min-api-level in Extra packages.
BUG:
2386406
Change-Id: I274079d228e9fe7ca2623b54adeae33d365662ed
Xavier Ducrohet [Thu, 21 Jan 2010 02:16:44 +0000 (18:16 -0800)]
ADT: fix potential NPE when launching app.
The problem can arise when the emulator is just starting
to boot or if a device is just connected and its build
version was not yet queried.
Bug:
2379027
Change-Id: Ib6046dc2a50a87c496034d91abc0b579e76c34cb
Xavier Ducrohet [Thu, 21 Jan 2010 00:57:29 +0000 (16:57 -0800)]
Make "android update test-project" create all necessary files.
Previous implementation only created build.properties to set
the location of the main project.
This new version will also update/create files as the main
"android update project" command does.
Bug:
2284744
Change-Id: I8938d0a49537c5d4fbc60d3557a21ab7c40fad3e
Xavier Ducrohet [Wed, 20 Jan 2010 23:40:50 +0000 (15:40 -0800)]
am
9f11429c: Fix issue with absolute path in -nf parameter of apkbuilder.
Merge commit '
9f11429c74555ae7ea45750f2ea878dda5e42b60' into eclair-plus-aosp
* commit '
9f11429c74555ae7ea45750f2ea878dda5e42b60':
Fix issue with absolute path in -nf parameter of apkbuilder.
Raphael Moll [Wed, 20 Jan 2010 22:35:28 +0000 (14:35 -0800)]
am
066594f2: am
784f932f: Merge "AD Tests: fix missing LayoutDevices sample xml." into eclair
Merge commit '
066594f2f966e00e5fb6952c9a638921de1791e2'
* commit '
066594f2f966e00e5fb6952c9a638921de1791e2':
AD Tests: fix missing LayoutDevices sample xml.
Raphael Moll [Wed, 20 Jan 2010 22:35:24 +0000 (14:35 -0800)]
am
2142480a: am
0ef171c5: Merge "Cleanup mock class, don\'t use NotImplementedException." into eclair
Merge commit '
2142480aa14161b281221b0d2c882597779f76f9'
* commit '
2142480aa14161b281221b0d2c882597779f76f9':
Cleanup mock class, don't use NotImplementedException.
Raphael [Wed, 20 Jan 2010 22:35:18 +0000 (14:35 -0800)]
am
7959fcaa: am
4e737d9e: ADT GLE: pass RulesEngine to LayoutCanvas.
Merge commit '
7959fcaa9103d6e211f828e72fb1969932f8dbf2'
* commit '
7959fcaa9103d6e211f828e72fb1969932f8dbf2':
ADT GLE: pass RulesEngine to LayoutCanvas.
Xavier Ducrohet [Wed, 20 Jan 2010 22:23:28 +0000 (14:23 -0800)]
Fix issue with absolute path in -nf parameter of apkbuilder.
Bug:
1607862
Change-Id: I7fecc99fe7319f566d2d78ccc82c73d86067db51
Xavier Ducrohet [Tue, 19 Jan 2010 20:06:31 +0000 (12:06 -0800)]
am
d1e2dff8: ADT: Fix arrayoutofboundexception
Merge commit '
d1e2dff8f01eab635e6c1ca0e7329b871c10c99f' into eclair-plus-aosp
* commit '
d1e2dff8f01eab635e6c1ca0e7329b871c10c99f':
ADT: Fix arrayoutofboundexception
Xavier Ducrohet [Tue, 19 Jan 2010 19:20:06 +0000 (11:20 -0800)]
ADT: Fix arrayoutofboundexception
Bug:
2378994
Change-Id: I4844addc3fe006f1739015522dc45e43d70cc966
Raphael [Fri, 15 Jan 2010 01:28:24 +0000 (17:28 -0800)]
am
a72ddb57: ADT GRE: create base class for IViewRule.
Merge commit '
a72ddb57558e2bfb3bee0743a90a0237291a12b3' into eclair-plus-aosp
* commit '
a72ddb57558e2bfb3bee0743a90a0237291a12b3':
ADT GRE: create base class for IViewRule.
Raphael [Fri, 15 Jan 2010 01:16:24 +0000 (17:16 -0800)]
ADT GRE: create base class for IViewRule.
This adds BaseViewRule (better name welcome) that is basically
an empty IViewRule so that groovy classes don't have to
systematically redefine the same empty boilerplate.
Change-Id: Ibf9a03d3aa0ca8a42534f5693792235c31100273
Raphael [Fri, 15 Jan 2010 01:17:32 +0000 (17:17 -0800)]
am
1a9d3049: ADT GRE: Move gscripts package.
Merge commit '
1a9d30498bb489a8a7704a86eeb6effd92f35f3b' into eclair-plus-aosp
* commit '
1a9d30498bb489a8a7704a86eeb6effd92f35f3b':
ADT GRE: Move gscripts package.
Raphael [Fri, 15 Jan 2010 00:13:26 +0000 (16:13 -0800)]
ADT GRE: Move gscripts package.
Moving the public API from com.android.ide.eclispse.adt.gscripts
to ...adt.editors.layout.gscripts.
Change-Id: Idf5b979d47dbbbe2514cce8cc3c688eb273bcce6
Raphael Moll [Fri, 15 Jan 2010 00:00:40 +0000 (16:00 -0800)]
am
784f932f: Merge "AD Tests: fix missing LayoutDevices sample xml." into eclair
Merge commit '
784f932f81764c275a961bf8faf286b32c209437' into eclair-plus-aosp
* commit '
784f932f81764c275a961bf8faf286b32c209437':
AD Tests: fix missing LayoutDevices sample xml.
Raphael Moll [Fri, 15 Jan 2010 00:00:37 +0000 (16:00 -0800)]
am
0ef171c5: Merge "Cleanup mock class, don\'t use NotImplementedException." into eclair
Merge commit '
0ef171c5b082e381f7982bfb5c9b6883a7182fcd' into eclair-plus-aosp
* commit '
0ef171c5b082e381f7982bfb5c9b6883a7182fcd':
Cleanup mock class, don't use NotImplementedException.
Raphael [Fri, 15 Jan 2010 00:00:33 +0000 (16:00 -0800)]
am
4e737d9e: ADT GLE: pass RulesEngine to LayoutCanvas.
Merge commit '
4e737d9e263fc883fc7d19c72cf7ee6cf4863ada' into eclair-plus-aosp
* commit '
4e737d9e263fc883fc7d19c72cf7ee6cf4863ada':
ADT GLE: pass RulesEngine to LayoutCanvas.
Raphael Moll [Thu, 14 Jan 2010 23:57:38 +0000 (15:57 -0800)]
Merge "AD Tests: fix missing LayoutDevices sample xml." into eclair
Raphael Moll [Thu, 14 Jan 2010 23:57:11 +0000 (15:57 -0800)]
Merge "Cleanup mock class, don't use NotImplementedException." into eclair
Raphael [Thu, 14 Jan 2010 22:14:53 +0000 (14:14 -0800)]
ADT GLE: pass RulesEngine to LayoutCanvas.
This fixes a corner case where the canvas might find
itself using a null RulesEngine.
Change-Id: I9c5f2ec7f3d4e98d35995d5529f00d15ebd76faa
Raphael [Thu, 14 Jan 2010 23:17:50 +0000 (15:17 -0800)]
AD Tests: fix missing LayoutDevices sample xml.
Change-Id: I879dd9fd3465491b0e8143a81d3a696e50212b99
Raphael [Thu, 14 Jan 2010 22:18:15 +0000 (14:18 -0800)]
Cleanup mock class, don't use NotImplementedException.
It has a non-java namespace we don't want to use.
Change-Id: I67f247b38df16e1a62957e84ce9e03c449ffae5a
Xavier Ducrohet [Wed, 13 Jan 2010 05:34:05 +0000 (21:34 -0800)]
am
db5a966b: am
e31f9169: ADT/GLE: Dynamically create ID values for non saved layout
Merge commit '
db5a966b9f5053a5ea95502df186d40cae1e11a3'
* commit '
db5a966b9f5053a5ea95502df186d40cae1e11a3':
ADT/GLE: Dynamically create ID values for non saved layout
Xavier Ducrohet [Wed, 13 Jan 2010 03:33:02 +0000 (19:33 -0800)]
am
e31f9169: ADT/GLE: Dynamically create ID values for non saved layout
Merge commit '
e31f9169faa105960bcf2a6eb2adf56c05c1ec71' into eclair-plus-aosp
* commit '
e31f9169faa105960bcf2a6eb2adf56c05c1ec71':
ADT/GLE: Dynamically create ID values for non saved layout
Xavier Ducrohet [Wed, 13 Jan 2010 01:15:38 +0000 (17:15 -0800)]
ADT/GLE: Dynamically create ID values for non saved layout
When a non saved layout is rendered it is possible that some
views reference IDs that don't yet exists in the R class
because those IDs are created on the fly through @+id/...
For some layouts (RelativeLayout) this has a huge impact
on the rendering to the point of making useless. By
dynamically creating unknown ID, we can have a correct
rendering even if the layout is non saved.
Bug:
2370047
Change-Id: I09a0dfaa9d2a767229ab778438256a7609d6d337
Xavier Ducrohet [Tue, 12 Jan 2010 23:03:01 +0000 (15:03 -0800)]
am
d6abc79e: am
5a665ebf: ADT/GLE: remove unneeded exception when exploding a non supported layout
Merge commit '
d6abc79e830427e42d04f168f8798007124b5591'
* commit '
d6abc79e830427e42d04f168f8798007124b5591':
ADT/GLE: remove unneeded exception when exploding a non supported layout
Xavier Ducrohet [Tue, 12 Jan 2010 23:00:56 +0000 (15:00 -0800)]
am
5a665ebf: ADT/GLE: remove unneeded exception when exploding a non supported layout
Merge commit '
5a665ebfdb3995f60cf57eb226ed52c81fef2fc2' into eclair-plus-aosp
* commit '
5a665ebfdb3995f60cf57eb226ed52c81fef2fc2':
ADT/GLE: remove unneeded exception when exploding a non supported layout
Xavier Ducrohet [Tue, 12 Jan 2010 22:49:51 +0000 (14:49 -0800)]
ADT/GLE: remove unneeded exception when exploding a non supported layout
Change-Id: Ia6e0e6ef814b39403adb8c5edb9b2a1f41af81d8
Xavier Ducrohet [Tue, 12 Jan 2010 21:12:27 +0000 (13:12 -0800)]
am
35758fde: am
e2bfef70: Merge "Add support for Sample packages in the SDK Manager" into eclair
Merge commit '
35758fde4bafa973a6de389e34052947cb47f276'
* commit '
35758fde4bafa973a6de389e34052947cb47f276':
Add support for Sample packages in the SDK Manager
Xavier Ducrohet [Tue, 12 Jan 2010 21:12:23 +0000 (13:12 -0800)]
am
3a3d3121: am
dcc72b2d: ADV Manager: prevent deletion of running AVDs
Merge commit '
3a3d3121eb6e5537f9c44330f203115f39b28987'
* commit '
3a3d3121eb6e5537f9c44330f203115f39b28987':
ADV Manager: prevent deletion of running AVDs
Xavier Ducrohet [Tue, 12 Jan 2010 21:12:04 +0000 (13:12 -0800)]
am
59034937: am
0d0fcc50: AVD Mananger: Fix the deletion of a folder content.
Merge commit '
59034937d999fd2518c40fa2c19d0b2958fdb192'
* commit '
59034937d999fd2518c40fa2c19d0b2958fdb192':
AVD Mananger: Fix the deletion of a folder content.
Xavier Ducrohet [Tue, 12 Jan 2010 21:07:53 +0000 (13:07 -0800)]
am
e2bfef70: Merge "Add support for Sample packages in the SDK Manager" into eclair
Merge commit '
e2bfef70bbfe1a9be1b08e330a736a14324da25d' into eclair-plus-aosp
* commit '
e2bfef70bbfe1a9be1b08e330a736a14324da25d':
Add support for Sample packages in the SDK Manager
Xavier Ducrohet [Tue, 12 Jan 2010 21:03:48 +0000 (13:03 -0800)]
Merge "Add support for Sample packages in the SDK Manager" into eclair
Xavier Ducrohet [Tue, 12 Jan 2010 19:51:03 +0000 (11:51 -0800)]
Add support for Sample packages in the SDK Manager
Bug:
2296352
Change-Id: Id26fdb02030d00a27960b3e0a21d3c537e7cf8da
Xavier Ducrohet [Tue, 12 Jan 2010 20:53:54 +0000 (12:53 -0800)]
am
dcc72b2d: ADV Manager: prevent deletion of running AVDs
Merge commit '
dcc72b2d2057138024c1e521f0899860439ecafa' into eclair-plus-aosp
* commit '
dcc72b2d2057138024c1e521f0899860439ecafa':
ADV Manager: prevent deletion of running AVDs
Xavier Ducrohet [Tue, 12 Jan 2010 02:15:12 +0000 (18:15 -0800)]
ADV Manager: prevent deletion of running AVDs
Bug:
2364918
Change-Id: Ibe01e0b2d51f6d7df1972f57ff7fadb6116175df
Xavier Ducrohet [Tue, 12 Jan 2010 20:42:38 +0000 (12:42 -0800)]
am
0d0fcc50: AVD Mananger: Fix the deletion of a folder content.
Merge commit '
0d0fcc50842d0db182105ebee2fc60618fcacd28' into eclair-plus-aosp
* commit '
0d0fcc50842d0db182105ebee2fc60618fcacd28':
AVD Mananger: Fix the deletion of a folder content.
Xavier Ducrohet [Tue, 12 Jan 2010 01:01:05 +0000 (17:01 -0800)]
AVD Mananger: Fix the deletion of a folder content.
Bug:
2364917
Change-Id: I9585200adad5deb2ef27ea157ddd25e7124c2e73
Xavier Ducrohet [Mon, 11 Jan 2010 23:52:24 +0000 (15:52 -0800)]
am
a8c61f01: am
18ab1255: Merge "ADT/GLE: Fix config selector to not select a config that has a better match than the current file." into eclair
Merge commit '
a8c61f01471232f05b73ec7eb637307c2d77b5a7'
* commit '
a8c61f01471232f05b73ec7eb637307c2d77b5a7':
ADT/GLE: Fix config selector to not select a config that has a better match than the current file.
Xavier Ducrohet [Mon, 11 Jan 2010 23:50:12 +0000 (15:50 -0800)]
am
18ab1255: Merge "ADT/GLE: Fix config selector to not select a config that has a better match than the current file." into eclair
Merge commit '
18ab12550ad8ebc2791f6a40bbd985ad9a93ac10' into eclair-plus-aosp
* commit '
18ab12550ad8ebc2791f6a40bbd985ad9a93ac10':
ADT/GLE: Fix config selector to not select a config that has a better match than the current file.
Xavier Ducrohet [Mon, 11 Jan 2010 23:47:41 +0000 (15:47 -0800)]
Merge "ADT/GLE: Fix config selector to not select a config that has a better match than the current file." into eclair
Xavier Ducrohet [Sat, 9 Jan 2010 00:24:55 +0000 (16:24 -0800)]
ADT/GLE: Fix config selector to not select a config that has a better match than the current file.
When replacing a file with another one (because of a user "open action")
it is possible the config selector will find the current config compatible,
even though the previous layout was a better for match for it.
The config selector now attemps to find a config for which the new
file is the best match.
Change-Id: I7d794c2a8b9a90a120970049cb402f9ee84f8749
The Android Open Source Project [Mon, 11 Jan 2010 23:29:31 +0000 (15:29 -0800)]
empty initial commit
Raphael [Mon, 11 Jan 2010 20:59:36 +0000 (12:59 -0800)]
am
0725cd49: am
fc6cb68e: ADT GLE: Support drop in AbsoluteLayout and create XML node.
Merge commit '
0725cd49c5e9573cc9f28301a1c6aaa25e677931'
* commit '
0725cd49c5e9573cc9f28301a1c6aaa25e677931':
ADT GLE: Support drop in AbsoluteLayout and create XML node.
Raphael [Sat, 9 Jan 2010 23:19:53 +0000 (15:19 -0800)]
am
fc6cb68e: ADT GLE: Support drop in AbsoluteLayout and create XML node.
Merge commit '
fc6cb68ea4bdeb408a97dcfd2fb6a35df90e63c0' into eclair-plus-aosp
* commit '
fc6cb68ea4bdeb408a97dcfd2fb6a35df90e63c0':
ADT GLE: Support drop in AbsoluteLayout and create XML node.
Raphael [Fri, 8 Jan 2010 21:46:01 +0000 (13:46 -0800)]
ADT GLE: Support drop in AbsoluteLayout and create XML node.
This is a *temporary* CL just to get some things out of the way:
- it adds some method to create some XML from groovy
- it uses the new dropStart/dropFinish API.
However after this is submitted I'll change the IViewRule API as
we discussed so all this code will need to change. Again.
Change-Id: Ie9c7eebf0f9e1d48e364467fbaac5615b4c42f21
Xavier Ducrohet [Sat, 9 Jan 2010 02:25:00 +0000 (18:25 -0800)]
am
1b790f29: am
cc2a0201: For now make ADT still use fill_parent instead of match_parent
Merge commit '
1b790f29ae553eb9e5431ab9c8cf7364b2e6ac76'
* commit '
1b790f29ae553eb9e5431ab9c8cf7364b2e6ac76':
For now make ADT still use fill_parent instead of match_parent
Xavier Ducrohet [Sat, 9 Jan 2010 02:22:12 +0000 (18:22 -0800)]
am
cc2a0201: For now make ADT still use fill_parent instead of match_parent
Merge commit '
cc2a02011f08f89cb7e9f1c129f8eb813348de38' into eclair-plus-aosp
* commit '
cc2a02011f08f89cb7e9f1c129f8eb813348de38':
For now make ADT still use fill_parent instead of match_parent
Xavier Ducrohet [Sat, 9 Jan 2010 02:18:06 +0000 (18:18 -0800)]
For now make ADT still use fill_parent instead of match_parent
Change-Id: I7d59600e036a630daaaac0cda53487c24ab0c3fc
Romain Guy [Sat, 9 Jan 2010 00:37:36 +0000 (16:37 -0800)]
am
f1b8c8de: (-s ours) am
c7db6b94: Deprecate fill_parent and introduce match_parent. (do not merge) Bug: #
2361749.
Merge commit '
f1b8c8de8417b007ac2c2f59bc581074923970a2'
* commit '
f1b8c8de8417b007ac2c2f59bc581074923970a2':
Deprecate fill_parent and introduce match_parent. (do not merge)
Xavier Ducrohet [Sat, 9 Jan 2010 00:37:32 +0000 (16:37 -0800)]
am
166864ba: am
cff0d285: ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Merge commit '
166864ba59eb262152b6db14cfd51c5b630b7acd'
* commit '
166864ba59eb262152b6db14cfd51c5b630b7acd':
ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Romain Guy [Sat, 9 Jan 2010 00:33:37 +0000 (16:33 -0800)]
am
c7db6b94: Deprecate fill_parent and introduce match_parent. (do not merge) Bug: #
2361749.
Merge commit '
c7db6b94f54decff38d48a5ed8725c80269ded95' into eclair-plus-aosp
* commit '
c7db6b94f54decff38d48a5ed8725c80269ded95':
Deprecate fill_parent and introduce match_parent. (do not merge)
Xavier Ducrohet [Sat, 9 Jan 2010 00:33:34 +0000 (16:33 -0800)]
am
cff0d285: ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Merge commit '
cff0d285d79844c31be56ae49837d83e8742e512' into eclair-plus-aosp
* commit '
cff0d285d79844c31be56ae49837d83e8742e512':
ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
Romain Guy [Fri, 8 Jan 2010 23:07:24 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent. (do not merge)
Bug: #
2361749.
Change-Id: I7a75cd7f0887dd8135c43f71d1b15165306bfa9b
Xavier Ducrohet [Sat, 9 Jan 2010 00:27:57 +0000 (16:27 -0800)]
am
52160821: am
aa58f6c0: ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Merge commit '
52160821911866f8c2d4e78bdf993e6407bc74e2'
* commit '
52160821911866f8c2d4e78bdf993e6407bc74e2':
ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Romain Guy [Fri, 8 Jan 2010 23:07:24 +0000 (15:07 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Xavier Ducrohet [Fri, 8 Jan 2010 20:15:10 +0000 (12:15 -0800)]
am
aa58f6c0: ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Merge commit '
aa58f6c0cc7e6442bc2980e379fbf4595a011d7d' into eclair-plus-aosp
* commit '
aa58f6c0cc7e6442bc2980e379fbf4595a011d7d':
ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
Xavier Ducrohet [Fri, 8 Jan 2010 19:30:23 +0000 (11:30 -0800)]
ADT/GLE: Fix issue with the locale list refresh in the ConfigComposite
One of the problem stemmed from the ResourceMonitor sending removed
resource events to the ResourceManager first and then to other listeners.
Other listeners then failed to get a corresponding ResourceFolder
or ResourceFile since it was deleted by the ResourceManager.
Solution: add a resource-specific change listener in the ResourceManager.
Using this listener is much more efficient as the ResourceFolder/File
do not need to be figured out by the listener from the IFolder/IFile.
Also renamed the ResourceMonitor as it's confusing (it listens to
Eclipse resource changes, not Android project resource changes).
Since it deals mostly with projects and their resources, and is
global and used by other monitor, it's now called GlobalProjectMonitor.
Also cleaned up the ResourceManager and LayoutReloadMonitor to
implements their interface as internal classes so that the
methods do not show up in their public API.
Change-Id: I1967a48364fd946c98d9eee5bd4a333fc01bea2d
Xavier Ducrohet [Fri, 8 Jan 2010 01:49:37 +0000 (17:49 -0800)]
ADT/GLE: Cleaned up the open/replace file process in the GLE and the config composite
The GLE and the config composite must handle 3 cases:
- new file opened following the creation of the editor
- replacement file when the user opens a different version of a layout
that's already opened. The editor stays and switch to the new file.
- replacement file whne the user change the configuration and a new
file that better matches the config is automicatlly opened.
Additionally, the editor/config composite must handle files being
opened while the SDK or the file's project's target are not yet
loaded.
File change or change in the SDK/Target must attempts to keep the
config/theme selection as close as possible as the previous state
while still remaining compatible with the new file/sdk/target.
Also removed the duplicate ITargetChangeListener, by making the
one in AndroidEditor optional (constructor flag), so that the
one in GraphicalLayoutEditor/Part is the only one used in the GLE
(it gives us more control on the order in which the code previously
executed by both listeners is now executed).
Also split the themes and locales updates as they happen on
different triggers.
Change-Id: If6d73bbe8af11cd221fb7830a37ffcc163135fc4
Xavier Ducrohet [Fri, 8 Jan 2010 00:24:13 +0000 (16:24 -0800)]
am
4c260522: am
5a5e30a4: ADT/GLE: Improve the config selector.
Merge commit '
4c2605224e0f917dcdd2ba47197d508f2f4c4347'
* commit '
4c2605224e0f917dcdd2ba47197d508f2f4c4347':
ADT/GLE: Improve the config selector.
Xavier Ducrohet [Fri, 8 Jan 2010 00:22:33 +0000 (16:22 -0800)]
am
5a5e30a4: ADT/GLE: Improve the config selector.
Merge commit '
5a5e30a49ae8ac966650d013359f8b7c13b63d0b' into eclair-plus-aosp
* commit '
5a5e30a49ae8ac966650d013359f8b7c13b63d0b':
ADT/GLE: Improve the config selector.
Xavier Ducrohet [Thu, 7 Jan 2010 22:03:20 +0000 (14:03 -0800)]
am
071472b4: am
7e23cf22: Fix the locale selection in the config selector.
Merge commit '
071472b4cdb8f21f466c45b86ca6f76efdb8cfda'
* commit '
071472b4cdb8f21f466c45b86ca6f76efdb8cfda':
Fix the locale selection in the config selector.
Xavier Ducrohet [Thu, 7 Jan 2010 21:59:38 +0000 (13:59 -0800)]
am
7e23cf22: Fix the locale selection in the config selector.
Merge commit '
7e23cf2298572bc7ed6dc0cb731a8d55337b94a1' into eclair-plus-aosp
* commit '
7e23cf2298572bc7ed6dc0cb731a8d55337b94a1':
Fix the locale selection in the config selector.
Xavier Ducrohet [Thu, 7 Jan 2010 01:21:48 +0000 (17:21 -0800)]
ADT/GLE: Improve the config selector.
- Better support for device/config, properly select config when opening
files, proper support for files that have different config versions
- Better language support, with default values and languages
with no regions.
- (attempt to) Properly set locale combo when opening files
- attempt to keep a somewhat compatible config when changing
device.
- general clean up of the API. More to come.
Change-Id: I45652bb18e6a61b443a7f0c1087a9b2d3f81e033
Xavier Ducrohet [Thu, 7 Jan 2010 17:21:24 +0000 (09:21 -0800)]
am
79303b29: am
3917a7db: Move LayoutLib API library to sdk.git
Merge commit '
79303b290b6cd43666aa6283cfacb9c7fffa4073'
* commit '
79303b290b6cd43666aa6283cfacb9c7fffa4073':
Move LayoutLib API library to sdk.git
Xavier Ducrohet [Thu, 7 Jan 2010 17:16:11 +0000 (09:16 -0800)]
am
3917a7db: Move LayoutLib API library to sdk.git
Merge commit '
3917a7db4e9e637698405901557c6f9826acc051' into eclair-plus-aosp
* commit '
3917a7db4e9e637698405901557c6f9826acc051':
Move LayoutLib API library to sdk.git