OSDN Git Service
Tor Norbye [Tue, 11 Oct 2011 00:45:54 +0000 (17:45 -0700)]
Handle AAPT error messages for skipping files
If the AAPT error parser encounters an error message it is unfamiliar
with, then it aborts out of the parser and just emits all the output
from aapt in the Console instead.
I just ran into a scenario where this happens if your project contains
an XML file with an invalid name, such as a layout whose name starts
with an underscore.
This changeset adds a regexp to recognize these errors such that the
other AAPT errors show up in the Problems view, and you can click to
jump to the offending file for the skipping error.
Change-Id: I884fdb6fdbdfcaa3adbef68bc96e722036e88996
Tor Norbye [Sun, 9 Oct 2011 17:16:16 +0000 (10:16 -0700)]
Modify validator to reject file resource names starting with _
Change-Id: I23cea24d7363597968d6602b5a056a59085b9c6c
Raphael [Fri, 7 Oct 2011 19:54:19 +0000 (12:54 -0700)]
SDK Manager: select just new or just updates.
This splits the "Select New/Updates" link in the
SDK Manager in 2 parts. Behavior is:
- at startup, the sdk manager selects both new and updates.
- one can click on deselect + select new to select
just new packages.
- one can click on deselect + select updates to select
just update packages.
- select does not select first, so clicking both new
then update will produce the previous behavior.
SDK Bug: 20607
Change-Id: Ib861d78b746f4f3c7a8fce421c89ae8094339933
Siva Velusamy [Fri, 7 Oct 2011 18:11:49 +0000 (11:11 -0700)]
am
f3a1c511: (-s ours) Cherrypick
e6c1198 from master for r14. do not merge.
* commit '
f3a1c511c69b5733256e12b5b659e69f006a77fb':
Cherrypick
e6c1198 from master for r14. do not merge.
Siva Velusamy [Fri, 7 Oct 2011 17:17:06 +0000 (10:17 -0700)]
Cherrypick
e6c1198 from master for r14. do not merge.
Project location should not be set if it is in workspace.
If the project is created inside the workspace, then the project
description should not set the location. Otherwise the project
creation will fail with an error.
Change-Id: Id1b1a2e6f18d988659727953fad131a14c841dfb
Xavier Ducrohet [Fri, 7 Oct 2011 18:00:02 +0000 (11:00 -0700)]
Merge "Project location should not be set if it is in workspace."
Siva Velusamy [Fri, 7 Oct 2011 17:17:06 +0000 (10:17 -0700)]
Project location should not be set if it is in workspace.
If the project is created inside the workspace, then the project
description should not set the location. Otherwise the project
creation will fail with an error.
Change-Id: I4b1f63fa516b1fc0473c857656177316c15bf9ae
Raphael Moll [Fri, 7 Oct 2011 04:24:46 +0000 (21:24 -0700)]
am
3ef1b696: SDK: fix typo in atree
* commit '
3ef1b6963686f191f58c001791d25defda873f02':
SDK: fix typo in atree
Raphael Moll [Fri, 7 Oct 2011 04:21:26 +0000 (21:21 -0700)]
SDK: fix typo in atree
it's hprof, not hprov. sigh.
Change-Id: I81a5cb107c18a94fa48c5643a57178407693b83c
Tor Norbye [Fri, 7 Oct 2011 03:00:25 +0000 (20:00 -0700)]
am
0afd6f63: (-s ours) Update GridModel to track GridLayout change. DO NOT MERGE.
* commit '
0afd6f63d4b4b159e61d91af4f12370cf842d534':
Update GridModel to track GridLayout change. DO NOT MERGE.
Tor Norbye [Fri, 7 Oct 2011 02:49:49 +0000 (19:49 -0700)]
Update GridModel to track GridLayout change. DO NOT MERGE.
Change-Id: I1eda08e0be0e07e49dd23c437edd98ae63db4a9a
Tor Norbye [Fri, 7 Oct 2011 02:57:39 +0000 (19:57 -0700)]
Merge "Update GridModel to track GridLayout change"
Tor Norbye [Fri, 7 Oct 2011 02:49:49 +0000 (19:49 -0700)]
Update GridModel to track GridLayout change
Change-Id: Idc4a9af22a54634d5999b3732713e705c0506df8
Xavier Ducrohet [Fri, 7 Oct 2011 02:36:05 +0000 (19:36 -0700)]
am
cde8474e: (-s ours) Cherrypick 26d92b from master for r14. do not merge.
* commit '
cde8474ebe87533a45c250297097e908b1f4e238':
Cherrypick 26d92b from master for r14. do not merge.
Xavier Ducrohet [Fri, 7 Oct 2011 02:23:33 +0000 (19:23 -0700)]
Cherrypick 26d92b from master for r14. do not merge.
Ant build didn't use -non-constant-id for libraries!
Change-Id: I6dffc58d68cf93bad73c419fbf38ee2d0be2dfb0
Xavier Ducrohet [Fri, 7 Oct 2011 02:24:42 +0000 (19:24 -0700)]
Merge "Ant build didn't use -non-constant-id for libraries!"
Xavier Ducrohet [Fri, 7 Oct 2011 02:23:33 +0000 (19:23 -0700)]
Ant build didn't use -non-constant-id for libraries!
Change-Id: I966b8796008b87dd3e6101d8c6d09271e2621c52
Xavier Ducrohet [Fri, 7 Oct 2011 01:57:09 +0000 (18:57 -0700)]
Add logging in ddms.
Change-Id: I42508186ea339de1d97f0de2e801e6152311881a
Xavier Ducrohet [Fri, 7 Oct 2011 01:06:38 +0000 (18:06 -0700)]
The overlay plugin has no src folder.
Change-Id: I48cc8c3e707d63a11320d84b84e62c2a60f28233
Siva Velusamy [Thu, 6 Oct 2011 18:59:55 +0000 (11:59 -0700)]
Minor refactor: keep sizes of snapshot ArrayList's in sync.
Change-Id: I30aef911df1146ff9a64c4d08c4371c2937d4e94
Siva Velusamy [Thu, 6 Oct 2011 18:37:35 +0000 (11:37 -0700)]
Merge "Add support for importing saved heap data."
Tor Norbye [Thu, 6 Oct 2011 18:36:36 +0000 (11:36 -0700)]
Merge "Fix Copy/Paste enablement"
Siva Velusamy [Thu, 6 Oct 2011 16:35:33 +0000 (09:35 -0700)]
Add support for importing saved heap data.
Change-Id: I8552af1754f5093dcdb156f7f81e3beef776835a
Siva Velusamy [Fri, 30 Sep 2011 20:55:31 +0000 (13:55 -0700)]
Model diff snapshot as a subtype of a regular snapshot.
Change-Id: Ic701255c586530214b51a1553b66aa60c6c7b538
Tor Norbye [Thu, 6 Oct 2011 16:59:12 +0000 (09:59 -0700)]
Fix Copy/Paste enablement
This changeset fixes a couple of cases where the Copy/Paste actions
would not be enabled:
* When switching active tabs
* After running some other actions
Change-Id: I03df6fa91641ce722cb7bac615fc73342c77f586
Siva Velusamy [Wed, 5 Oct 2011 23:02:31 +0000 (16:02 -0700)]
Fix NPE: for some properties, description was null.
See http://code.google.com/p/android/issues/detail?id=20447
Change-Id: I7db8f16b4027a9f4582c4a70bf8ad1c048ae7006
Tor Norbye [Wed, 5 Oct 2011 22:29:58 +0000 (15:29 -0700)]
am
6e805fb2: (-s ours) 20542: Contextual prop menu doesn\'t work well for textStyle. DO NOT MERGE.
* commit '
6e805fb2b209a2d346fa561ad02e8f67de70684a':
20542: Contextual prop menu doesn't work well for textStyle. DO NOT MERGE.
Tor Norbye [Wed, 5 Oct 2011 15:46:19 +0000 (08:46 -0700)]
20542: Contextual prop menu doesn't work well for textStyle. DO NOT MERGE.
Change-Id: I6092924b63448b9700ebe5906fab87f11520e27f
Tor Norbye [Wed, 5 Oct 2011 21:24:05 +0000 (14:24 -0700)]
Merge "20542: Contextual prop menu doesn't work well for textStyle"
Raphael [Wed, 5 Oct 2011 20:56:14 +0000 (13:56 -0700)]
am
68ce843e: (-s ours) SDK Manager: fix handling of source URLs. Do not merge.
* commit '
68ce843e28c93465c48db84de09821347cdc8f6a':
SDK Manager: fix handling of source URLs. Do not merge.
Raphael [Wed, 5 Oct 2011 20:36:29 +0000 (13:36 -0700)]
SDK Manager: fix handling of source URLs. Do not merge.
This changes how source URLs are handled. Packages
from different sources were previously treated as
separate if the packages were the same (e.g. same
platform API) but the source URLs were different.
Instead this checks the hostname+domain name of the URL
is different, as well as the type of the source (that
is a sdk repository vs addon repository).
(cherry picked from commit
d66d4b7804ce5585bed335168a0c7f3f178a11b0)
Change-Id: Ic127c4111e5028d467ad89c987c5f39cb8f8e8d7
Raphael [Wed, 5 Oct 2011 20:53:42 +0000 (13:53 -0700)]
Merge "SDK Manager: fix handling of source URLs"
Raphael [Wed, 5 Oct 2011 20:36:29 +0000 (13:36 -0700)]
SDK Manager: fix handling of source URLs
This changes how source URLs are handled. Packages
from different sources were previously treated as
separate if the packages were the same (e.g. same
platform API) but the source URLs were different.
Instead this checks the hostname+domain name of the URL
is different, as well as the type of the source (that
is a sdk repository vs addon repository).
Change-Id: I5ba133cd0dc984528bf696aef77d00cd9d31ed9c
Siva Velusamy [Wed, 5 Oct 2011 18:56:47 +0000 (11:56 -0700)]
am
d55b705d: (-s ours) Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.
* commit '
d55b705d33316e05abfc23cec34708307a4d226e':
Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.
Siva Velusamy [Tue, 4 Oct 2011 22:27:20 +0000 (15:27 -0700)]
Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.
Change-Id: I30174344cd5909e3de773b30cac711dd4f609f87
Tor Norbye [Wed, 5 Oct 2011 18:26:38 +0000 (11:26 -0700)]
am
ce286143: (-s ours) Formatting fix: ensure no double blank new lines between elements. DO NOT MERGE.
* commit '
ce286143d5a1fc448205f3c905a00de4dc943d9a':
Formatting fix: ensure no double blank new lines between elements. DO NOT MERGE.
Tor Norbye [Wed, 5 Oct 2011 18:26:38 +0000 (11:26 -0700)]
am
87164363: (-s ours) Look up space width from settings instead of hardcoded to 4. DO NOT MERGE.
* commit '
87164363780f84aba2322bf55141628fd4621740':
Look up space width from settings instead of hardcoded to 4. DO NOT MERGE.
Tor Norbye [Wed, 5 Oct 2011 18:24:32 +0000 (11:24 -0700)]
am
6ede5b20: (-s ours) Fix XML formatting from outside the editor (Source > Format). DO NOT MERGE.
* commit '
6ede5b20916fcdca7be60facf4592d302772d0e7':
Fix XML formatting from outside the editor (Source > Format). DO NOT MERGE.
Tor Norbye [Tue, 4 Oct 2011 16:42:44 +0000 (09:42 -0700)]
Formatting fix: ensure no double blank new lines between elements. DO NOT MERGE.
Change-Id: I2a03e12adbf4a286114766c7d679cb7b65d3e92e
Tor Norbye [Mon, 3 Oct 2011 21:31:11 +0000 (14:31 -0700)]
Look up space width from settings instead of hardcoded to 4. DO NOT MERGE.
Change-Id: Id801b75f3a9ea494757e5846812ca568f9a337a3
Tor Norbye [Sat, 1 Oct 2011 04:01:06 +0000 (21:01 -0700)]
Fix XML formatting from outside the editor (Source > Format). DO NOT MERGE.
This changeset fixes this issue:
20450: Source->Format for XML files in Project Explorer in 14-preview
applies old XML rules instead of new Android-aware ones
Basically, the Eclipse XML support does not consult the
StructuredTextViewerConfigurationXML configuration when formatting
files. To work around this, this changeset overrides the format
processor defined for XML files and redirects to the ADT custom
formatter when the option to use a custom formatter is set.
Unfortunately, setting the formatProcessor in the ADT plugin does not
work, because it turns out that the WTP code to process layer
registrations processes plugins in alphabetical order of plugin names
(rather than say plugin dependency order), and as a result, the WTP
registration is processed later than the ADT one (because org.eclipse
> com.android) and it clobbers our registration.
To work around this, this changeset adds a *new* plugin, an overlay
for ADT which is named "overlay.com.android.eclipse.(etc)" which sorts
alphabetically later than org.eclipse. The plugin is basically empty
(it just provides a registration of the ADT format processor), and it
is registered as just a part of the ADT plugin so it should not be
exposed to users directly.
Change-Id: I05c617ca8e879d2a46de9def9f97f3f7a79884ce
Siva Velusamy [Wed, 5 Oct 2011 18:03:59 +0000 (11:03 -0700)]
Merge "Add a preference to turn on/off auto monitoring logcat."
Siva Velusamy [Tue, 4 Oct 2011 22:27:20 +0000 (15:27 -0700)]
Add a preference to turn on/off auto monitoring logcat.
Change-Id: Ia2f02cbb02a89df6f665739427d842d6826a61cd
Tor Norbye [Wed, 5 Oct 2011 15:46:19 +0000 (08:46 -0700)]
20542: Contextual prop menu doesn't work well for textStyle
Change-Id: I34769f28848cd4618611db1a18f719466d3b1c1e
Raphael [Wed, 5 Oct 2011 07:02:16 +0000 (00:02 -0700)]
am
644764ce: (-s ours) SDK: fix SdkManager class not releasing FileInputStream. Do not merge.
* commit '
644764ce5452f9534aedf94857055a361f97e6f3':
SDK: fix SdkManager class not releasing FileInputStream. Do not merge.
Raphael [Wed, 5 Oct 2011 07:02:15 +0000 (00:02 -0700)]
am
e75843be: (-s ours) SDK Manager: Fix NPE when deleting local archive. Do not merge.
* commit '
e75843be78e31ece5d30ec8a6cc51dad45d6d9cb':
SDK Manager: Fix NPE when deleting local archive. Do not merge.
Raphael [Wed, 5 Oct 2011 07:02:14 +0000 (00:02 -0700)]
am
642999bd: (-s ours) SDK: change SDK_TEST_URLS behavior. Do not merge.
* commit '
642999bdbade5a877743381a3fc9e4193c90a38f':
SDK: change SDK_TEST_URLS behavior. Do not merge.
Raphael [Wed, 5 Oct 2011 06:39:57 +0000 (23:39 -0700)]
SDK: fix SdkManager class not releasing FileInputStream. Do not merge.
In various parts of the code base, I see code that creates
a FileInputStrea and never closes it. Unfortunately on
Windows that means the file will stay locked for as long
as the java process is alive.
In this case the SdkManager wasn't closing to input streams
which makes the source.properties files locked, and thus
it makes it impossible to upgrade/delete the corresponding
packages.
There are more occurences of this elsewhere in the code.
(cherry picked from commit
4c7bf6fe4dbf06f43d86b639ce5144ffeff7a626)
Change-Id: I36ad68a216b99fb471b941cb4ccdc88cd3bfad3b
Raphael [Wed, 5 Oct 2011 06:31:35 +0000 (23:31 -0700)]
SDK Manager: Fix NPE when deleting local archive. Do not merge.
Properly enforce that all local archive should have
an actual installation path to be considered local.
This was missing in the system image and the source
archives introduced last week.
(cherry picked from commit
903ae4af34664fb8ffffa7a86e907814f860dab1)
Change-Id: I7265bf8460acb5c9ff5c9f1df6770b82e3b3e2f8
Raphael [Mon, 3 Oct 2011 22:34:45 +0000 (15:34 -0700)]
SDK: change SDK_TEST_URLS behavior. Do not merge.
When SDK_TEST_URLS is set, it prevents the default
sources from being loaded. This makes it easier to
test just a new site.
(cherry picked from commit
70164aa4ebb8f3186e58f922ad6b7d64f28bed01)
Change-Id: Ic9fc4f70de5993f056ebe860359a0cfa615a074b
Raphael [Wed, 5 Oct 2011 06:39:57 +0000 (23:39 -0700)]
SDK: fix SdkManager class not releasing FileInputStream
In various parts of the code base, I see code that creates
a FileInputStrea and never closes it. Unfortunately on
Windows that means the file will stay locked for as long
as the java process is alive.
In this case the SdkManager wasn't closing to input streams
which makes the source.properties files locked, and thus
it makes it impossible to upgrade/delete the corresponding
packages.
There are more occurences of this elsewhere in the code.
Change-Id: I9f0a854b210411757eee8b4ebf8308b059206542
Raphael [Wed, 5 Oct 2011 06:31:35 +0000 (23:31 -0700)]
SDK Manager: Fix NPE when deleting local archive
Properly enforce that all local archive should have
an actual installation path to be considered local.
This was missing in the system image and the source
archives introduced last week.
Change-Id: I3e4abd3c4136c9be73061e207e42e2d3cc22ca8b
Raphael Moll [Wed, 5 Oct 2011 05:17:46 +0000 (22:17 -0700)]
am
ead5c918: Merge "SDK: fix typo in android.bat" into tools_r14
* commit '
ead5c91879ab9a4b02f87da9134d44aaef5c1b8a':
SDK: fix typo in android.bat
Raphael Moll [Wed, 5 Oct 2011 05:16:16 +0000 (22:16 -0700)]
Merge "SDK: fix typo in android.bat" into tools_r14
Raphael Moll [Wed, 5 Oct 2011 05:13:02 +0000 (22:13 -0700)]
SDK: fix typo in android.bat
This prevents httpcore from being copied correctly.
Change-Id: I28d6b4020e854cbe914fd418e51e6a53e7c5444f
Xavier Ducrohet [Tue, 4 Oct 2011 22:57:36 +0000 (15:57 -0700)]
am
6aa7a7e3: (-s ours) Cherrypick 6a5504 from do not merge.
* commit '
6aa7a7e3ea2e2ba8ab3558134f0e5d81c59326a2':
Cherrypick 6a5504 from master. do not merge.
Xavier Ducrohet [Tue, 4 Oct 2011 20:32:24 +0000 (13:32 -0700)]
Cherrypick 6a5504 from master. do not merge.
Make source.prop more important than build.prop when parsing platforms.
Change-Id: I126d4ed06fd1aa5125add58c17c3cebc4ec6b780
Xavier Ducrohet [Tue, 4 Oct 2011 22:46:28 +0000 (15:46 -0700)]
Merge "Make source.prop more important than build.prop when parsing platforms."
Raphael [Tue, 4 Oct 2011 22:42:29 +0000 (15:42 -0700)]
am
a327cc8f: (-s ours) SDK: use repository-N.xml by default. Do not merge.
* commit '
a327cc8faf81577a0a6342af1d8a990cd7851a20':
SDK: use repository-N.xml by default. Do not merge.
Raphael [Tue, 4 Oct 2011 22:42:29 +0000 (15:42 -0700)]
am
9f9462f5: (-s ours) SDK: Use a different repository-N.xml for updating. Do not merge.
* commit '
9f9462f5504126529799c3bbfe1aaa1968c3064a':
SDK: Use a different repository-N.xml for updating. Do not merge.
Raphael [Tue, 4 Oct 2011 22:42:28 +0000 (15:42 -0700)]
am
53c797d8: (-s ours) SDK: revert
c649a334 and fix missing \n properly. Do not merge.
* commit '
53c797d8d8da1fbfd6fe7606c590a4cfdb61a2fc':
SDK: revert
c649a334 and fix missing \n properly. Do not merge.
Raphael [Tue, 4 Oct 2011 22:33:15 +0000 (15:33 -0700)]
SDK: use repository-N.xml by default. Do not merge.
(This is part of Change I566b6945 but I had forgotten
to amend & upload, grrr.)
(cherry picked from commit
46b86398f7287cbdc88a15f9f6a2418ba29a7dbc)
Change-Id: I71ad810ac2ddbd11ece7f8e5afea22740a52100f
Raphael [Tue, 4 Oct 2011 19:54:37 +0000 (12:54 -0700)]
SDK: Use a different repository-N.xml for updating. Do not merge.
(cherry picked from commit
8f4710850b3a01d6e5f1188440c59d6999646858)
Change-Id: I5d0c733267f04e4ad386ae3ae6853da2ecf9de15
Raphael [Tue, 4 Oct 2011 22:35:30 +0000 (15:35 -0700)]
Merge "SDK: use repository-N.xml by default."
Raphael [Tue, 4 Oct 2011 22:33:15 +0000 (15:33 -0700)]
SDK: use repository-N.xml by default.
(This is part of Change I566b6945 but I had forgotten
to amend & upload, grrr.)
Change-Id: Ic494179481346a2eda0f56327ddac0f123bf4538
Raphael [Tue, 4 Oct 2011 22:30:16 +0000 (15:30 -0700)]
Merge "SDK: Use a different repository-N.xml for updating."
Raphael [Tue, 4 Oct 2011 20:25:25 +0000 (13:25 -0700)]
SDK: revert
c649a334 and fix missing \n properly. Do not merge.
(cherry picked from commit
b4ea99769f2bc149ac3a3fef77c49b7b4b83fe90)
Change-Id: Ifee9c7706f29f8ab2968c9277bdd293182df0900
Raphael [Tue, 4 Oct 2011 22:04:46 +0000 (15:04 -0700)]
Merge "SDK: revert
c649a334 and fix missing \n properly."
Raphael [Tue, 4 Oct 2011 19:54:37 +0000 (12:54 -0700)]
SDK: Use a different repository-N.xml for updating.
Change-Id: I566b6945b7d31c3bfe52b834014beb3f37a098d8
Raphael [Tue, 4 Oct 2011 20:56:46 +0000 (13:56 -0700)]
Fix ADT build
Change-Id: If0411f65bb523e5b26d53c620df666937f8467ca
Xavier Ducrohet [Tue, 4 Oct 2011 20:32:24 +0000 (13:32 -0700)]
Make source.prop more important than build.prop when parsing platforms.
Change-Id: I715a7503a7be2b28cd89bd441b8cbb5ee620ccac
Raphael [Tue, 4 Oct 2011 20:25:25 +0000 (13:25 -0700)]
SDK: revert
c649a334 and fix missing \n properly.
Change-Id: I4affda9be00c37c4a801816625f57f7eda585ef4
Tor Norbye [Tue, 4 Oct 2011 19:36:38 +0000 (12:36 -0700)]
Fix build
Change-Id: Ie4e5dcc64ba8e341f2229dce77b07effbe9443ba
Tor Norbye [Tue, 4 Oct 2011 16:42:44 +0000 (09:42 -0700)]
Formatting fix: ensure no double blank new lines between elements
Change-Id: Id41a5543b4e4639eb8c9943463587168c90f9ff4
Tor Norbye [Tue, 4 Oct 2011 16:45:41 +0000 (09:45 -0700)]
Merge "Look up space width from settings instead of hardcoded to 4"
Tor Norbye [Tue, 4 Oct 2011 16:45:26 +0000 (09:45 -0700)]
Merge "Fix XML formatting from outside the editor (Source > Format)"
Raphael [Tue, 4 Oct 2011 03:39:44 +0000 (20:39 -0700)]
Merge "SDK: Fix bug that prevents repo XSD upgrades"
Raphael [Tue, 4 Oct 2011 03:39:38 +0000 (20:39 -0700)]
Merge "SDK: change SDK_TEST_URLS behavior"
Tor Norbye [Mon, 3 Oct 2011 21:31:11 +0000 (14:31 -0700)]
Look up space width from settings instead of hardcoded to 4
Change-Id: Ib84a238d8586cc03915ea5dc394f2309f58d7052
Raphael [Mon, 3 Oct 2011 22:36:59 +0000 (15:36 -0700)]
SDK: Fix bug that prevents repo XSD upgrades
This fixes the bug in the current code.
We're going to switch to a different upgrade mechanism,
rendering this code useless, but I'd still have this
checked in for the record: the issue is that the
temporary node is mixed up and the attributes use the
element name instead of their attribute names.
Change-Id: I3abcfd476494ee2ddb8b75789b346e86556d8d85
Tor Norbye [Mon, 3 Oct 2011 23:31:41 +0000 (16:31 -0700)]
am
2c07fc34: (-s ours) XML Comment Formatting Fixes. DO NOT MERGE.
* commit '
2c07fc348d85836bff4d1f9ca656d96898a0833c':
XML Comment Formatting Fixes. DO NOT MERGE.
Tor Norbye [Mon, 3 Oct 2011 23:30:29 +0000 (16:30 -0700)]
am
22b38a19: (-s ours) Ensure that deletion hook is only run on valid parents. DO NOT MERGE.
* commit '
22b38a190fa658924a665989d99dc508d3e88739':
Ensure that deletion hook is only run on valid parents. DO NOT MERGE.
Tor Norbye [Mon, 3 Oct 2011 16:15:23 +0000 (09:15 -0700)]
XML Comment Formatting Fixes. DO NOT MERGE.
This changeset fixes issue 20452 related to XML comment
handling. There are several changes.
First it fixes a truncation bug where the last character in a comment
could get erased.
Second it makes sure we don't end up with double blank lines, since
there were cases where the comment formatter would insert a newline
(to preserve newlines after comments in the original document) and a
subsequent element or close tag would also insert a newline (which is
where the normal blank lines are added). Now the code will peek at the
write buffer to make sure we haven't already added a blank line.
Third, it attempts to handle multiline comments a bit better such that
the code which preserves indentation of the first comment line will
dedent down to the minimum indentation level of the block comment.
This means that we will format
<!-- First
Second -->
into
<!--
First
Second
-->
instead of
<!--
First
Second
-->
as the code did up until now. (The current handling was there to make
<!-- This is
a comment -->
format into
<!--
This is
a comment
-->
)
Unit tests.
Change-Id: I7201b55a2c824c3c0b43287e853bc9b75d74ed7f
Tor Norbye [Sat, 1 Oct 2011 04:00:43 +0000 (21:00 -0700)]
Ensure that deletion hook is only run on valid parents. DO NOT MERGE.
There's now a "deletion hook" for ViewRules where they get a chance to
clean up after a set of children have been deleted. This changeset
guards against the case where the parent reference was null.
Change-Id: Ib2cfd0543ff55726ff488b57262267f610373639
Tor Norbye [Mon, 3 Oct 2011 22:37:55 +0000 (15:37 -0700)]
Merge "XML Comment Formatting Fixes"
Raphael [Mon, 3 Oct 2011 22:34:45 +0000 (15:34 -0700)]
SDK: change SDK_TEST_URLS behavior
When SDK_TEST_URLS is set, it prevents the default
sources from being loaded. This makes it easier to
test just a new site.
Change-Id: I463759ca43c7836e81524c2eac4dad769bc7032c
Tor Norbye [Sat, 1 Oct 2011 04:01:06 +0000 (21:01 -0700)]
Fix XML formatting from outside the editor (Source > Format)
This changeset fixes this issue:
20450: Source->Format for XML files in Project Explorer in 14-preview
applies old XML rules instead of new Android-aware ones
Basically, the Eclipse XML support does not consult the
StructuredTextViewerConfigurationXML configuration when formatting
files. To work around this, this changeset overrides the format
processor defined for XML files and redirects to the ADT custom
formatter when the option to use a custom formatter is set.
Unfortunately, setting the formatProcessor in the ADT plugin does not
work, because it turns out that the WTP code to process layer
registrations processes plugins in alphabetical order of plugin names
(rather than say plugin dependency order), and as a result, the WTP
registration is processed later than the ADT one (because org.eclipse
> com.android) and it clobbers our registration.
To work around this, this changeset adds a *new* plugin, an overlay
for ADT which is named "overlay.com.android.eclipse.(etc)" which sorts
alphabetically later than org.eclipse. The plugin is basically empty
(it just provides a registration of the ADT format processor), and it
is registered as just a part of the ADT plugin so it should not be
exposed to users directly.
Change-Id: I2af2bc1e61e758c36243e4ac7236f676266cc665
Tor Norbye [Mon, 3 Oct 2011 21:20:17 +0000 (14:20 -0700)]
Merge "Ensure that deletion hook is only run on valid parents"
Tor Norbye [Mon, 3 Oct 2011 16:15:23 +0000 (09:15 -0700)]
XML Comment Formatting Fixes
This changeset fixes issue 20452 related to XML comment
handling. There are several changes.
First it fixes a truncation bug where the last character in a comment
could get erased.
Second it makes sure we don't end up with double blank lines, since
there were cases where the comment formatter would insert a newline
(to preserve newlines after comments in the original document) and a
subsequent element or close tag would also insert a newline (which is
where the normal blank lines are added). Now the code will peek at the
write buffer to make sure we haven't already added a blank line.
Third, it attempts to handle multiline comments a bit better such that
the code which preserves indentation of the first comment line will
dedent down to the minimum indentation level of the block comment.
This means that we will format
<!-- First
Second -->
into
<!--
First
Second
-->
instead of
<!--
First
Second
-->
as the code did up until now. (The current handling was there to make
<!-- This is
a comment -->
format into
<!--
This is
a comment
-->
)
Unit tests.
Change-Id: Id98faadf3731b82880b37ff852c7c0787bb196f8
Tor Norbye [Sat, 1 Oct 2011 04:35:21 +0000 (21:35 -0700)]
am
390b825e: (-s ours) Refactoring quick fix adjustments to caret and selection handling. DO NOT MERGE
* commit '
390b825e915b0c37825d2f3941197bd3abe3394b':
Refactoring quick fix adjustments to caret and selection handling. DO NOT MERGE
Tor Norbye [Fri, 30 Sep 2011 18:45:26 +0000 (11:45 -0700)]
Refactoring quick fix adjustments to caret and selection handling. DO NOT MERGE
This changeset changes the logic in the refactoring quickfix (which
adds the Android refactorings based on the current caret position,
lexical context and selection).
It now allows some of the refactorings to be run when there is a
selection (this fixes "20393: Extract string functionality in Android
XML files"), and it makes other refactorings work when there is no
selection (it implicitly selects the surrounding element).
It also ensures that the Extract Style refactoring won't be listed at
the top if the attribute under the cursor is not a stylable attribute,
and it makes some other adjustments to the proposal order.
Change-Id: I1ca305d9c66ae4eb6cd9a4f45f6803bb2444abdb
Tor Norbye [Sat, 1 Oct 2011 04:00:43 +0000 (21:00 -0700)]
Ensure that deletion hook is only run on valid parents
There's now a "deletion hook" for ViewRules where they get a chance to
clean up after a set of children have been deleted. This changeset
guards against the case where the parent reference was null.
Change-Id: I3eef328ec5450a15588b29fff1d0d834388c4cde
Tor Norbye [Sat, 1 Oct 2011 02:01:42 +0000 (19:01 -0700)]
Merge "Refactoring quick fix adjustments to caret and selection handling"
Tor Norbye [Fri, 30 Sep 2011 18:45:26 +0000 (11:45 -0700)]
Refactoring quick fix adjustments to caret and selection handling
This changeset changes the logic in the refactoring quickfix (which
adds the Android refactorings based on the current caret position,
lexical context and selection).
It now allows some of the refactorings to be run when there is a
selection (this fixes "20393: Extract string functionality in Android
XML files"), and it makes other refactorings work when there is no
selection (it implicitly selects the surrounding element).
It also ensures that the Extract Style refactoring won't be listed at
the top if the attribute under the cursor is not a stylable attribute,
and it makes some other adjustments to the proposal order.
Change-Id: I0714bb652032aa19e6c2502dc1af7bb5e4adf308
Siva Velusamy [Fri, 30 Sep 2011 22:42:09 +0000 (15:42 -0700)]
am
8f2b9fbd: (-s ours) Provide a way to show/hide the filters column. Do not merge.
* commit '
8f2b9fbd5f8f298a05f09e0b523c4824e5da0e29':
Provide a way to show/hide the filters column. Do not merge.
Siva Velusamy [Thu, 29 Sep 2011 21:34:39 +0000 (14:34 -0700)]
Provide a way to show/hide the filters column. Do not merge.
(cherry picked from commit
c9192e375844e45ccb74ee69150717a31385564f)
Change-Id: Iadfc8be7d20a85c79ff94cf62f14345392cf999b
Raphael [Fri, 30 Sep 2011 22:34:02 +0000 (15:34 -0700)]
am
bd79a007: (-s ours) SDK: fix missing \n in \'android create avd\'. Do not merge.
* commit '
bd79a007af08ce3b4e41c6602cf7b8bf945c6fa8':
SDK: fix missing \n in 'android create avd'. Do not merge.
Raphael [Fri, 30 Sep 2011 20:03:45 +0000 (13:03 -0700)]
SDK: fix missing \n in 'android create avd'. Do not merge.
SDK Bug: 20430
(cherry picked from commit
c649a334d7bc656ea3c00cd9d3d102c88fbf8f80)
Change-Id: I8b4370b0d4ec4b96e9b65c214a9e06506b615a41
Raphael [Fri, 30 Sep 2011 22:29:48 +0000 (15:29 -0700)]
Merge "SDK: fix missing \n in 'android create avd'"
Raphael [Fri, 30 Sep 2011 20:03:45 +0000 (13:03 -0700)]
SDK: fix missing \n in 'android create avd'
SDK Bug: 20430
Change-Id: Id427390c799165a1dff07530c6fce48488193055