diff options
Diffstat (limited to 'eclipse')
64 files changed, 255 insertions, 320 deletions
diff --git a/eclipse/artifacts/bundles/category.xml b/eclipse/artifacts/bundles/category.xml index 46a495e..9d20482 100644 --- a/eclipse/artifacts/bundles/category.xml +++ b/eclipse/artifacts/bundles/category.xml @@ -3,25 +3,25 @@ <description url="https://dl-ssl.google.com/android/eclipse/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.ddms_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_23.0.1.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_23.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_23.0.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_23.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.adt_23.0.1.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_23.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.adt.package_23.0.1.qualifier.jar" id="com.android.ide.eclipse.adt.package.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.adt.package_23.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.package.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> <category-def name="developer" label="Developer Tools"> diff --git a/eclipse/artifacts/bundles/ide.product b/eclipse/artifacts/bundles/ide.product index 81d7c9d..db2b181 100644 --- a/eclipse/artifacts/bundles/ide.product +++ b/eclipse/artifacts/bundles/ide.product @@ -1,20 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="eclipse" uid="adtproduct" id="adtproduct" application="org.eclipse.ui.ide.workbench" version="23.0.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="Eclipse IDE for Android Developers" uid="adtproduct" id="com.android.ide.eclipse.adt.package.adtproduct" application="org.eclipse.ui.ide.workbench" version="23.0.2.qualifier" useFeatures="true" includeLaunchers="true"> + + <aboutInfo> + <image path="/plugin-adt-package/adt-about.png"/> + <text> + Specified in the plugin.xml of the branding plugin. + </text> + </aboutInfo> <configIni use="default"> </configIni> <launcherArgs> - <programArgs>-product adtproduct</programArgs> - <programArgsWin>--launcher.XXMaxPermSize 256M</programArgsWin> - <vmArgs>-Dosgi.requiredJavaVersion=1.6 -Xms40m -Xmx768m</vmArgs> - <vmArgsLin>-XX:MaxPermSize=256m</vmArgsLin> + <programArgs>-product com.android.ide.eclipse.adt.package.adtproduct</programArgs> + <vmArgs>-Dosgi.requiredJavaVersion=1.6 +-XX:MaxPermSize=256m +-Xms512m +-Xmx1024m</vmArgs> <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> </launcherArgs> - <windowImages/> + <windowImages i16="/plugin-adt-package/icons/adt16.png" i32="/plugin-adt-package/icons/adt32.png" i48="/plugin-adt-package/icons/adt48.png"/> <splash location="com.android.ide.eclipse.adt.package" /> @@ -25,6 +33,7 @@ </win> </launcher> + <vm> <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</linux> <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</macos> @@ -35,18 +44,14 @@ </plugins> <features> - <feature id="com.android.ide.eclipse.adt.package.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.adt.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.ddms.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.gldebugger.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.hierarchyviewer.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.ndk.feature" version="23.0.1.qualifier"/> - <feature id="com.android.ide.eclipse.traceview.feature" version="23.0.1.qualifier"/> + <feature id="com.android.ide.eclipse.adt.package.feature" version="23.0.2.qualifier"/> </features> <configurations> - <property name="eclipse.buildId" value="${unqualifiedVersion}.${buildQualifier}" /> - <property name="eclipse.product" value="adtproduct" /> + <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" /> + <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="0" /> + <property name="eclipse.product" value="com.android.ide.eclipse.adt.package.adtproduct" /> <property name="org.eclipse.update.reconcile" value="false" /> <property name="osgi.bundles.defaultStartLevel" value="4" /> <property name="osgi.splashPath" value="platform\:/base/plugins/com.android.ide.eclipse.adt.package" /> diff --git a/eclipse/artifacts/bundles/monitor.product b/eclipse/artifacts/bundles/monitor.product index 01df0d7..bee295e 100644 --- a/eclipse/artifacts/bundles/monitor.product +++ b/eclipse/artifacts/bundles/monitor.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="monitor" uid="monitorproduct" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="23.0.1.qualifier" useFeatures="true" includeLaunchers="true"> +<product name="monitor" uid="monitorproduct" id="com.android.ide.eclipse.monitor.product" application="com.android.ide.eclipse.monitor.Application" version="23.0.2.qualifier" useFeatures="true" includeLaunchers="true"> <configIni use="default"> diff --git a/eclipse/artifacts/bundles/pom.xml b/eclipse/artifacts/bundles/pom.xml index 8639bcb..2673bd1 100644 --- a/eclipse/artifacts/bundles/pom.xml +++ b/eclipse/artifacts/bundles/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>bundles</artifactId> <packaging>eclipse-repository</packaging> <name>bundles</name> diff --git a/eclipse/artifacts/p2repo/category.xml b/eclipse/artifacts/p2repo/category.xml index 0ef2507..78d1edf 100644 --- a/eclipse/artifacts/p2repo/category.xml +++ b/eclipse/artifacts/p2repo/category.xml @@ -3,22 +3,22 @@ <description url="https://dl-ssl.google.com/android/eclipse/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.ddms_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_23.0.1.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_23.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_23.0.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_23.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.adt_23.0.1.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_23.0.2.qualifier.jar" id="com.android.ide.eclipse.adt.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk.feature" version="23.0.2.qualifier"> <category name="developer"/> </feature> <category-def name="developer" label="Developer Tools"> diff --git a/eclipse/artifacts/p2repo/pom.xml b/eclipse/artifacts/p2repo/pom.xml index a96a56d..249499e 100644 --- a/eclipse/artifacts/p2repo/pom.xml +++ b/eclipse/artifacts/p2repo/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>p2repo</artifactId> <packaging>eclipse-repository</packaging> <name>p2repo</name> diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml index d3320fa..0d581fa 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.adt.package.feature" label="ADT Package" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.adt.package"> @@ -11,26 +11,27 @@ </description> <copyright> - Copyright (C) 2007-2012 The Android Open Source Project + Copyright (C) 2007-2014 The Android Open Source Project </copyright> <license url="http://www.eclipse.org/org/documents/epl-v10.php"> Note: kxml2-2.3.0.jar is under the BSD license rather ... </license> - <url> - <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/> - </url> - <requires> + <import plugin="com.android.ide.eclipse.adt" version="22.3.0" match="greaterOrEqual"/> + <import plugin="com.android.ide.eclipse.base" version="22.3.0" match="greaterOrEqual"/> + <import plugin="com.android.ide.eclipse.ddms" version="22.3.0" match="greaterOrEqual"/> + <import plugin="com.android.ide.eclipse.gldebugger" version="22.3.0" match="greaterOrEqual"/> + <import plugin="com.android.ide.eclipse.hierarchyviewer" version="22.3.0" match="greaterOrEqual"/> + <import plugin="com.android.ide.eclipse.traceview" version="22.3.0" match="greaterOrEqual"/> + <import plugin="overlay.com.android.ide.eclipse.adt.overlay"/> <import feature="org.eclipse.equinox.p2.user.ui"/> - <import feature="org.eclipse.help"/> - <import feature="org.eclipse.jdt"/> - <import feature="org.eclipse.cdt"/> <import feature="org.eclipse.platform"/> <import feature="org.eclipse.rcp"/> <import feature="org.eclipse.egit"/> <import feature="org.eclipse.egit.import"/> + <import feature="org.eclipse.cdt"/> </requires> <plugin diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml index 296a718..885a547 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.adt.package/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt.package.feature</artifactId> <packaging>eclipse-feature</packaging> <name>adt.package</name> diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index 599045c..7bdc7a5 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.adt.feature" label="Android Development Tools" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.adt"> @@ -158,10 +158,4 @@ This Agreement is governed by the laws of the State of New York and the intellec version="0.0.0" unpack="false"/> - <plugin - id="com.android.ide.eclipse.adt.package" - download-size="0" - install-size="0" - version="0.0.0"/> - </feature> diff --git a/eclipse/features/com.android.ide.eclipse.adt/pom.xml b/eclipse/features/com.android.ide.eclipse.adt/pom.xml index f30d97b..c326c7a 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt.feature</artifactId> <packaging>eclipse-feature</packaging> <name>adt</name> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml index 6d4f9e0..a9b7913 100644 --- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.ddms.feature" label="Android DDMS" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.ddms"> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml index 3b406de..065a3b6 100644 --- a/eclipse/features/com.android.ide.eclipse.ddms/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.ddms/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ddms.feature</artifactId> <packaging>eclipse-feature</packaging> <name>ddms</name> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml index 13b40a4..3a1028f 100644 --- a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.gldebugger.feature" label="Tracer for OpenGL ES" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml index fe8bfdf..65554d9 100644 --- a/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.gldebugger/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.gldebugger.feature</artifactId> <packaging>eclipse-feature</packaging> <name>gldebugger</name> diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml index da25a7b..a5e7997 100644 --- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.hierarchyviewer.feature" label="Android Hierarchy Viewer" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.hierarchyviewer"> diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml index 0f0a4a5..b39f791 100644 --- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.hierarchyviewer.feature</artifactId> <packaging>eclipse-feature</packaging> <name>hierarchyviewer</name> diff --git a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml index 977b446..568230e 100644 --- a/eclipse/features/com.android.ide.eclipse.monitor/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.monitor/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.monitor.feature" label="Android Monitor" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.monitor"> diff --git a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml index 9d6bd60..ecffc6f 100644 --- a/eclipse/features/com.android.ide.eclipse.monitor/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.monitor/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.monitor.feature</artifactId> <packaging>eclipse-feature</packaging> <name>monitor</name> diff --git a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml index f96e90c..327cf6e 100644 --- a/eclipse/features/com.android.ide.eclipse.ndk/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ndk/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.ndk.feature" label="Android Native Development Tools" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml index 3e1d12c..2f01d5c 100644 --- a/eclipse/features/com.android.ide.eclipse.ndk/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.ndk/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ndk.feature</artifactId> <packaging>eclipse-feature</packaging> <name>ndk</name> diff --git a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml index 48417f8..6339999 100644 --- a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.pdt" label="Android Platform Development Tools" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.tests/feature.xml b/eclipse/features/com.android.ide.eclipse.tests/feature.xml index 050c2a7..42f4aff 100644 --- a/eclipse/features/com.android.ide.eclipse.tests/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.tests/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.tests" label="ADT Tests" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project"> <copyright> diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml index f3a87ff..330b9a5 100644 --- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.traceview.feature" label="Android Traceview" - version="23.0.1.qualifier" + version="23.0.2.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.traceview"> diff --git a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml index dc5a2d1..7e2e444 100644 --- a/eclipse/features/com.android.ide.eclipse.traceview/pom.xml +++ b/eclipse/features/com.android.ide.eclipse.traceview/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.traceview.feature</artifactId> <packaging>eclipse-feature</packaging> <name>traceview</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF index 9290e8a..e492b1d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT XML Overlay Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml index afd1910..29bdf7c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>overlay.com.android.ide.eclipse.adt.overlay</artifactId> <packaging>eclipse-plugin</packaging> <name>adt.overlay</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt.package/.classpath deleted file mode 100644 index 522e779..0000000 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/.classpath +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> - diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/.project b/eclipse/plugins/com.android.ide.eclipse.adt.package/.project index 50d3fd1..eedf4c6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/.project +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/.project @@ -6,11 +6,6 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.eclipse.pde.ManifestBuilder</name> <arguments> </arguments> @@ -23,6 +18,5 @@ </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF index 53e4501..c5fd42c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF @@ -2,17 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT Package Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Vendor: The Android Open Source Project Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-BundleShape: dir Require-Bundle: org.eclipse.platform, - org.eclipse.equinox.app, - org.eclipse.ui.intro, - org.eclipse.ui.workbench, - org.eclipse.swt, - org.eclipse.core.runtime, - org.eclipse.core.commands, - org.eclipse.ui.forms, - org.eclipse.jface, - com.android.ide.eclipse.adt + org.eclipse.equinox.app diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/about.mappings b/eclipse/plugins/com.android.ide.eclipse.adt.package/about.mappings deleted file mode 100644 index c77017a..0000000 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/about.mappings +++ /dev/null @@ -1 +0,0 @@ -0=buildId
\ No newline at end of file diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties index eb7a6e6..0688953 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/build.properties @@ -5,7 +5,6 @@ bin.includes = META-INF/,\ .,\ plugin_customization.ini,\ adt-about.png,\ - about.mappings,\ splash.bmp,\ icons/,\ about.ini,\ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml index ed4f265..7974659 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/plugin.xml @@ -3,24 +3,24 @@ <plugin> <extension id="adtproduct" + name="ADT Bundle" point="org.eclipse.core.runtime.products"> <product application="org.eclipse.ui.ide.workbench" - description="Android Developer Tools" - name="ADT"> + name="Eclipse"> <property name="preferenceCustomization" value="plugin_customization.ini" /> <property name="appName" - value="ADT" /> + value="Eclipse" /> <property name="aboutImage" value="adt-about.png"> </property> <property name="aboutText" - value="Android Developer Tools

Build: {0}

This product includes Eclipse Platform, JDT, CDT, EMF, GEF and WTP,
all of which are Copyright (c) Eclipse contributors and others.
Visit http://eclipse.org/

Android Developer Tools are Copyright (c) The Android Open Source Project.
Visit http://developer.android.com"> + value="Android Developer Tools

This product includes Eclipse Platform, JDT, CDT, EMF, GEF and WTP, all of which are
Copyright (c) Eclipse contributors and others.
Visit http://eclipse.org/

Android Developer Tools are Copyright (c) The Android Open Source Project.
Visit http://developer.android.com"> </property> <property name="startupProgressRect" @@ -36,28 +36,36 @@ value="icons/adt16.png,icons/adt32.png,icons/adt48.png"> </property> <property + name="introBrandingImage" + value="product:intro-eclipse.png"> + </property> + <property + name="introTitle" + value="Welcome to the Eclipse IDE for Android Developers"> + </property> + <property + name="introBrandingImageText" + value="Eclipse Project"> + </property> + <property + name="applicationXMI" + value="org.eclipse.platform/LegacyIDE.e4xmi"> + </property> + <property name="cssTheme" value="org.eclipse.e4.ui.css.theme.e4_default"> </property> <property name="applicationCSSResources" - value="platform:/plugin/org.eclipse.platform/images/"> + value="platform:/plugin/org.eclipse.ui.themes/images/"> </property> </product> </extension> <extension point="org.eclipse.ui.intro"> - <intro - class="com.android.ide.eclipse.adt.internal.AdtIntro" - icon="icons/adt16.png" - id="com.android.ide.eclipse.adt.intro" - label="Android IDE"/> - </extension> - <extension - point="org.eclipse.ui.intro"> <introProductBinding - introId="com.android.ide.eclipse.adt.intro" - productId="adtproduct"> + introId="org.eclipse.ui.intro.universal" + productId="com.android.ide.eclipse.adt.package.product"> </introProductBinding> </extension> </plugin> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml index 1f2a8ee..ab9f665 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt.package</artifactId> <packaging>eclipse-plugin</packaging> <name>adt.package</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/src/com/android/ide/eclipse/adt/internal/AdtIntro.java b/eclipse/plugins/com.android.ide.eclipse.adt.package/src/com/android/ide/eclipse/adt/internal/AdtIntro.java deleted file mode 100644 index 27e758c..0000000 --- a/eclipse/plugins/com.android.ide.eclipse.adt.package/src/com/android/ide/eclipse/adt/internal/AdtIntro.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.ide.eclipse.adt.internal; - -import com.android.ide.eclipse.adt.AdtPlugin; -import com.android.ide.eclipse.adt.internal.wizards.actions.NewProjectAction; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.browser.IWebBrowser; -import org.eclipse.ui.browser.IWorkbenchBrowserSupport; -import org.eclipse.ui.forms.events.HyperlinkAdapter; -import org.eclipse.ui.forms.events.HyperlinkEvent; -import org.eclipse.ui.forms.events.IHyperlinkListener; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.ui.forms.widgets.ScrolledForm; -import org.eclipse.ui.forms.widgets.Section; -import org.eclipse.ui.intro.IIntroPart; -import org.eclipse.ui.part.IntroPart; - -import java.net.URL; - -public class AdtIntro extends IntroPart implements IIntroPart { - private static final int TEXT_WIDTH = 600; - - private FormToolkit mToolkit; - private ScrolledForm mForm; - - @Override - public void standbyStateChanged(boolean standby) { - } - - @Override - public void createPartControl(Composite parent) { - mToolkit = new FormToolkit(parent.getDisplay()); - mForm = mToolkit.createScrolledForm(parent); - - mForm.setText("Welcome!"); - mToolkit.decorateFormHeading(mForm.getForm()); - mForm.getToolBarManager().update(true); - - //TableWrapLayout layout = new TableWrapLayout(); - //layout.numColumns = 2; - GridLayout layout = new GridLayout(1, false); - mForm.getBody().setLayout(layout); - - createText(mForm.getBody(), - "The Android Developer Tools provide a first-class development environment for " + - "building Android apps. This integrated development environment is set up with " + - "the latest version of the Android platform and system image so you can " + - "immediately begin building apps and running them on the Android emulator." - ); - - Button newProject = mToolkit.createButton(mForm.getBody(), - "New Android Application...", - SWT.PUSH); - newProject.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - NewProjectAction npwAction = new NewProjectAction(); - npwAction.run(null /*action*/); - PlatformUI.getWorkbench().getIntroManager().closeIntro(AdtIntro.this); - } - }); - - Section section = mToolkit.createSection(mForm.getBody(), - Section.SHORT_TITLE_BAR | Section.CLIENT_INDENT); - section.setText("Tutorials"); - - Composite c = mToolkit.createComposite(section); - c.setLayout(new GridLayout(2, false)); - - createHyperlink(c, "Build Your First App", - "http://developer.android.com/training/basics/firstapp/index.html"); - createText(c, "If you're new to Android, follow this class to learn the fundamental " + - "Android APIs for creating a user interface that responds to input."); - - createHyperlink(c, "Design Your App", "http://developer.android.com/design/index.html"); - createText(c, - "Before you begin developing your app, be sure you understand the design patterns " - + "that Android users expect from your app."); - - createHyperlink(c, "Test Your App", - "http://developer.android.com/tools/testing/testing_android.html"); - createText(c, "The Android Framework provides tools that help you test every aspect of " - + "your app to be sure it behaves as expected under various conditions."); - - section.setClient(c); - - mForm.reflow(true); - } - - private void createText(Composite body, String text) { - Label l = mToolkit.createLabel(body, text, SWT.WRAP); - GridData gd = new GridData(); - gd.widthHint = TEXT_WIDTH; - l.setLayoutData(gd); - } - - private void createHyperlink(Composite c, String text, String url) { - Hyperlink link = mToolkit.createHyperlink(c, text, SWT.WRAP); - link.setHref(url); - link.addHyperlinkListener(sHyperLinkListener); - GridData gd = new GridData(); - gd.verticalAlignment = SWT.TOP; - link.setLayoutData(gd); - } - - private static final IHyperlinkListener sHyperLinkListener = new HyperlinkAdapter() { - @Override - public void linkActivated(HyperlinkEvent e) { - if (!(e.getHref() instanceof String)) { - return; - } - - String url = (String) e.getHref(); - if (url.isEmpty()) { - return; - } - - IWorkbenchBrowserSupport support = PlatformUI.getWorkbench().getBrowserSupport(); - IWebBrowser browser; - try { - browser = support.getExternalBrowser(); - browser.openURL(new URL(url)); - } catch (Exception ex) { - AdtPlugin.log(ex, "Error launching browser for URL: %1$s", url); - } - } - }; - - @Override - public void setFocus() { - mForm.setFocus(); - } - - @Override - public void dispose() { - if (mToolkit != null) { - mToolkit.dispose(); - mToolkit = null; - } - - super.dispose(); - } -} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF index 132df13..77eb219 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Android Development Toolkit Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-ClassPath: ., libs/sdkuilib.jar, libs/ninepatch.jar, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml index 2fdfcc4..2ca92f7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.adt</artifactId> <packaging>eclipse-plugin</packaging> <name>adt</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java index 2eeec5b..f0af8bb 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java @@ -342,9 +342,15 @@ public class AddSupportJarAction implements IObjectActionDelegate { assert path.equals(libraryPath) : path; } - // Create workspace copy of the project and add library dependency - IProject libraryProject = createLibraryProject(libraryPath, project, - APP_COMPAT_LIB_NAME, waitForFinish); + // Check to see if there's already a version of the library available + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IWorkspaceRoot root = workspace.getRoot(); + IProject libraryProject = root.getProject(APP_COMPAT_LIB_NAME); + if (!libraryProject.exists()) { + // Create workspace copy of the project and add library dependency + libraryProject = createLibraryProject(libraryPath, project, + APP_COMPAT_LIB_NAME, waitForFinish); + } if (libraryProject != null) { return addLibraryDependency(libraryProject, project, waitForFinish); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java index ebaacfe..60dd0f2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/NewProjectPage.java @@ -21,6 +21,7 @@ import static com.android.ide.eclipse.adt.AdtUtils.extractClassName; import static com.android.ide.eclipse.adt.internal.wizards.templates.NewTemplatePage.WIZARD_PAGE_WIDTH; import com.android.annotations.Nullable; +import com.android.ide.common.sdk.SdkVersionInfo; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.editors.IconFactory; @@ -550,7 +551,9 @@ public class NewProjectPage extends WizardPage try { minSdk = Integer.parseInt(mValues.minSdk); } catch (NumberFormatException nufe) { - minSdk = 1; + // If not a number, then the string is a codename, so treat it + // as a preview version. + minSdk = SdkVersionInfo.HIGHEST_KNOWN_API + 1; } } mValues.iconState.minSdk = minSdk.intValue(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java index b393b82..8e11841 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java @@ -168,6 +168,8 @@ class TemplateHandler { static final String TAG_THUMBS = "thumbs"; //$NON-NLS-1$ static final String TAG_DEPENDENCY = "dependency"; //$NON-NLS-1$ static final String TAG_ICONS = "icons"; //$NON-NLS-1$ + static final String TAG_FORMFACTOR = "formfactor"; //$NON-NLS-1$ + static final String TAG_CATEGORY = "category"; //$NON-NLS-1$ static final String ATTR_FORMAT = "format"; //$NON-NLS-1$ static final String ATTR_REVISION = "revision"; //$NON-NLS-1$ static final String ATTR_VALUE = "value"; //$NON-NLS-1$ @@ -191,9 +193,16 @@ class TemplateHandler { static final String ATTR_CLIPART_NAME = "clipartName";//$NON-NLS-1$ static final String ATTR_TEXT = "text"; //$NON-NLS-1$ static final String ATTR_SRC_DIR = "srcDir"; //$NON-NLS-1$ + static final String ATTR_SRC_OUT = "srcOut"; //$NON-NLS-1$ static final String ATTR_RES_DIR = "resDir"; //$NON-NLS-1$ + static final String ATTR_RES_OUT = "resOut"; //$NON-NLS-1$ static final String ATTR_MANIFEST_DIR = "manifestDir";//$NON-NLS-1$ + static final String ATTR_MANIFEST_OUT = "manifestOut";//$NON-NLS-1$ + static final String ATTR_PROJECT_DIR = "projectDir"; //$NON-NLS-1$ + static final String ATTR_PROJECT_OUT = "projectOut"; //$NON-NLS-1$ static final String ATTR_MAVEN_URL = "mavenUrl"; //$NON-NLS-1$ + static final String ATTR_DEBUG_KEYSTORE_SHA1 = + "debugKeystoreSha1"; //$NON-NLS-1$ static final String CATEGORY_ACTIVITIES = "activities";//$NON-NLS-1$ static final String CATEGORY_PROJECTS = "projects"; //$NON-NLS-1$ @@ -363,6 +372,12 @@ class TemplateHandler { IPath manifestDir = project.getProjectRelativePath(); parameters.put(ATTR_MANIFEST_DIR, manifestDir.toString()); + parameters.put(ATTR_MANIFEST_OUT, manifestDir.toString()); + + parameters.put(ATTR_PROJECT_DIR, manifestDir.toString()); + parameters.put(ATTR_PROJECT_OUT, manifestDir.toString()); + + parameters.put(ATTR_DEBUG_KEYSTORE_SHA1, ""); } @Nullable @@ -474,8 +489,7 @@ class TemplateHandler { } else if (TAG_GLOBAL.equals(name)) { String id = attributes.getValue(ATTR_ID); if (!paramMap.containsKey(id)) { - String value = attributes.getValue(ATTR_VALUE); - paramMap.put(id, value); + paramMap.put(id, TypedVariable.parseGlobal(attributes)); } } else if (TAG_GLOBALS.equals(name)) { // Handle evaluation of variables @@ -503,9 +517,10 @@ class TemplateHandler { } } } - } else if (!name.equals("template") && !name.equals("category") - && !name.equals("option") && !name.equals(TAG_THUMBS) && - !name.equals(TAG_THUMB) && !name.equals(TAG_ICONS)) { + } else if (!name.equals("template") && !name.equals(TAG_CATEGORY) && + !name.equals(TAG_FORMFACTOR) && !name.equals("option") && + !name.equals(TAG_THUMBS) && !name.equals(TAG_THUMB) && + !name.equals(TAG_ICONS)) { System.err.println("WARNING: Unknown template directive " + name); } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateManager.java index de625e0..30dd09e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateManager.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateManager.java @@ -28,6 +28,7 @@ import com.android.ide.eclipse.adt.internal.editors.layout.gle2.DomUtilities; import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs; import com.google.common.base.Charsets; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.common.io.Files; import org.w3c.dom.Document; @@ -39,9 +40,13 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Set; /** Handles locating templates and providing template metadata */ public class TemplateManager { + private static final Set<String> EXCLUDED_CATEGORIES = Sets.newHashSet("Folder", "Google"); + private static final Set<String> EXCLUDED_FORMFACTORS = Sets.newHashSet("Wear", "TV"); + TemplateManager() { } @@ -239,6 +244,10 @@ public class TemplateManager { Document doc = DomUtilities.parseDocument(xml, true); if (doc != null && doc.getDocumentElement() != null) { TemplateMetadata metadata = new TemplateMetadata(doc); + if (EXCLUDED_CATEGORIES.contains(metadata.getCategory()) || + EXCLUDED_FORMFACTORS.contains(metadata.getFormFactor())) { + return null; + } mTemplateMap.put(templateDir, metadata); return metadata; } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java index f5e35ef..4ce7d74 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateMetadata.java @@ -30,11 +30,14 @@ import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHan import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.ATTR_TEXT; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.ATTR_TRIM; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.ATTR_TYPE; +import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.ATTR_VALUE; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.CURRENT_FORMAT; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.TAG_DEPENDENCY; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.TAG_ICONS; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.TAG_PARAMETER; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.TAG_THUMB; +import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.TAG_FORMFACTOR; +import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateHandler.TAG_CATEGORY; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -76,6 +79,8 @@ class TemplateMetadata { private Integer mRevision; private boolean mNoIcons; private CreateAssetSetWizardState mIconState; + private String mFormFactor; + private String mCategory; TemplateMetadata(@NonNull Document document) { mDocument = document; @@ -180,6 +185,37 @@ class TemplateMetadata { return mRevision.intValue(); } + + public String getFormFactor() { + if (mFormFactor == null) { + mFormFactor = "Mobile"; + + NodeList formfactorDeclarations = mDocument.getElementsByTagName(TAG_FORMFACTOR); + if (formfactorDeclarations.getLength() > 0) { + Element element = (Element) formfactorDeclarations.item(0); + String formFactor = element.getAttribute(ATTR_VALUE); + if (formFactor != null && !formFactor.isEmpty()) { + mFormFactor = formFactor; + } + } + } + return mFormFactor; + } + + public String getCategory() { + if (mCategory == null) { + mCategory = ""; + NodeList categories = mDocument.getElementsByTagName(TAG_CATEGORY); + if (categories.getLength() > 0) { + Element element = (Element) categories.item(0); + String category = element.getAttribute(ATTR_VALUE); + if (category != null && !category.isEmpty()) { + mCategory = category; + } + } + } + return mCategory; + } /** * Returns a suitable icon wizard state instance if this wizard requests diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TypedVariable.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TypedVariable.java new file mode 100644 index 0000000..468a10c --- /dev/null +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TypedVariable.java @@ -0,0 +1,50 @@ +package com.android.ide.eclipse.adt.internal.wizards.templates; + +import java.util.Locale; + +import org.xml.sax.Attributes; + +public class TypedVariable { + public enum Type { + STRING, + BOOLEAN, + INTEGER; + + public static Type get(String name) { + if (name == null) { + return STRING; + } + try { + return valueOf(name.toUpperCase(Locale.US)); + } catch (IllegalArgumentException e) { + System.err.println("Unexpected global type '" + name + "'"); + System.err.println("Expected one of :"); + for (Type s : Type.values()) { + System.err.println(" " + s.name().toLowerCase(Locale.US)); + } + } + + return STRING; + } + } + + public static Object parseGlobal(Attributes attributes) { + String value = attributes.getValue(TemplateHandler.ATTR_VALUE); + Type type = Type.get(attributes.getValue(TemplateHandler.ATTR_TYPE)); + + switch (type) { + case STRING: + return value; + case BOOLEAN: + return Boolean.parseBoolean(value); + case INTEGER: + try { + return Integer.parseInt(value); + } catch (NumberFormatException e) { + return value; + } + } + + return value; + } +} diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index 2985044..1f1b2f6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common Android Utilities Bundle-SymbolicName: com.android.ide.eclipse.base;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy diff --git a/eclipse/plugins/com.android.ide.eclipse.base/pom.xml b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml index b278ef1..f8c8ff0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.base/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.base</artifactId> <packaging>eclipse-plugin</packaging> <name>base</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF index 2db1298..743a489 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Activator: com.android.ide.eclipse.ddms.DdmsPlugin Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml index 4278f67..debf262 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ddms</artifactId> <packaging>eclipse-plugin</packaging> <name>ddms</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF index ca49bf5..6ce8d6b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: gldebugger-tests Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit4;bundle-version="4.5.0";resolution:=optional, com.android.ide.eclipse.gldebugger, diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml index e37d298..4161d45 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.gldebugger.tests</artifactId> <packaging>eclipse-test-plugin</packaging> <name>gldebugger.tests</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF index 6818620..c2eb32b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tracer for OpenGL ES Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Activator: com.android.ide.eclipse.gltrace.GlTracePlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml index d2146ee..df7d432 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.gldebugger</artifactId> <packaging>eclipse-plugin</packaging> <name>gldebugger</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF index 6119d1c..2731b60 100644 --- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Hierarchy Viewer Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Activator: com.android.ide.eclipse.hierarchyviewer.HierarchyViewerPlugin Bundle-Vendor: The Android Open Source Project Bundle-Localization: plugin diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml index 2e2ddbf..1713098 100644 --- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.hierarchyviewer</artifactId> <packaging>eclipse-plugin</packaging> <name>hierarchyviewer</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF index f03ccc5..6d492f1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.android.ide.eclipse.monitor;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Activator: com.android.ide.eclipse.monitor.MonitorPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties index 32bf1dc..48a785f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/plugin.properties @@ -4,5 +4,5 @@ Bundle-Vendor = The Android Open Source Project Bundle-Name = Monitor aboutText = \n\ Android Device Monitor\n\ -Version: 23.0.1 \n\ +Version: 23.0.2 \n\ Copyright 2012, The Android Open Source Project \n\ diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml index d981f2a..e076411 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.monitor</artifactId> <packaging>eclipse-plugin</packaging> <name>monitor</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF index 360f9a4..c499691 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT CDT Integration Bundle-SymbolicName: com.android.ide.eclipse.ndk;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Activator: com.android.ide.eclipse.ndk.internal.Activator Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml index a183de5..a0de7c8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.ndk/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.ndk</artifactId> <packaging>eclipse-plugin</packaging> <name>ndk</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF index f0b9e16..077dd2c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pdt Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF index 0244479..462c9a1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Android Plugin Tests Bundle-SymbolicName: com.android.ide.eclipse.tests -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Vendor: The Android Open Source Project Fragment-Host: com.android.ide.eclipse.adt;bundle-version="21.0.0" Require-Bundle: org.junit diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml index 0c73b71..18988b8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.tests/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.tests</artifactId> <packaging>eclipse-test-plugin</packaging> <name>tests</name> diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF index b16f367..02847a9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Traceview Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true -Bundle-Version: 23.0.1.qualifier +Bundle-Version: 23.0.2.qualifier Bundle-Activator: com.android.ide.eclipse.traceview.TraceviewPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml index 40d3546..e61501a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml +++ b/eclipse/plugins/com.android.ide.eclipse.traceview/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <version>23.0.1-SNAPSHOT</version> + <version>23.0.2-SNAPSHOT</version> <artifactId>com.android.ide.eclipse.traceview</artifactId> <packaging>eclipse-plugin</packaging> <name>traceview</name> diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml index 3b51efc..3105e85 100644 --- a/eclipse/sites/external/site.xml +++ b/eclipse/sites/external/site.xml @@ -3,22 +3,22 @@ <description url="https://dl-ssl.google.com/android/eclipse/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.adt_23.0.1.qualifier.jar" id="com.android.ide.eclipse.adt" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_23.0.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ddms" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_23.0.1.qualifier.jar" id="com.android.ide.eclipse.traceview" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_23.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_23.0.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_23.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ndk" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="23.0.2.qualifier"> <category name="ndk"/> </feature> <category-def name="developer" label="Developer Tools"> diff --git a/eclipse/sites/internal/site.xml b/eclipse/sites/internal/site.xml index f0caaa8..bd98b15 100644 --- a/eclipse/sites/internal/site.xml +++ b/eclipse/sites/internal/site.xml @@ -3,32 +3,32 @@ <description url="https://android.corp.google.com/adt/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.adt_23.0.1.qualifier.jar" id="com.android.ide.eclipse.adt" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_23.0.2.qualifier.jar" id="com.android.ide.eclipse.adt" version="23.0.2.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ddms" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ddms" version="23.0.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.1.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_23.0.2.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="23.0.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.tests_23.0.1.qualifier.jar" id="com.android.ide.eclipse.tests" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.tests_23.0.2.qualifier.jar" id="com.android.ide.eclipse.tests" version="23.0.2.qualifier"> <category name="test"/> </feature> - <feature url="features/com.android.ide.eclipse.pdt_23.0.1.qualifier.jar" id="com.android.ide.eclipse.pdt" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.pdt_23.0.2.qualifier.jar" id="com.android.ide.eclipse.pdt" version="23.0.2.qualifier"> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_23.0.1.qualifier.jar" id="com.android.ide.eclipse.traceview" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_23.0.2.qualifier.jar" id="com.android.ide.eclipse.traceview" version="23.0.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_23.0.1.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_23.0.2.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="23.0.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.ndk_23.0.1.qualifier.jar" id="com.android.ide.eclipse.ndk" version="23.0.1.qualifier"> + <feature url="features/com.android.ide.eclipse.ndk_23.0.2.qualifier.jar" id="com.android.ide.eclipse.ndk" version="23.0.2.qualifier"> <category name="developer"/> <category name="platform"/> </feature> |