It correctly only refuses to edit @string/blah now.
This CL also does a bit of refactoring; I extracted some methods
and a class to make it a bit easier to read.
BUG 2066460
Change-Id: I95a34d28d6390ab0cc075f05ea83ceec04993ae9
Merge commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c' into eclair-plus-aosp
* commit '5ea7700ffa5ee22012f88255f62aa4af7a1b840c':
Add xdpi and ydpi to layout-configs XML Schema.
Merge commit '1028accb55919c0a84a4871002efb19a202c475c' into eclair-plus-aosp
* commit '1028accb55919c0a84a4871002efb19a202c475c':
Fix NPE when opening new layout file.
When adding the parsing of the device XML files, I mostly tested with a
layout file already opened when Eclipse launched.
Well it turns out there's a slightly different code path when opening a file
*after* Eclipse has launched. The load of the device UI in the config
selected caused a rendering before the XML model was loaded which ended
up in an NPE in the recomputeLayout method.
Additionnally, I hadn't finalized the code for the GLE2, so this brings it
in line with the GLE1.
Change-Id: Ic86de6e91ca13793aceecb5706bc963edddb9241
This is only to be used to update the location of the main project.
To update other properties, 'update project' can be used.
Change-Id: I96ff44295460c7e331953263abccea17108d5a70
Merge commit '9e4715e6d94e300605ab845c2e68bddaf8c23c8f' into eclair-plus-aosp
* commit '9e4715e6d94e300605ab845c2e68bddaf8c23c8f':
Fix ADT to use the new sdklib API
The issue came from a lack of device configuration and
missing default versions of some resources. We know use
an ADP1 configuration to choose the resources used by
the rendering.
Change-Id: I097b444e4fdc5572cfc53293a3215f1382f5d49c
Add-ons are expected to provide a file called devices.xml in their root
folder. The XML schema for this file is
eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/layout-configs.xsd
I slightly fixed the schema so that normal screen size use the token
"normal" instead of "medium" to match the resource qualifier.
To round up the feature, the following changes are included:
- getEnum in the resource qualifier enum has been made public. There's no
sense in keeping it private and it'll help with people possibly using
valueOf which behaves differently (case sensitive so
ScreenSize.valueOf("normal") fails, while getEnum on the same string succeed.
- Updated the device configuration UI to deal with missing list of
devices while the SDK loads.
Change-Id: Ib1b01007d2ae7fd6398172c3549b2686c33d48be
- Make the distinction between the activity class name, manifest entry,
fully-qualified name, and tested activity for the template place-holders.
Test activity names now directly contain the full name (including the
"Test" prefix) instead of the template adding it.
This is required by the new 'create test-project'
- New action: create test-project
This requires a path to the main project. It reads the package, activity
name and target from the main project.
The activity is read from the manifest and can be in a more complex form
than previously expected (for instance .subpackage.MyClass, instead of
simply MyClass). This is what required the re-work the activity related
template place holders.
Options:
-m --main Location path of the project to test, relative to the new
project [required]
-n --name Project name
-p --path Location path of the new project [required]
Example: for 2 projects MyProject and MyTests located in the same folder,
calling from their parent folder.
android create test-project -p MyTests -m ../MyProject
- build.properties now only gets application.package for older targets
as the new one get it directly from XPath
- Remove AndroidXPathFactory from the anttasks project as it was already
in sdklib which is a dependency.
- Removed IntelliJ templates for the SDK. We haven't supported them for
a while, and now that IntelliJ has built-in support for Android, it's
not that useful anymore.
While there is the command line parameters for 'update test-project'
it's not yet implemented.
Change-Id: I663d4cb7f439bb2abfe866f893e58f4d13aff975
Merge commit '3a683661975908a9bfe2ef4ae5097a8d4ad75b53' into eclair-plus-aosp
* commit '3a683661975908a9bfe2ef4ae5097a8d4ad75b53':
XML Schema for layout configurations.
The only changes to the original XML sample:
- the root element is called "layout-configs" (plural for container).
- the <default> and <config> elements must be defined in that order:
- 0..1 of <default>
folowed by
- 1..n of <config>
It's invalid for the <device> node to be empty.
default/config are defined by a <xsd:sequence>, which imposes the
strict ordering. At first I used an <xsd:choice> which does not
impose any ordering but then it becomes possible to define an
empty <device> element. I'd rather live with the strict ordering
(which also makes sense anyway) and enforce non-empty <device>
elements in the schema.
BUG 2138329
Change-Id: I581afb1d72825ae79df00d81c74c80a2a18680ad
Merge commit '0f61aa6470c2ac6c8cae6c356bb7ce658b71b5ac' into eclair-plus-aosp
* commit '0f61aa6470c2ac6c8cae6c356bb7ce658b71b5ac':
Sync DDMS/Traceview/Android version on the repository source.
All apps now read source.properties located in SDK/tools
to know which version they. This is used in about box display
and in ping usage.
Change-Id: I6620c3eb703c32bfcdfd96e6a27bffc7a123b974
Merge commit '4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b' into eclair-plus-aosp
* commit '4af6620aa05b8d2b34bdecf9e264f98dbfea8d1b':
Add info about location of the coverage report
Merge commit 'f519910b5624f7d7d7a16db482bc205c1b548837' into eclair-plus-aosp
* commit 'f519910b5624f7d7d7a16db482bc205c1b548837':
Fix colSpan for screenshot display from 3 to 4 in DDMS.
Merge commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e' into eclair-plus-aosp
* commit '09f517d43e73a8a6bc7c7cee96ba1892b58daa0e':
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.
Merge commit '14ecfe10515807d57ba110671b760024cc5d1af8' into eclair-plus-aosp
* commit '14ecfe10515807d57ba110671b760024cc5d1af8':
Fixed screenshot command line tool to deal with new RawImage
Merge commit 'f9e2be14764832f81a90f1f03ca9460be05191b3' into eclair-plus-aosp
* commit 'f9e2be14764832f81a90f1f03ca9460be05191b3':
Move the screenshot button above the image
Merge commit '5eff99663c35031975b33e25ab74e2a710231c0a' into eclair-plus-aosp
* commit '5eff99663c35031975b33e25ab74e2a710231c0a':
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.
Merge commit 'b936faf6e6a3e10408f257f948241cf984d7652a' into eclair-plus-aosp
* commit 'b936faf6e6a3e10408f257f948241cf984d7652a':
Disable clipping toggle when not supported.
