diff options
| -rw-r--r-- | eclipse/changes.txt | 2 | ||||
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java | 9 | ||||
| -rw-r--r-- | files/devices.xml | 206 |
3 files changed, 214 insertions, 3 deletions
diff --git a/eclipse/changes.txt b/eclipse/changes.txt index f9eaf9d..d3bab15 100644 --- a/eclipse/changes.txt +++ b/eclipse/changes.txt @@ -2,7 +2,9 @@ - Fixed issue with library project names containing characters that aren't compatible with Eclipse path variable. The link between the main project and the library would fail to create. - Added support for library projects that don't have a source folder called "src". There is now support for any number of source folder, with no name restriction. They can even be in sub folder such as "src/java". - Added support for libraries with library dependencies. +- Library source folders linked into the main project are now properly set as derived to be ignored by Team plug-ins. - added support for new resource qualifiers: car/desk, night/notnight and navexposed/navhidden +- added more device screen types for the layout editor. All screen resolution/density combinations from http://developer.android.com/guide/practices/screens_support.html#range is now available. 0.9.7: - Support for library projects diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java index a4c216c..9423ae7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java @@ -1245,6 +1245,9 @@ public final class Sdk { * @return an {@link IStatus} with the status of the action. */ private IStatus linkProjectAndLibrary(LinkLibraryBundle bundle, IProgressMonitor monitor) { + if (bundle.mProject.isOpen() == false) { + return Status.OK_STATUS; + } try { // add the library to the list of dynamic references. This is necessary to receive // notifications that the library content changed in the builders. @@ -1308,6 +1311,9 @@ public final class Sdk { // loop on the projects to add. for (IProject library : bundle.mLibraryProjects) { + if (library.isOpen() == false) { + continue; + } final String libName = library.getName(); final String varName = getLibraryVariableName(libName); @@ -1362,6 +1368,9 @@ public final class Sdk { libSrc.createLink(linkedPath, IResource.REPLACE, monitor); + // mark it as derived so that Team plug-in ignore this + libSrc.setDerived(true); + // set some persistent properties on it to know that it was // created by ADT. ProjectHelper.saveStringProperty(libSrc, PROP_CREATOR, CREATOR_ADT); diff --git a/files/devices.xml b/files/devices.xml index a015cdd..a822175 100644 --- a/files/devices.xml +++ b/files/devices.xml @@ -3,7 +3,66 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:d="http://schemas.android.com/sdk/android/layout-devices/1"> - <d:device name="ADP1"> + <d:device name="2.7in QVGA"> + <d:default> + <d:screen-size>small</d:screen-size> + <d:screen-ratio>notlong</d:screen-ratio> + <d:screen-orientation>port</d:screen-orientation> + <d:pixel-density>ldpi</d:pixel-density> + <d:touch-type>finger</d:touch-type> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:text-input-method>nokeys</d:text-input-method> + <d:nav-state>navexposed</d:nav-state> + <d:nav-method>nonav</d:nav-method> + <d:screen-dimension> + <d:size>240</d:size> + <d:size>320</d:size> + </d:screen-dimension> + <d:xdpi>145</d:xdpi> + <d:ydpi>145</d:ydpi> + </d:default> + + <d:config name="Portrait"> + <d:screen-orientation>port</d:screen-orientation> + </d:config> + <d:config name="Landscape"> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + </d:device> + + <d:device name="2.7in QVGA slider"> + <d:default> + <d:screen-size>small</d:screen-size> + <d:screen-ratio>notlong</d:screen-ratio> + <d:screen-orientation>port</d:screen-orientation> + <d:pixel-density>ldpi</d:pixel-density> + <d:touch-type>finger</d:touch-type> + <d:text-input-method>qwerty</d:text-input-method> + <d:nav-state>navexposed</d:nav-state> + <d:nav-method>nonav</d:nav-method> + <d:screen-dimension> + <d:size>240</d:size> + <d:size>320</d:size> + </d:screen-dimension> + <d:xdpi>145</d:xdpi> + <d:ydpi>145</d:ydpi> + </d:default> + + <d:config name="Portrait"> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:screen-orientation>port</d:screen-orientation> + </d:config> + <d:config name="Landscape, closed"> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + <d:config name="Landscape, open"> + <d:keyboard-state>keysexposed</d:keyboard-state> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + </d:device> + + <d:device name="3.2in HVGA slider (ADP1)"> <d:default> <d:screen-size>normal</d:screen-size> <d:screen-ratio>notlong</d:screen-ratio> @@ -35,7 +94,7 @@ </d:config> </d:device> - <d:device name="ADP2"> + <d:device name="3.2in HVGA (ADP2)"> <d:default> <d:screen-size>normal</d:screen-size> <d:screen-ratio>notlong</d:screen-ratio> @@ -61,7 +120,61 @@ <d:screen-orientation>land</d:screen-orientation> </d:config> </d:device> - <d:device name="Nexus One"> + + <d:device name="3.3in WQVGA"> + <d:default> + <d:screen-size>normal</d:screen-size> + <d:screen-ratio>long</d:screen-ratio> + <d:screen-orientation>port</d:screen-orientation> + <d:pixel-density>ldpi</d:pixel-density> + <d:touch-type>finger</d:touch-type> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:text-input-method>nokeys</d:text-input-method> + <d:nav-state>navexposed</d:nav-state> + <d:nav-method>nonav</d:nav-method> + <d:screen-dimension> + <d:size>240</d:size> + <d:size>400</d:size> + </d:screen-dimension> + <d:xdpi>141</d:xdpi> + <d:ydpi>141</d:ydpi> + </d:default> + + <d:config name="Portrait"> + <d:screen-orientation>port</d:screen-orientation> + </d:config> + <d:config name="Landscape"> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + </d:device> + <d:device name="3.4in FWQVGA"> + <d:default> + <d:screen-size>normal</d:screen-size> + <d:screen-ratio>long</d:screen-ratio> + <d:screen-orientation>port</d:screen-orientation> + <d:pixel-density>ldpi</d:pixel-density> + <d:touch-type>finger</d:touch-type> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:text-input-method>nokeys</d:text-input-method> + <d:nav-state>navexposed</d:nav-state> + <d:nav-method>nonav</d:nav-method> + <d:screen-dimension> + <d:size>240</d:size> + <d:size>432</d:size> + </d:screen-dimension> + <d:xdpi>145</d:xdpi> + <d:ydpi>145</d:ydpi> + </d:default> + + <d:config name="Portrait"> + <d:screen-orientation>port</d:screen-orientation> + </d:config> + <d:config name="Landscape"> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + </d:device> + + <d:device name="3.7in WVGA (Nexus One)"> <d:default> <d:screen-size>normal</d:screen-size> <d:screen-ratio>long</d:screen-ratio> @@ -87,4 +200,91 @@ <d:screen-orientation>land</d:screen-orientation> </d:config> </d:device> + + <d:device name="3.7in FWVGA slider"> + <d:default> + <d:screen-size>normal</d:screen-size> + <d:screen-ratio>long</d:screen-ratio> + <d:screen-orientation>port</d:screen-orientation> + <d:pixel-density>hdpi</d:pixel-density> + <d:touch-type>finger</d:touch-type> + <d:text-input-method>qwerty</d:text-input-method> + <d:nav-state>navhidden</d:nav-state> + <d:nav-method>dpad</d:nav-method> + <d:screen-dimension> + <d:size>480</d:size> + <d:size>854</d:size> + </d:screen-dimension> + <d:xdpi>265</d:xdpi> + <d:ydpi>265</d:ydpi> + </d:default> + + <d:config name="Portrait"> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:screen-orientation>port</d:screen-orientation> + </d:config> + <d:config name="Landscape, closed"> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + <d:config name="Landscape, open"> + <d:keyboard-state>keysexposed</d:keyboard-state> + <d:screen-orientation>land</d:screen-orientation> + <d:nav-state>navexposed</d:nav-state> + </d:config> + </d:device> + + <d:device name="5.1in WVGA"> + <d:default> + <d:screen-size>large</d:screen-size> + <d:screen-ratio>long</d:screen-ratio> + <d:screen-orientation>port</d:screen-orientation> + <d:pixel-density>mdpi</d:pixel-density> + <d:touch-type>finger</d:touch-type> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:text-input-method>nokeys</d:text-input-method> + <d:nav-state>navexposed</d:nav-state> + <d:nav-method>nonav</d:nav-method> + <d:screen-dimension> + <d:size>480</d:size> + <d:size>800</d:size> + </d:screen-dimension> + <d:xdpi>183</d:xdpi> + <d:ydpi>183</d:ydpi> + </d:default> + + <d:config name="Portrait"> + <d:screen-orientation>port</d:screen-orientation> + </d:config> + <d:config name="Landscape"> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + </d:device> + + <d:device name="5.4in FWVGA"> + <d:default> + <d:screen-size>large</d:screen-size> + <d:screen-ratio>long</d:screen-ratio> + <d:screen-orientation>port</d:screen-orientation> + <d:pixel-density>mdpi</d:pixel-density> + <d:touch-type>finger</d:touch-type> + <d:keyboard-state>keyssoft</d:keyboard-state> + <d:text-input-method>nokeys</d:text-input-method> + <d:nav-state>navexposed</d:nav-state> + <d:nav-method>nonav</d:nav-method> + <d:screen-dimension> + <d:size>480</d:size> + <d:size>854</d:size> + </d:screen-dimension> + <d:xdpi>181</d:xdpi> + <d:ydpi>181</d:ydpi> + </d:default> + + <d:config name="Portrait"> + <d:screen-orientation>port</d:screen-orientation> + </d:config> + <d:config name="Landscape"> + <d:screen-orientation>land</d:screen-orientation> + </d:config> + </d:device> </d:layout-devices> |