diff options
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.adt')
5 files changed, 8 insertions, 192 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath index d8d5c9b..f874a9e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath @@ -1,32 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="Makefile|resources/" kind="src" path="src"/> - <classpathentry kind="lib" path="libs/commons-codec-1.4.jar"/> - <classpathentry kind="lib" path="libs/commons-logging-1.1.1.jar"/> - <classpathentry kind="lib" path="libs/httpclient-4.1.1.jar"/> - <classpathentry kind="lib" path="libs/httpcore-4.1.jar"/> - <classpathentry kind="lib" path="libs/httpmime-4.1.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="lib" path="libs/androidprefs.jar" sourcepath="/AndroidPrefs"/> - <classpathentry kind="lib" path="libs/commons-compress-1.0.jar"/> <classpathentry kind="lib" path="libs/kxml2-2.3.0.jar"/> <classpathentry kind="lib" path="libs/layoutlib_api.jar"/> <classpathentry kind="lib" path="libs/ide_common.jar" sourcepath="/ide_common"/> <classpathentry kind="lib" path="libs/ninepatch.jar" sourcepath="/ninepatch"/> - <classpathentry kind="lib" path="libs/sdklib.jar" sourcepath="/SdkLib"/> - <classpathentry kind="lib" path="libs/sdkstats.jar" sourcepath="/SdkStatsService"/> <classpathentry kind="lib" path="libs/sdkuilib.jar" sourcepath="/SdkUiLib"/> - <classpathentry kind="lib" path="libs/common.jar" sourcepath="/common"/> <classpathentry kind="lib" path="libs/rule_api.jar" sourcepath="/rule_api"/> <classpathentry kind="lib" path="libs/lint_api.jar" sourcepath="/lint-api"/> <classpathentry kind="lib" path="libs/lint_checks.jar" sourcepath="/lint-checks"/> <classpathentry kind="lib" path="libs/assetstudio.jar" sourcepath="/assetstudio"/> <classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/> <classpathentry combineaccessrules="false" kind="src" path="/ddmuilib"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> <classpathentry kind="output" path="bin"/> </classpath> 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 e0689b0..0b40004 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 @@ -4,33 +4,22 @@ Bundle-Name: Android Development Toolkit Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true Bundle-Version: 19.0.0.qualifier Bundle-ClassPath: ., - libs/androidprefs.jar, - libs/sdklib.jar, libs/sdkuilib.jar, libs/ninepatch.jar, - libs/sdkstats.jar, - libs/commons-compress-1.0.jar, libs/kxml2-2.3.0.jar, libs/layoutlib_api.jar, libs/ide_common.jar, - libs/common.jar, libs/rule_api.jar, libs/assetstudio.jar, libs/lint_api.jar, libs/lint_checks.jar, libs/lombok-ast-0.2.jar, - libs/httpclient-4.1.1.jar, - libs/httpcore-4.1.jar, - libs/httpmime-4.1.1.jar, - libs/httpclient-4.1.1.jar, libs/asm-4.0.jar, - libs/asm-tree-4.0.jar, - libs/guava-10.0.1.jar, - libs/commons-logging-1.1.1.jar, - libs/commons-codec-1.4.jar + libs/asm-tree-4.0.jar Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin Bundle-Vendor: The Android Open Source Project -Require-Bundle: com.android.ide.eclipse.ddms, +Require-Bundle: com.android.ide.eclipse.base, + com.android.ide.eclipse.ddms, org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.debug.core, @@ -60,9 +49,7 @@ Require-Bundle: com.android.ide.eclipse.ddms, org.eclipse.ltk.ui.refactoring, org.eclipse.core.expressions Eclipse-LazyStart: true -Export-Package: com.android, - com.android.annotations;x-friends:="com.android.ide.eclipse.tests", - com.android.ide.common.layout;x-friends:="com.android.ide.eclipse.tests", +Export-Package: com.android.ide.common.layout;x-friends:="com.android.ide.eclipse.tests", com.android.ide.common.log;x-friends:="com.android.ide.eclipse.tests", com.android.ide.common.rendering;x-friends:="com.android.ide.eclipse.tests", com.android.ide.common.rendering.api;x-friends:="com.android.ide.eclipse.tests", @@ -122,21 +109,8 @@ Export-Package: com.android, com.android.ide.eclipse.adt.internal.wizards.newproject;x-friends:="com.android.ide.eclipse.tests", com.android.ide.eclipse.adt.internal.wizards.newxmlfile;x-friends:="com.android.ide.eclipse.tests", com.android.ide.eclipse.adt.io;x-friends:="com.android.ide.eclipse.tests", - com.android.io;x-friends:="com.android.ide.eclipse.tests", com.android.layoutlib.api;x-friends:="com.android.ide.eclipse.tests", com.android.ninepatch;x-friends:="com.android.ide.eclipse.tests", - com.android.prefs;x-friends:="com.android.ide.eclipse.tests", - com.android.resources;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.build;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.avd;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.build;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.project;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.internal.repository;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.repository;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.util;x-friends:="com.android.ide.eclipse.tests", - com.android.sdklib.xml;x-friends:="com.android.ide.eclipse.tests", - com.android.sdkstats;x-friends:="com.android.ide.eclipse.tests", com.android.sdkuilib.internal.repository;x-friends:="com.android.ide.eclipse.tests", com.android.sdkuilib.internal.repository.icons;x-friends:="com.android.ide.eclipse.tests", com.android.sdkuilib.internal.tasks;x-friends:="com.android.ide.eclipse.tests", @@ -146,18 +120,6 @@ Export-Package: com.android, com.android.tools.lint.checks;x-friends:="com.android.ide.eclipse.tests", com.android.tools.lint.client.api;x-friends:="com.android.ide.eclipse.tests", com.android.tools.lint.detector.api;x-friends:="com.android.ide.eclipse.tests", - com.android.util;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.ar;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.cpio;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.jar;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.tar;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.archivers.zip;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.changes;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.compressors;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.compressors.bzip2;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.compressors.gzip;x-friends:="com.android.ide.eclipse.tests", - org.apache.commons.compress.utils;x-friends:="com.android.ide.eclipse.tests", org.kxml2.io;x-friends:="com.android.ide.eclipse.tests", org.kxml2.kdom;x-friends:="com.android.ide.eclipse.tests", org.kxml2.wap;x-friends:="com.android.ide.eclipse.tests", diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties index a82e779..9eb0d29 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties @@ -7,13 +7,7 @@ bin.includes = plugin.xml,\ libs/,\ about.properties,\ NOTICE,\ - about.html,\ - libs/common.jar,\ - libs/httpclient-4.1.1.jar,\ - libs/httpcore-4.1.jar,\ - libs/httpmime-4.1.1.jar,\ - libs/commons-logging-1.1.1.jar,\ - libs/commons-codec-1.4.jar + about.html source.. = src/ output.. = bin/ bin.excludes = libs/.gitignore diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml index f7fd525..6d60936 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml +++ b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml @@ -394,12 +394,6 @@ name="Launch" /> <page category="com.android.ide.eclipse.preferences.main" - class="com.android.ide.eclipse.adt.internal.preferences.UsagePreferencePage" - id="com.android.ide.eclipse.common.preferences.UsagePreferencePage" - name="Usage Stats"> - </page> - <page - category="com.android.ide.eclipse.preferences.main" class="com.android.ide.eclipse.adt.internal.preferences.EditorsPage" id="com.android.ide.eclipse.adt.preferences.EditorsPage" name="Editors"> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/UsagePreferencePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/UsagePreferencePage.java deleted file mode 100644 index 470b4c0..0000000 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/UsagePreferencePage.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Eclipse Public License, Version 1.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.eclipse.org/org/documents/epl-v10.php - * - * 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.preferences; - -import com.android.sdkstats.DdmsPreferenceStore; -import com.android.sdkstats.SdkStatsPermissionDialog; - -import org.eclipse.jface.preference.BooleanFieldEditor; -import org.eclipse.jface.preference.PreferencePage; -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.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Link; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPreferencePage; - -public class UsagePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - private static final int WRAP_WIDTH_PX = 200; - - private BooleanFieldEditor mOptInCheckBox; - private DdmsPreferenceStore mStore = new DdmsPreferenceStore(); - - public UsagePreferencePage() { - } - - @Override - public void init(IWorkbench workbench) { - // pass - } - - @Override - protected Control createContents(Composite parent) { - Composite top = new Composite(parent, SWT.NONE); - top.setLayout(new GridLayout(1, false)); - top.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - Label l = new Label(top, SWT.WRAP); - l.setText(SdkStatsPermissionDialog.BODY_TEXT); - GridData gd = new GridData(GridData.FILL_HORIZONTAL); - gd.widthHint = WRAP_WIDTH_PX; - l.setLayoutData(gd); - - Link privacyPolicyLink = new Link(top, SWT.WRAP); - gd = new GridData(GridData.FILL_HORIZONTAL); - gd.widthHint = WRAP_WIDTH_PX; - privacyPolicyLink.setLayoutData(gd); - privacyPolicyLink.setText(SdkStatsPermissionDialog.PRIVACY_POLICY_LINK_TEXT); - - privacyPolicyLink.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent event) { - SdkStatsPermissionDialog.openUrl(event.text); - } - }); - - mOptInCheckBox = new BooleanFieldEditor(DdmsPreferenceStore.PING_OPT_IN, - SdkStatsPermissionDialog.CHECKBOX_TEXT, top); - mOptInCheckBox.setPage(this); - mOptInCheckBox.setPreferenceStore(mStore.getPreferenceStore()); - mOptInCheckBox.load(); - - return top; - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performCancel() - */ - @Override - public boolean performCancel() { - mOptInCheckBox.load(); - return super.performCancel(); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performDefaults() - */ - @Override - protected void performDefaults() { - mOptInCheckBox.loadDefault(); - super.performDefaults(); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performOk() - */ - @Override - public boolean performOk() { - save(); - return super.performOk(); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.preference.PreferencePage#performApply() - */ - @Override - protected void performApply() { - save(); - super.performApply(); - } - - private void save() { - mStore.setPingOptIn(mOptInCheckBox.getBooleanValue()); - } -} |