diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-09-12 17:58:32 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2012-09-13 08:16:33 -0700 |
| commit | 12d4581faa6438941e65a9dc83213be34c6ca970 (patch) | |
| tree | 5a4d000b6fed83f308ab752ad4572249a79d071c | |
| parent | 7b1c36cfcc53ef82619f12bddc0e3448d253b0b9 (diff) | |
| download | sdk-12d4581faa6438941e65a9dc83213be34c6ca970.zip sdk-12d4581faa6438941e65a9dc83213be34c6ca970.tar.gz sdk-12d4581faa6438941e65a9dc83213be34c6ca970.tar.bz2 | |
Constants refactoring.
This changeset moves most constants into the SdkConstants
class, and gets rid of AndroidConstants and LintConstants.
It also migrates all non-ADT specific constants from
AdtConstants into SdkConstants. It furthermore moves various
other constants (such as those in XmlUtils and ValuesDescriptors)
into the constants class. It also fixes the modifier order
to be the canonical modifier order (JLS 8.x).
Finally, it removes redundancy and combines various constant
aliases such that we don't have both NAME_ATTR and ATTR_NAME
pointing to "name", etc.
Change-Id: Ifd1755016f62ce2dd80e5c76130d6de4b0e32161
279 files changed, 2721 insertions, 2981 deletions
diff --git a/common/src/com/android/AndroidConstants.java b/common/src/com/android/AndroidConstants.java deleted file mode 100644 index dfe137a..0000000 --- a/common/src/com/android/AndroidConstants.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2011 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; - -/** - * Generic Android Constants. - */ -public class AndroidConstants { - - /** Default anim resource folder name, i.e. "anim" */ - public final static String FD_RES_ANIM = "anim"; //$NON-NLS-1$ - /** Default animator resource folder name, i.e. "animator" */ - public final static String FD_RES_ANIMATOR = "animator"; //$NON-NLS-1$ - /** Default color resource folder name, i.e. "color" */ - public final static String FD_RES_COLOR = "color"; //$NON-NLS-1$ - /** Default drawable resource folder name, i.e. "drawable" */ - public final static String FD_RES_DRAWABLE = "drawable"; //$NON-NLS-1$ - /** Default interpolator resource folder name, i.e. "interpolator" */ - public final static String FD_RES_INTERPOLATOR = "interpolator"; //$NON-NLS-1$ - /** Default layout resource folder name, i.e. "layout" */ - public final static String FD_RES_LAYOUT = "layout"; //$NON-NLS-1$ - /** Default menu resource folder name, i.e. "menu" */ - public final static String FD_RES_MENU = "menu"; //$NON-NLS-1$ - /** Default menu resource folder name, i.e. "mipmap" */ - public final static String FD_RES_MIPMAP = "mipmap"; //$NON-NLS-1$ - /** Default values resource folder name, i.e. "values" */ - public final static String FD_RES_VALUES = "values"; //$NON-NLS-1$ - /** Default xml resource folder name, i.e. "xml" */ - public final static String FD_RES_XML = "xml"; //$NON-NLS-1$ - /** Default raw resource folder name, i.e. "raw" */ - public final static String FD_RES_RAW = "raw"; //$NON-NLS-1$ - - /** Separator between the resource folder qualifier. */ - public final static String RES_QUALIFIER_SEP = "-"; //$NON-NLS-1$ - -} diff --git a/common/src/com/android/SdkConstants.java b/common/src/com/android/SdkConstants.java index 6f47fa9..d2f1421 100644 --- a/common/src/com/android/SdkConstants.java +++ b/common/src/com/android/SdkConstants.java @@ -30,31 +30,31 @@ import java.io.File; * */ public final class SdkConstants { - public final static int PLATFORM_UNKNOWN = 0; - public final static int PLATFORM_LINUX = 1; - public final static int PLATFORM_WINDOWS = 2; - public final static int PLATFORM_DARWIN = 3; + public static final int PLATFORM_UNKNOWN = 0; + public static final int PLATFORM_LINUX = 1; + public static final int PLATFORM_WINDOWS = 2; + public static final int PLATFORM_DARWIN = 3; /** * Returns current platform, one of {@link #PLATFORM_WINDOWS}, {@link #PLATFORM_DARWIN}, * {@link #PLATFORM_LINUX} or {@link #PLATFORM_UNKNOWN}. */ - public final static int CURRENT_PLATFORM = currentPlatform(); + public static final int CURRENT_PLATFORM = currentPlatform(); /** * Charset for the ini file handled by the SDK. */ - public final static String INI_CHARSET = "UTF-8"; //$NON-NLS-1$ + public static final String INI_CHARSET = "UTF-8"; //$NON-NLS-1$ /** An SDK Project's AndroidManifest.xml file */ public static final String FN_ANDROID_MANIFEST_XML= "AndroidManifest.xml"; //$NON-NLS-1$ /** pre-dex jar filename. i.e. "classes.jar" */ - public final static String FN_CLASSES_JAR = "classes.jar"; //$NON-NLS-1$ + public static final String FN_CLASSES_JAR = "classes.jar"; //$NON-NLS-1$ /** Dex filename inside the APK. i.e. "classes.dex" */ - public final static String FN_APK_CLASSES_DEX = "classes.dex"; //$NON-NLS-1$ + public static final String FN_APK_CLASSES_DEX = "classes.dex"; //$NON-NLS-1$ /** An SDK Project's build.xml file */ - public final static String FN_BUILD_XML = "build.xml"; //$NON-NLS-1$ + public static final String FN_BUILD_XML = "build.xml"; //$NON-NLS-1$ /** Name of the framework library, i.e. "android.jar" */ public static final String FN_FRAMEWORK_LIBRARY = "android.jar"; //$NON-NLS-1$ @@ -89,164 +89,164 @@ public final class SdkConstants { public static final String FN_ANNOTATIONS_JAR = "annotations.jar"; //$NON-NLS-1$ /** platform build property file */ - public final static String FN_BUILD_PROP = "build.prop"; //$NON-NLS-1$ + public static final String FN_BUILD_PROP = "build.prop"; //$NON-NLS-1$ /** plugin properties file */ - public final static String FN_PLUGIN_PROP = "plugin.prop"; //$NON-NLS-1$ + public static final String FN_PLUGIN_PROP = "plugin.prop"; //$NON-NLS-1$ /** add-on manifest file */ - public final static String FN_MANIFEST_INI = "manifest.ini"; //$NON-NLS-1$ + public static final String FN_MANIFEST_INI = "manifest.ini"; //$NON-NLS-1$ /** add-on layout device XML file. */ - public final static String FN_DEVICES_XML = "devices.xml"; //$NON-NLS-1$ + public static final String FN_DEVICES_XML = "devices.xml"; //$NON-NLS-1$ /** hardware properties definition file */ - public final static String FN_HARDWARE_INI = "hardware-properties.ini"; //$NON-NLS-1$ + public static final String FN_HARDWARE_INI = "hardware-properties.ini"; //$NON-NLS-1$ /** project property file */ - public final static String FN_PROJECT_PROPERTIES = "project.properties"; //$NON-NLS-1$ + public static final String FN_PROJECT_PROPERTIES = "project.properties"; //$NON-NLS-1$ /** project local property file */ - public final static String FN_LOCAL_PROPERTIES = "local.properties"; //$NON-NLS-1$ + public static final String FN_LOCAL_PROPERTIES = "local.properties"; //$NON-NLS-1$ /** project ant property file */ - public final static String FN_ANT_PROPERTIES = "ant.properties"; //$NON-NLS-1$ + public static final String FN_ANT_PROPERTIES = "ant.properties"; //$NON-NLS-1$ /** Skin layout file */ - public final static String FN_SKIN_LAYOUT = "layout"; //$NON-NLS-1$ + public static final String FN_SKIN_LAYOUT = "layout"; //$NON-NLS-1$ /** dx.jar file */ public static final String FN_DX_JAR = "dx.jar"; //$NON-NLS-1$ /** dx executable (with extension for the current OS) */ - public final static String FN_DX = + public static final String FN_DX = "dx" + ext(".bat", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** aapt executable (with extension for the current OS) */ - public final static String FN_AAPT = + public static final String FN_AAPT = "aapt" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** aidl executable (with extension for the current OS) */ - public final static String FN_AIDL = + public static final String FN_AIDL = "aidl" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** renderscript executable (with extension for the current OS) */ - public final static String FN_RENDERSCRIPT = + public static final String FN_RENDERSCRIPT = "llvm-rs-cc" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** adb executable (with extension for the current OS) */ - public final static String FN_ADB = + public static final String FN_ADB = "adb" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** emulator executable for the current OS */ - public final static String FN_EMULATOR = + public static final String FN_EMULATOR = "emulator" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** zipalign executable (with extension for the current OS) */ - public final static String FN_ZIPALIGN = + public static final String FN_ZIPALIGN = "zipalign" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** dexdump executable (with extension for the current OS) */ - public final static String FN_DEXDUMP = + public static final String FN_DEXDUMP = "dexdump" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** proguard executable (with extension for the current OS) */ - public final static String FN_PROGUARD = + public static final String FN_PROGUARD = "proguard" + ext(".bat", ".sh"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** find_lock for Windows (with extension for the current OS) */ - public final static String FN_FIND_LOCK = + public static final String FN_FIND_LOCK = "find_lock" + ext(".exe", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ /** properties file for SDK Updater packages */ - public final static String FN_SOURCE_PROP = "source.properties"; //$NON-NLS-1$ + public static final String FN_SOURCE_PROP = "source.properties"; //$NON-NLS-1$ /** properties file for content hash of installed packages */ - public final static String FN_CONTENT_HASH_PROP = "content_hash.properties"; //$NON-NLS-1$ + public static final String FN_CONTENT_HASH_PROP = "content_hash.properties"; //$NON-NLS-1$ /** properties file for the SDK */ - public final static String FN_SDK_PROP = "sdk.properties"; //$NON-NLS-1$ + public static final String FN_SDK_PROP = "sdk.properties"; //$NON-NLS-1$ /** * filename for gdbserver. */ - public final static String FN_GDBSERVER = "gdbserver"; //$NON-NLS-1$ + public static final String FN_GDBSERVER = "gdbserver"; //$NON-NLS-1$ /** global Android proguard config file */ - public final static String FN_ANDROID_PROGUARD_FILE = "proguard-android.txt"; //$NON-NLS-1$ + public static final String FN_ANDROID_PROGUARD_FILE = "proguard-android.txt"; //$NON-NLS-1$ /** global Android proguard config file with optimization enabled */ - public final static String FN_ANDROID_OPT_PROGUARD_FILE = "proguard-android-optimize.txt"; //$NON-NLS-1$ + public static final String FN_ANDROID_OPT_PROGUARD_FILE = "proguard-android-optimize.txt"; //$NON-NLS-1$ /** default proguard config file with new file extension (for project specific stuff) */ - public final static String FN_PROJECT_PROGUARD_FILE = "proguard-project.txt"; //$NON-NLS-1$ + public static final String FN_PROJECT_PROGUARD_FILE = "proguard-project.txt"; //$NON-NLS-1$ /* Folder Names for Android Projects . */ /** Resources folder name, i.e. "res". */ - public final static String FD_RESOURCES = "res"; //$NON-NLS-1$ + public static final String FD_RESOURCES = "res"; //$NON-NLS-1$ /** Assets folder name, i.e. "assets" */ - public final static String FD_ASSETS = "assets"; //$NON-NLS-1$ + public static final String FD_ASSETS = "assets"; //$NON-NLS-1$ /** Default source folder name in an SDK project, i.e. "src". * <p/> * Note: this is not the same as {@link #FD_PKG_SOURCES} * which is an SDK sources folder for packages. */ - public final static String FD_SOURCES = "src"; //$NON-NLS-1$ + public static final String FD_SOURCES = "src"; //$NON-NLS-1$ /** Default generated source folder name, i.e. "gen" */ - public final static String FD_GEN_SOURCES = "gen"; //$NON-NLS-1$ + public static final String FD_GEN_SOURCES = "gen"; //$NON-NLS-1$ /** Default native library folder name inside the project, i.e. "libs" * While the folder inside the .apk is "lib", we call that one libs because * that's what we use in ant for both .jar and .so and we need to make the 2 development ways * compatible. */ - public final static String FD_NATIVE_LIBS = "libs"; //$NON-NLS-1$ + public static final String FD_NATIVE_LIBS = "libs"; //$NON-NLS-1$ /** Native lib folder inside the APK: "lib" */ - public final static String FD_APK_NATIVE_LIBS = "lib"; //$NON-NLS-1$ + public static final String FD_APK_NATIVE_LIBS = "lib"; //$NON-NLS-1$ /** Default output folder name, i.e. "bin" */ - public final static String FD_OUTPUT = "bin"; //$NON-NLS-1$ + public static final String FD_OUTPUT = "bin"; //$NON-NLS-1$ /** Classes output folder name, i.e. "classes" */ - public final static String FD_CLASSES_OUTPUT = "classes"; //$NON-NLS-1$ + public static final String FD_CLASSES_OUTPUT = "classes"; //$NON-NLS-1$ /** proguard output folder for mapping, etc.. files */ - public final static String FD_PROGUARD = "proguard"; //$NON-NLS-1$ + public static final String FD_PROGUARD = "proguard"; //$NON-NLS-1$ /** aidl output folder for copied aidl files */ - public final static String FD_AIDL = "aidl"; //$NON-NLS-1$ + public static final String FD_AIDL = "aidl"; //$NON-NLS-1$ /* Folder Names for the Android SDK */ /** Name of the SDK platforms folder. */ - public final static String FD_PLATFORMS = "platforms"; //$NON-NLS-1$ + public static final String FD_PLATFORMS = "platforms"; //$NON-NLS-1$ /** Name of the SDK addons folder. */ - public final static String FD_ADDONS = "add-ons"; //$NON-NLS-1$ + public static final String FD_ADDONS = "add-ons"; //$NON-NLS-1$ /** Name of the SDK system-images folder. */ - public final static String FD_SYSTEM_IMAGES = "system-images"; //$NON-NLS-1$ + public static final String FD_SYSTEM_IMAGES = "system-images"; //$NON-NLS-1$ /** Name of the SDK sources folder where source packages are installed. * <p/> * Note this is not the same as {@link #FD_SOURCES} which is the folder name where sources * are installed inside a project. */ - public final static String FD_PKG_SOURCES = "sources"; //$NON-NLS-1$ + public static final String FD_PKG_SOURCES = "sources"; //$NON-NLS-1$ /** Name of the SDK tools folder. */ - public final static String FD_TOOLS = "tools"; //$NON-NLS-1$ + public static final String FD_TOOLS = "tools"; //$NON-NLS-1$ /** Name of the SDK tools/support folder. */ - public final static String FD_SUPPORT = "support"; //$NON-NLS-1$ + public static final String FD_SUPPORT = "support"; //$NON-NLS-1$ /** Name of the SDK platform tools folder. */ - public final static String FD_PLATFORM_TOOLS = "platform-tools"; //$NON-NLS-1$ + public static final String FD_PLATFORM_TOOLS = "platform-tools"; //$NON-NLS-1$ /** Name of the SDK tools/lib folder. */ - public final static String FD_LIB = "lib"; //$NON-NLS-1$ + public static final String FD_LIB = "lib"; //$NON-NLS-1$ /** Name of the SDK docs folder. */ - public final static String FD_DOCS = "docs"; //$NON-NLS-1$ + public static final String FD_DOCS = "docs"; //$NON-NLS-1$ /** Name of the doc folder containing API reference doc (javadoc) */ public static final String FD_DOCS_REFERENCE = "reference"; //$NON-NLS-1$ /** Name of the SDK images folder. */ - public final static String FD_IMAGES = "images"; //$NON-NLS-1$ + public static final String FD_IMAGES = "images"; //$NON-NLS-1$ /** Name of the ABI to support. */ - public final static String ABI_ARMEABI = "armeabi"; //$NON-NLS-1$ - public final static String ABI_ARMEABI_V7A = "armeabi-v7a"; //$NON-NLS-1$ - public final static String ABI_INTEL_ATOM = "x86"; //$NON-NLS-1$ - public final static String ABI_MIPS = "mips"; //$NON-NLS-1$ + public static final String ABI_ARMEABI = "armeabi"; //$NON-NLS-1$ + public static final String ABI_ARMEABI_V7A = "armeabi-v7a"; //$NON-NLS-1$ + public static final String ABI_INTEL_ATOM = "x86"; //$NON-NLS-1$ + public static final String ABI_MIPS = "mips"; //$NON-NLS-1$ /** Name of the CPU arch to support. */ - public final static String CPU_ARCH_ARM = "arm"; //$NON-NLS-1$ - public final static String CPU_ARCH_INTEL_ATOM = "x86"; //$NON-NLS-1$ - public final static String CPU_ARCH_MIPS = "mips"; //$NON-NLS-1$ + public static final String CPU_ARCH_ARM = "arm"; //$NON-NLS-1$ + public static final String CPU_ARCH_INTEL_ATOM = "x86"; //$NON-NLS-1$ + public static final String CPU_ARCH_MIPS = "mips"; //$NON-NLS-1$ /** Name of the CPU model to support. */ - public final static String CPU_MODEL_CORTEX_A8 = "cortex-a8"; //$NON-NLS-1$ + public static final String CPU_MODEL_CORTEX_A8 = "cortex-a8"; //$NON-NLS-1$ /** Name of the SDK skins folder. */ - public final static String FD_SKINS = "skins"; //$NON-NLS-1$ + public static final String FD_SKINS = "skins"; //$NON-NLS-1$ /** Name of the SDK samples folder. */ - public final static String FD_SAMPLES = "samples"; //$NON-NLS-1$ + public static final String FD_SAMPLES = "samples"; //$NON-NLS-1$ /** Name of the SDK extras folder. */ - public final static String FD_EXTRAS = "extras"; //$NON-NLS-1$ + public static final String FD_EXTRAS = "extras"; //$NON-NLS-1$ /** * Name of an extra's sample folder. * Ideally extras should have one {@link #FD_SAMPLES} folder containing @@ -255,32 +255,32 @@ public final class SdkConstants { * in it. When possible we should encourage extras' owners to move to the * multi-samples format. */ - public final static String FD_SAMPLE = "sample"; //$NON-NLS-1$ + public static final String FD_SAMPLE = "sample"; //$NON-NLS-1$ /** Name of the SDK templates folder, i.e. "templates" */ - public final static String FD_TEMPLATES = "templates"; //$NON-NLS-1$ + public static final String FD_TEMPLATES = "templates"; //$NON-NLS-1$ /** Name of the SDK Ant folder, i.e. "ant" */ - public final static String FD_ANT = "ant"; //$NON-NLS-1$ + public static final String FD_ANT = "ant"; //$NON-NLS-1$ /** Name of the SDK data folder, i.e. "data" */ - public final static String FD_DATA = "data"; //$NON-NLS-1$ + public static final String FD_DATA = "data"; //$NON-NLS-1$ /** Name of the SDK renderscript folder, i.e. "rs" */ - public final static String FD_RENDERSCRIPT = "rs"; //$NON-NLS-1$ + public static final String FD_RENDERSCRIPT = "rs"; //$NON-NLS-1$ /** Name of the SDK resources folder, i.e. "res" */ - public final static String FD_RES = "res"; //$NON-NLS-1$ + public static final String FD_RES = "res"; //$NON-NLS-1$ /** Name of the SDK font folder, i.e. "fonts" */ - public final static String FD_FONTS = "fonts"; //$NON-NLS-1$ + public static final String FD_FONTS = "fonts"; //$NON-NLS-1$ /** Name of the android sources directory */ public static final String FD_ANDROID_SOURCES = "sources"; //$NON-NLS-1$ /** Name of the addon libs folder. */ - public final static String FD_ADDON_LIBS = "libs"; //$NON-NLS-1$ + public static final String FD_ADDON_LIBS = "libs"; //$NON-NLS-1$ /** Name of the cache folder in the $HOME/.android. */ - public final static String FD_CACHE = "cache"; //$NON-NLS-1$ + public static final String FD_CACHE = "cache"; //$NON-NLS-1$ /** API codename of a release (non preview) system image or platform. **/ - public final static String CODENAME_RELEASE = "REL"; //$NON-NLS-1$ + public static final String CODENAME_RELEASE = "REL"; //$NON-NLS-1$ /** Namespace for the resource XML, i.e. "http://schemas.android.com/apk/res/android" */ - public final static String NS_RESOURCES = + public static final String NS_RESOURCES = "http://schemas.android.com/apk/res/android"; //$NON-NLS-1$ /** Namespace for the device schema, i.e. "http://schemas.android.com/sdk/devices/1" */ @@ -289,42 +289,42 @@ public final class SdkConstants { /** The name of the uses-library that provides "android.test.runner" */ - public final static String ANDROID_TEST_RUNNER_LIB = + public static final String ANDROID_TEST_RUNNER_LIB = "android.test.runner"; //$NON-NLS-1$ /* Folder path relative to the SDK root */ /** Path of the documentation directory relative to the sdk folder. * This is an OS path, ending with a separator. */ - public final static String OS_SDK_DOCS_FOLDER = FD_DOCS + File.separator; + public static final String OS_SDK_DOCS_FOLDER = FD_DOCS + File.separator; /** Path of the tools directory relative to the sdk folder, or to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_SDK_TOOLS_FOLDER = FD_TOOLS + File.separator; + public static final String OS_SDK_TOOLS_FOLDER = FD_TOOLS + File.separator; /** Path of the lib directory relative to the sdk folder, or to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_SDK_TOOLS_LIB_FOLDER = + public static final String OS_SDK_TOOLS_LIB_FOLDER = OS_SDK_TOOLS_FOLDER + FD_LIB + File.separator; /** * Path of the lib directory relative to the sdk folder, or to a platform * folder. This is an OS path, ending with a separator. */ - public final static String OS_SDK_TOOLS_LIB_EMULATOR_FOLDER = OS_SDK_TOOLS_LIB_FOLDER + public static final String OS_SDK_TOOLS_LIB_EMULATOR_FOLDER = OS_SDK_TOOLS_LIB_FOLDER + "emulator" + File.separator; //$NON-NLS-1$ /** Path of the platform tools directory relative to the sdk folder. * This is an OS path, ending with a separator. */ - public final static String OS_SDK_PLATFORM_TOOLS_FOLDER = FD_PLATFORM_TOOLS + File.separator; + public static final String OS_SDK_PLATFORM_TOOLS_FOLDER = FD_PLATFORM_TOOLS + File.separator; /** Path of the Platform tools Lib directory relative to the sdk folder. * This is an OS path, ending with a separator. */ - public final static String OS_SDK_PLATFORM_TOOLS_LIB_FOLDER = + public static final String OS_SDK_PLATFORM_TOOLS_LIB_FOLDER = OS_SDK_PLATFORM_TOOLS_FOLDER + FD_LIB + File.separator; /** Path of the bin folder of proguard folder relative to the sdk folder. * This is an OS path, ending with a separator. */ - public final static String OS_SDK_TOOLS_PROGUARD_BIN_FOLDER = + public static final String OS_SDK_TOOLS_PROGUARD_BIN_FOLDER = SdkConstants.OS_SDK_TOOLS_FOLDER + "proguard" + File.separator + //$NON-NLS-1$ "bin" + File.separator; //$NON-NLS-1$ @@ -333,120 +333,118 @@ public final class SdkConstants { /** Path of the images directory relative to a platform or addon folder. * This is an OS path, ending with a separator. */ - public final static String OS_IMAGES_FOLDER = FD_IMAGES + File.separator; + public static final String OS_IMAGES_FOLDER = FD_IMAGES + File.separator; /** Path of the skin directory relative to a platform or addon folder. * This is an OS path, ending with a separator. */ - public final static String OS_SKINS_FOLDER = FD_SKINS + File.separator; + public static final String OS_SKINS_FOLDER = FD_SKINS + File.separator; /* Folder paths relative to a Platform folder */ /** Path of the data directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_DATA_FOLDER = FD_DATA + File.separator; + public static final String OS_PLATFORM_DATA_FOLDER = FD_DATA + File.separator; /** Path of the renderscript directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_RENDERSCRIPT_FOLDER = FD_RENDERSCRIPT + File.separator; + public static final String OS_PLATFORM_RENDERSCRIPT_FOLDER = FD_RENDERSCRIPT + File.separator; /** Path of the samples directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_SAMPLES_FOLDER = FD_SAMPLES + File.separator; + public static final String OS_PLATFORM_SAMPLES_FOLDER = FD_SAMPLES + File.separator; /** Path of the resources directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_RESOURCES_FOLDER = + public static final String OS_PLATFORM_RESOURCES_FOLDER = OS_PLATFORM_DATA_FOLDER + FD_RES + File.separator; /** Path of the fonts directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_FONTS_FOLDER = + public static final String OS_PLATFORM_FONTS_FOLDER = OS_PLATFORM_DATA_FOLDER + FD_FONTS + File.separator; /** Path of the android source directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_SOURCES_FOLDER = FD_ANDROID_SOURCES + File.separator; + public static final String OS_PLATFORM_SOURCES_FOLDER = FD_ANDROID_SOURCES + File.separator; /** Path of the android templates directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_TEMPLATES_FOLDER = FD_TEMPLATES + File.separator; + public static final String OS_PLATFORM_TEMPLATES_FOLDER = FD_TEMPLATES + File.separator; /** Path of the Ant build rules directory relative to a platform folder. * This is an OS path, ending with a separator. */ - public final static String OS_PLATFORM_ANT_FOLDER = FD_ANT + File.separator; + public static final String OS_PLATFORM_ANT_FOLDER = FD_ANT + File.separator; /** Path of the attrs.xml file relative to a platform folder. */ - public final static String OS_PLATFORM_ATTRS_XML = - OS_PLATFORM_RESOURCES_FOLDER + AndroidConstants.FD_RES_VALUES + File.separator + + public static final String OS_PLATFORM_ATTRS_XML = + OS_PLATFORM_RESOURCES_FOLDER + SdkConstants.FD_RES_VALUES + File.separator + FN_ATTRS_XML; /** Path of the attrs_manifest.xml file relative to a platform folder. */ - public final static String OS_PLATFORM_ATTRS_MANIFEST_XML = - OS_PLATFORM_RESOURCES_FOLDER + AndroidConstants.FD_RES_VALUES + File.separator + + public static final String OS_PLATFORM_ATTRS_MANIFEST_XML = + OS_PLATFORM_RESOURCES_FOLDER + SdkConstants.FD_RES_VALUES + File.separator + FN_ATTRS_MANIFEST_XML; /** Path of the layoutlib.jar file relative to a platform folder. */ - public final static String OS_PLATFORM_LAYOUTLIB_JAR = + public static final String OS_PLATFORM_LAYOUTLIB_JAR = OS_PLATFORM_DATA_FOLDER + FN_LAYOUTLIB_JAR; /** Path of the renderscript include folder relative to a platform folder. */ - public final static String OS_FRAMEWORK_RS = + public static final String OS_FRAMEWORK_RS = FN_FRAMEWORK_RENDERSCRIPT + File.separator + FN_FRAMEWORK_INCLUDE; /** Path of the renderscript (clang) include folder relative to a platform folder. */ - public final static String OS_FRAMEWORK_RS_CLANG = + public static final String OS_FRAMEWORK_RS_CLANG = FN_FRAMEWORK_RENDERSCRIPT + File.separator + FN_FRAMEWORK_INCLUDE_CLANG; /* Folder paths relative to a addon folder */ /** Path of the images directory relative to a folder folder. * This is an OS path, ending with a separator. */ - public final static String OS_ADDON_LIBS_FOLDER = FD_ADDON_LIBS + File.separator; + public static final String OS_ADDON_LIBS_FOLDER = FD_ADDON_LIBS + File.separator; /** Skin default **/ - public final static String SKIN_DEFAULT = "default"; //$NON-NLS-1$ + public static final String SKIN_DEFAULT = "default"; //$NON-NLS-1$ /** SDK property: ant templates revision */ - public final static String PROP_SDK_ANT_TEMPLATES_REVISION = + public static final String PROP_SDK_ANT_TEMPLATES_REVISION = "sdk.ant.templates.revision"; //$NON-NLS-1$ /** SDK property: default skin */ - public final static String PROP_SDK_DEFAULT_SKIN = "sdk.skin.default"; //$NON-NLS-1$ + public static final String PROP_SDK_DEFAULT_SKIN = "sdk.skin.default"; //$NON-NLS-1$ /* Android Class Constants */ - public final static String CLASS_ACTIVITY = "android.app.Activity"; //$NON-NLS-1$ - public final static String CLASS_APPLICATION = "android.app.Application"; //$NON-NLS-1$ - public final static String CLASS_SERVICE = "android.app.Service"; //$NON-NLS-1$ - public final static String CLASS_BROADCASTRECEIVER = "android.content.BroadcastReceiver"; //$NON-NLS-1$ - public final static String CLASS_CONTENTPROVIDER = "android.content.ContentProvider"; //$NON-NLS-1$ - public final static String CLASS_INSTRUMENTATION = "android.app.Instrumentation"; //$NON-NLS-1$ - public final static String CLASS_INSTRUMENTATION_RUNNER = + public static final String CLASS_ACTIVITY = "android.app.Activity"; //$NON-NLS-1$ + public static final String CLASS_APPLICATION = "android.app.Application"; //$NON-NLS-1$ + public static final String CLASS_SERVICE = "android.app.Service"; //$NON-NLS-1$ + public static final String CLASS_BROADCASTRECEIVER = "android.content.BroadcastReceiver"; //$NON-NLS-1$ + public static final String CLASS_CONTENTPROVIDER = "android.content.ContentProvider"; //$NON-NLS-1$ + public static final String CLASS_INSTRUMENTATION = "android.app.Instrumentation"; //$NON-NLS-1$ + public static final String CLASS_INSTRUMENTATION_RUNNER = "android.test.InstrumentationTestRunner"; //$NON-NLS-1$ - public final static String CLASS_BUNDLE = "android.os.Bundle"; //$NON-NLS-1$ - public final static String CLASS_R = "android.R"; //$NON-NLS-1$ - public final static String CLASS_MANIFEST_PERMISSION = "android.Manifest$permission"; //$NON-NLS-1$ - public final static String CLASS_INTENT = "android.content.Intent"; //$NON-NLS-1$ - public final static String CLASS_CONTEXT = "android.content.Context"; //$NON-NLS-1$ - public final static String CLASS_VIEW = "android.view.View"; //$NON-NLS-1$ - public final static String CLASS_VIEWGROUP = "android.view.ViewGroup"; //$NON-NLS-1$ - public final static String CLASS_NAME_LAYOUTPARAMS = "LayoutParams"; //$NON-NLS-1$ - public final static String CLASS_VIEWGROUP_LAYOUTPARAMS = + public static final String CLASS_BUNDLE = "android.os.Bundle"; //$NON-NLS-1$ + public static final String CLASS_R = "android.R"; //$NON-NLS-1$ + public static final String CLASS_MANIFEST_PERMISSION = "android.Manifest$permission"; //$NON-NLS-1$ + public static final String CLASS_INTENT = "android.content.Intent"; //$NON-NLS-1$ + public static final String CLASS_CONTEXT = "android.content.Context"; //$NON-NLS-1$ + public static final String CLASS_VIEW = "android.view.View"; //$NON-NLS-1$ + public static final String CLASS_VIEWGROUP = "android.view.ViewGroup"; //$NON-NLS-1$ + public static final String CLASS_NAME_LAYOUTPARAMS = "LayoutParams"; //$NON-NLS-1$ + public static final String CLASS_VIEWGROUP_LAYOUTPARAMS = CLASS_VIEWGROUP + "$" + CLASS_NAME_LAYOUTPARAMS; //$NON-NLS-1$ - public final static String CLASS_NAME_FRAMELAYOUT = "FrameLayout"; //$NON-NLS-1$ - public final static String CLASS_FRAMELAYOUT = + public static final String CLASS_NAME_FRAMELAYOUT = "FrameLayout"; //$NON-NLS-1$ + public static final String CLASS_FRAMELAYOUT = "android.widget." + CLASS_NAME_FRAMELAYOUT; //$NON-NLS-1$ - public final static String CLASS_PREFERENCE = "android.preference.Preference"; //$NON-NLS-1$ - public final static String CLASS_NAME_PREFERENCE_SCREEN = "PreferenceScreen"; //$NON-NLS-1$ - public final static String CLASS_PREFERENCES = + public static final String CLASS_PREFERENCE = "android.preference.Preference"; //$NON-NLS-1$ + public static final String CLASS_NAME_PREFERENCE_SCREEN = "PreferenceScreen"; //$NON-NLS-1$ + public static final String CLASS_PREFERENCES = "android.preference." + CLASS_NAME_PREFERENCE_SCREEN; //$NON-NLS-1$ - public final static String CLASS_PREFERENCEGROUP = "android.preference.PreferenceGroup"; //$NON-NLS-1$ - public final static String CLASS_PARCELABLE = "android.os.Parcelable"; //$NON-NLS-1$ + public static final String CLASS_PREFERENCEGROUP = "android.preference.PreferenceGroup"; //$NON-NLS-1$ + public static final String CLASS_PARCELABLE = "android.os.Parcelable"; //$NON-NLS-1$ public static final String CLASS_FRAGMENT = "android.app.Fragment"; //$NON-NLS-1$ public static final String CLASS_V4_FRAGMENT = "android.support.v4.app.Fragment"; //$NON-NLS-1$ /** MockView is part of the layoutlib bridge and used to display classes that have * no rendering in the graphical layout editor. */ - public final static String CLASS_MOCK_VIEW = "com.android.layoutlib.bridge.MockView"; //$NON-NLS-1$ - - + public static final String CLASS_MOCK_VIEW = "com.android.layoutlib.bridge.MockView"; //$NON-NLS-1$ /** Returns the appropriate name for the 'android' command, which is 'android.exe' for * Windows and 'android' for all other platforms. */ @@ -514,4 +512,613 @@ public final class SdkConstants { return nonWindowsExtension; } } + + /** Default anim resource folder name, i.e. "anim" */ + public static final String FD_RES_ANIM = "anim"; //$NON-NLS-1$ + /** Default animator resource folder name, i.e. "animator" */ + public static final String FD_RES_ANIMATOR = "animator"; //$NON-NLS-1$ + /** Default color resource folder name, i.e. "color" */ + public static final String FD_RES_COLOR = "color"; //$NON-NLS-1$ + /** Default drawable resource folder name, i.e. "drawable" */ + public static final String FD_RES_DRAWABLE = "drawable"; //$NON-NLS-1$ + /** Default interpolator resource folder name, i.e. "interpolator" */ + public static final String FD_RES_INTERPOLATOR = "interpolator"; //$NON-NLS-1$ + /** Default layout resource folder name, i.e. "layout" */ + public static final String FD_RES_LAYOUT = "layout"; //$NON-NLS-1$ + /** Default menu resource folder name, i.e. "menu" */ + public static final String FD_RES_MENU = "menu"; //$NON-NLS-1$ + /** Default menu resource folder name, i.e. "mipmap" */ + public static final String FD_RES_MIPMAP = "mipmap"; //$NON-NLS-1$ + /** Default values resource folder name, i.e. "values" */ + public static final String FD_RES_VALUES = "values"; //$NON-NLS-1$ + /** Default xml resource folder name, i.e. "xml" */ + public static final String FD_RES_XML = "xml"; //$NON-NLS-1$ + /** Default raw resource folder name, i.e. "raw" */ + public static final String FD_RES_RAW = "raw"; //$NON-NLS-1$ + /** Separator between the resource folder qualifier. */ + public static final String RES_QUALIFIER_SEP = "-"; //$NON-NLS-1$ + /** Namespace used in XML files for Android attributes */ + + // ---- XML ---- + + /** URI of the reserved "xmlns" prefix */ + public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/"; //$NON-NLS-1$ + /** The "xmlns" attribute name */ + public static final String XMLNS = "xmlns"; //$NON-NLS-1$ + /** The default prefix used for the {@link #XMLNS_URI} */ + public static final String XMLNS_PREFIX = "xmlns:"; //$NON-NLS-1$ + /** Qualified name of the xmlns android declaration element */ + public static final String XMLNS_ANDROID = "xmlns:android"; //$NON-NLS-1$ + /** The default prefix used for the {@link #ANDROID_URI} name space */ + public static final String ANDROID_NS_NAME = "android"; //$NON-NLS-1$ + /** The default prefix used for the {@link #ANDROID_URI} name space including the colon */ + public static final String ANDROID_NS_NAME_PREFIX = "android:"; //$NON-NLS-1$ + /** The default prefix used for the app */ + public static final String APP_PREFIX = "app"; //$NON-NLS-1$ + /** The entity for the ampersand character */ + public static final String AMP_ENTITY = "&"; //$NON-NLS-1$ + /** The entity for the quote character */ + public static final String QUOT_ENTITY = """; //$NON-NLS-1$ + /** The entity for the apostrophe character */ + public static final String APOS_ENTITY = "'"; //$NON-NLS-1$ + /** The entity for the less than character */ + public static final String LT_ENTITY = "<"; //$NON-NLS-1$ + /** The entity for the greater than character */ + public static final String GT_ENTITY = ">"; //$NON-NLS-1$ + + // ---- Elements and Attributes ---- + + /** Namespace prefix used for all resources */ + public static final String URI_PREFIX = + "http://schemas.android.com/apk/res/"; //$NON-NLS-1$ + /** Namespace used in XML files for Android attributes */ + public static final String ANDROID_URI = + "http://schemas.android.com/apk/res/android"; //$NON-NLS-1$ + /** Namespace used in XML files for Android Tooling attributes */ + public static final String TOOLS_URI = + "http://schemas.android.com/tools"; //$NON-NLS-1$ + /** Namespace used for auto-adjusting namespaces */ + public static final String AUTO_URI = + "http://schemas.android.com/apk/res-auto"; //$NON-NLS-1$ + /** Default prefix used for tools attributes */ + public static final String TOOLS_PREFIX = "tools"; //$NON-NLS-1$ + public static final String R_CLASS = "R"; //$NON-NLS-1$ + public static final String ANDROID_PKG = "android"; //$NON-NLS-1$ + + // Tags: Manifest + public static final String TAG_SERVICE = "service"; //$NON-NLS-1$ + public static final String TAG_USES_PERMISSION = "uses-permission";//$NON-NLS-1$ + public static final String TAG_USES_LIBRARY = "uses-library"; //$NON-NLS-1$ + public static final String TAG_APPLICATION = "application"; //$NON-NLS-1$ + public static final String TAG_INTENT_FILTER = "intent-filter"; //$NON-NLS-1$ + public static final String TAG_USES_SDK = "uses-sdk"; //$NON-NLS-1$ + public static final String TAG_ACTIVITY = "activity"; //$NON-NLS-1$ + public static final String TAG_RECEIVER = "receiver"; //$NON-NLS-1$ + public static final String TAG_PROVIDER = "provider"; //$NON-NLS-1$ + public static final String TAG_GRANT_PERMISSION = "grant-uri-permission"; //$NON-NLS-1$ + public static final String TAG_PATH_PERMISSION = "path-permission"; //$NON-NLS-1$ + + // Tags: Resources + public static final String TAG_RESOURCES = "resources"; //$NON-NLS-1$ + public static final String TAG_STRING = "string"; //$NON-NLS-1$ + public static final String TAG_ARRAY = "array"; //$NON-NLS-1$ + public static final String TAG_STYLE = "style"; //$NON-NLS-1$ + public static final String TAG_ITEM = "item"; //$NON-NLS-1$ + public static final String TAG_STRING_ARRAY = "string-array"; //$NON-NLS-1$ + public static final String TAG_PLURALS = "plurals"; //$NON-NLS-1$ + public static final String TAG_INTEGER_ARRAY = "integer-array"; //$NON-NLS-1$ + public static final String TAG_COLOR = "color"; //$NON-NLS-1$ + public static final String TAG_DIMEN = "dimen"; //$NON-NLS-1$ + public static final String TAG_DRAWABLE = "drawable"; //$NON-NLS-1$ + public static final String TAG_MENU = "menu"; //$NON-NLS-1$ + + // Tags: Layouts + public static final String VIEW_TAG = "view"; //$NON-NLS-1$ + public static final String VIEW_INCLUDE = "include"; //$NON-NLS-1$ + public static final String VIEW_MERGE = "merge"; //$NON-NLS-1$ + public static final String VIEW_FRAGMENT = "fragment"; //$NON-NLS-1$ + public static final String REQUEST_FOCUS = "requestFocus"; //$NON-NLS-1$ + + public static final String VIEW = "View"; //$NON-NLS-1$ + public static final String VIEW_GROUP = "ViewGroup"; //$NON-NLS-1$ + public static final String FRAME_LAYOUT = "FrameLayout"; //$NON-NLS-1$ + public static final String LINEAR_LAYOUT = "LinearLayout"; //$NON-NLS-1$ + public static final String RELATIVE_LAYOUT = "RelativeLayout"; //$NON-NLS-1$ + public static final String GRID_LAYOUT = "GridLayout"; //$NON-NLS-1$ + public static final String SCROLL_VIEW = "ScrollView"; //$NON-NLS-1$ + public static final String BUTTON = "Button"; //$NON-NLS-1$ + public static final String COMPOUND_BUTTON = "CompoundButton"; //$NON-NLS-1$ + public static final String ADAPTER_VIEW = "AdapterView"; //$NON-NLS-1$ + public static final String GALLERY = "Gallery"; //$NON-NLS-1$ + public static final String GRID_VIEW = "GridView"; //$NON-NLS-1$ + public static final String TAB_HOST = "TabHost"; //$NON-NLS-1$ + public static final String RADIO_GROUP = "RadioGroup"; //$NON-NLS-1$ + public static final String RADIO_BUTTON = "RadioButton"; //$NON-NLS-1$ + public static final String SWITCH = "Switch"; //$NON-NLS-1$ + public static final String EDIT_TEXT = "EditText"; //$NON-NLS-1$ + public static final String LIST_VIEW = "ListView"; //$NON-NLS-1$ + public static final String TEXT_VIEW = "TextView"; //$NON-NLS-1$ + public static final String CHECKED_TEXT_VIEW = "CheckedTextView"; //$NON-NLS-1$ + public static final String IMAGE_VIEW = "ImageView"; //$NON-NLS-1$ + public static final String SURFACE_VIEW = "SurfaceView"; //$NON-NLS-1$ + public static final String ABSOLUTE_LAYOUT = "AbsoluteLayout"; //$NON-NLS-1$ + public static final String TABLE_LAYOUT = "TableLayout"; //$NON-NLS-1$ + public static final String TABLE_ROW = "TableRow"; //$NON-NLS-1$ + public static final String TAB_WIDGET = "TabWidget"; //$NON-NLS-1$ + public static final String IMAGE_BUTTON = "ImageButton"; //$NON-NLS-1$ + public static final String SEEK_BAR = "SeekBar"; //$NON-NLS-1$ + public static final String VIEW_STUB = "ViewStub"; //$NON-NLS-1$ + public static final String SPINNER = "Spinner"; //$NON-NLS-1$ + public static final String WEB_VIEW = "WebView"; //$NON-NLS-1$ + public static final String TOGGLE_BUTTON = "ToggleButton"; //$NON-NLS-1$ + public static final String CHECK_BOX = "CheckBox"; //$NON-NLS-1$ + public static final String ABS_LIST_VIEW = "AbsListView"; //$NON-NLS-1$ + public static final String PROGRESS_BAR = "ProgressBar"; //$NON-NLS-1$ + public static final String ABS_SPINNER = "AbsSpinner"; //$NON-NLS-1$ + public static final String ABS_SEEK_BAR = "AbsSeekBar"; //$NON-NLS-1$ + public static final String VIEW_ANIMATOR = "ViewAnimator"; //$NON-NLS-1$ + public static final String VIEW_SWITCHER = "ViewSwitcher"; //$NON-NLS-1$ + public static final String EXPANDABLE_LIST_VIEW = "ExpandableListView"; //$NON-NLS-1$ + public static final String HORIZONTAL_SCROLL_VIEW = "HorizontalScrollView"; //$NON-NLS-1$ + + // Tags: Drawables + public static final String TAG_BITMAP = "bitmap"; //$NON-NLS-1$ + + // Attributes: Manifest + public static final String ATTR_EXPORTED = "exported"; //$NON-NLS-1$ + public static final String ATTR_PERMISSION = "permission"; //$NON-NLS-1$ + public static final String ATTR_MIN_SDK_VERSION = "minSdkVersion"; //$NON-NLS-1$ + public static final String ATTR_TARGET_SDK_VERSION = "targetSdkVersion"; //$NON-NLS-1$ + public static final String ATTR_ICON = "icon"; //$NON-NLS-1$ + public static final String ATTR_PACKAGE = "package"; //$NON-NLS-1$ + public static final String ATTR_THEME = "theme"; //$NON-NLS-1$ + public static final String ATTR_PATH = "path"; //$NON-NLS-1$ + public static final String ATTR_PATH_PREFIX = "pathPrefix"; //$NON-NLS-1$ + public static final String ATTR_PATH_PATTERN = "pathPattern"; //$NON-NLS-1$ + public static final String ATTR_DEBUGGABLE = "debuggable"; //$NON-NLS-1$ + public static final String ATTR_READ_PERMISSION = "readPermission"; //$NON_NLS-1$ + public static final String ATTR_WRITE_PERMISSION = "writePermission"; //$NON_NLS-1$ + + // Attributes: Resources + public static final String ATTR_NAME = "name"; //$NON-NLS-1$ + public static final String ATTR_TYPE = "type"; //$NON-NLS-1$ + public static final String ATTR_PARENT = "parent"; //$NON-NLS-1$ + public static final String ATTR_TRANSLATABLE = "translatable"; //$NON-NLS-1$ + public static final String ATTR_COLOR = "color"; //$NON-NLS-1$ + + // Attributes: Layout + public static final String ATTR_LAYOUT_RESOURCE_PREFIX = "layout_"; //$NON-NLS-1$ + public static final String ATTR_CLASS = "class"; //$NON-NLS-1$ + public static final String ATTR_STYLE = "style"; //$NON-NLS-1$ + + public static final String ATTR_ID = "id"; //$NON-NLS-1$ + public static final String ATTR_TEXT = "text"; //$NON-NLS-1$ + public static final String ATTR_TEXT_SIZE = "textSize"; //$NON-NLS-1$ + public static final String ATTR_LABEL = "label"; //$NON-NLS-1$ + public static final String ATTR_HINT = "hint"; //$NON-NLS-1$ + public static final String ATTR_PROMPT = "prompt"; //$NON-NLS-1$ + public static final String ATTR_ON_CLICK = "onClick"; //$NON-NLS-1$ + public static final String ATTR_INPUT_TYPE = "inputType"; //$NON-NLS-1$ + public static final String ATTR_INPUT_METHOD = "inputMethod"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_GRAVITY = "layout_gravity"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_WIDTH = "layout_width"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_HEIGHT = "layout_height"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_WEIGHT = "layout_weight"; //$NON-NLS-1$ + public static final String ATTR_PADDING = "padding"; //$NON-NLS-1$ + public static final String ATTR_PADDING_BOTTOM = "paddingBottom"; //$NON-NLS-1$ + public static final String ATTR_PADDING_TOP = "paddingTop"; //$NON-NLS-1$ + public static final String ATTR_PADDING_RIGHT = "paddingRight"; //$NON-NLS-1$ + public static final String ATTR_PADDING_LEFT = "paddingLeft"; //$NON-NLS-1$ + public static final String ATTR_FOREGROUND = "foreground"; //$NON-NLS-1$ + public static final String ATTR_BACKGROUND = "background"; //$NON-NLS-1$ + public static final String ATTR_ORIENTATION = "orientation"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT = "layout"; //$NON-NLS-1$ + public static final String ATTR_ROW_COUNT = "rowCount"; //$NON-NLS-1$ + public static final String ATTR_COLUMN_COUNT = "columnCount"; //$NON-NLS-1$ + public static final String ATTR_BASELINE_ALIGNED = "baselineAligned"; //$NON-NLS-1$ + public static final String ATTR_CONTENT_DESCRIPTION = "contentDescription"; //$NON-NLS-1$ + public static final String ATTR_IME_ACTION_LABEL = "imeActionLabel"; //$NON-NLS-1$ + public static final String ATTR_PRIVATE_IME_OPTIONS = "privateImeOptions"; //$NON-NLS-1$ + public static final String VALUE_NONE = "none"; //$NON-NLS-1$ + public static final String VALUE_NO = "no"; //$NON-NLS-1$ + public static final String ATTR_NUMERIC = "numeric"; //$NON-NLS-1$ + public static final String ATTR_IME_ACTION_ID = "imeActionId"; //$NON-NLS-1$ + public static final String ATTR_IME_OPTIONS = "imeOptions"; //$NON-NLS-1$ + public static final String ATTR_FREEZES_TEXT = "freezesText"; //$NON-NLS-1$ + public static final String ATTR_EDITOR_EXTRAS = "editorExtras"; //$NON-NLS-1$ + public static final String ATTR_EDITABLE = "editable"; //$NON-NLS-1$ + public static final String ATTR_DIGITS = "digits"; //$NON-NLS-1$ + public static final String ATTR_CURSOR_VISIBLE = "cursorVisible"; //$NON-NLS-1$ + public static final String ATTR_CAPITALIZE = "capitalize"; //$NON-NLS-1$ + public static final String ATTR_PHONE_NUMBER = "phoneNumber"; //$NON-NLS-1$ + public static final String ATTR_PASSWORD = "password"; //$NON-NLS-1$ + public static final String ATTR_BUFFER_TYPE = "bufferType"; //$NON-NLS-1$ + public static final String ATTR_AUTO_TEXT = "autoText"; //$NON-NLS-1$ + public static final String ATTR_ENABLED = "enabled"; //$NON-NLS-1$ + public static final String ATTR_SINGLE_LINE = "singleLine"; //$NON-NLS-1$ + public static final String ATTR_SCALE_TYPE = "scaleType"; //$NON-NLS-1$ + public static final String ATTR_IMPORTANT_FOR_ACCESSIBILITY = + "importantForAccessibility"; //$NON-NLS-1$ + + // AbsoluteLayout layout params + public static final String ATTR_LAYOUT_Y = "layout_y"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_X = "layout_x"; //$NON-NLS-1$ + + // GridLayout layout params + public static final String ATTR_LAYOUT_ROW = "layout_row"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ROW_SPAN = "layout_rowSpan";//$NON-NLS-1$ + public static final String ATTR_LAYOUT_COLUMN = "layout_column"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_COLUMN_SPAN = "layout_columnSpan"; //$NON-NLS-1$ + + // TableRow + public static final String ATTR_LAYOUT_SPAN = "layout_span"; //$NON-NLS-1$ + + // RelativeLayout layout params: + public static final String ATTR_LAYOUT_ALIGN_LEFT = "layout_alignLeft"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_RIGHT = "layout_alignRight"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_TOP = "layout_alignTop"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_BOTTOM = "layout_alignBottom"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_PARENT_TOP = "layout_alignParentTop"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_PARENT_BOTTOM = "layout_alignParentBottom"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_PARENT_LEFT = "layout_alignParentLeft";//$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_PARENT_RIGHT = "layout_alignParentRight"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING = "layout_alignWithParentIfMissing"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ALIGN_BASELINE = "layout_alignBaseline"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_CENTER_IN_PARENT = "layout_centerInParent"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_CENTER_VERTICAL = "layout_centerVertical"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_CENTER_HORIZONTAL = "layout_centerHorizontal"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_TO_RIGHT_OF = "layout_toRightOf"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_TO_LEFT_OF = "layout_toLeftOf"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_BELOW = "layout_below"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_ABOVE = "layout_above"; //$NON-NLS-1$ + + // Margins + public static final String ATTR_LAYOUT_MARGIN = "layout_margin"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_MARGIN_LEFT = "layout_marginLeft"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_MARGIN_RIGHT = "layout_marginRight"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_MARGIN_TOP = "layout_marginTop"; //$NON-NLS-1$ + public static final String ATTR_LAYOUT_MARGIN_BOTTOM = "layout_marginBottom"; //$NON-NLS-1$ + + // Attributes: Drawables + public static final String ATTR_TILE_MODE = "tileMode"; //$NON-NLS-1$ + + // Values: Layouts + public static final String VALUE_FILL_PARENT = "fill_parent"; //$NON-NLS-1$ + public static final String VALUE_MATCH_PARENT = "match_parent"; //$NON-NLS-1$ + public static final String VALUE_VERTICAL = "vertical"; //$NON-NLS-1$ + public static final String VALUE_TRUE = "true"; //$NON-NLS-1$ + public static final String VALUE_EDITABLE = "editable"; //$NON-NLS-1$ + + + // Values: Resources + public static final String VALUE_ID = "id"; //$NON-NLS-1$ + + // Values: Drawables + public static final String VALUE_DISABLED = "disabled"; //$NON-NLS-1$ + public static final String VALUE_CLAMP = "clamp"; //$NON-NLS-1$ + + // Menus + public static final String ATTR_SHOW_AS_ACTION = "showAsAction"; //$NON-NLS-1$ + public static final String VALUE_IF_ROOM = "ifRoom"; //$NON-NLS-1$ + public static final String VALUE_ALWAYS = "always"; //$NON-NLS-1$ + + // Units + public static final String UNIT_DP = "dp"; //$NON-NLS-1$ + public static final String UNIT_DIP = "dip"; //$NON-NLS-1$ + public static final String UNIT_SP = "sp"; //$NON-NLS-1$ + public static final String UNIT_PX = "px"; //$NON-NLS-1$ + + // Filenames and folder names + public static final String ANDROID_MANIFEST_XML = "AndroidManifest.xml"; //$NON-NLS-1$ + public static final String OLD_PROGUARD_FILE = "proguard.cfg"; //$NON-NLS-1$ + public static final String CLASS_FOLDER = + "bin" + File.separator + "classes"; //$NON-NLS-1$ //$NON-NLS-2$ + public static final String GEN_FOLDER = "gen"; //$NON-NLS-1$ + public static final String SRC_FOLDER = "src"; //$NON-NLS-1$ + public static final String LIBS_FOLDER = "libs"; //$NON-NLS-1$ + public static final String BIN_FOLDER = "bin"; //$NON-NLS-1$ + + public static final String RES_FOLDER = "res"; //$NON-NLS-1$ + public static final String DOT_XML = ".xml"; //$NON-NLS-1$ + public static final String DOT_GIF = ".gif"; //$NON-NLS-1$ + public static final String DOT_JPG = ".jpg"; //$NON-NLS-1$ + public static final String DOT_PNG = ".png"; //$NON-NLS-1$ + public static final String DOT_9PNG = ".9.png"; //$NON-NLS-1$ + public static final String DOT_JAVA = ".java"; //$NON-NLS-1$ + public static final String DOT_CLASS = ".class"; //$NON-NLS-1$ + public static final String DOT_JAR = ".jar"; //$NON-NLS-1$ + + + /** Extension of the Application package Files, i.e. "apk". */ + public static final String EXT_ANDROID_PACKAGE = "apk"; //$NON-NLS-1$ + /** Extension of java files, i.e. "java" */ + public static final String EXT_JAVA = "java"; //$NON-NLS-1$ + /** Extension of compiled java files, i.e. "class" */ + public static final String EXT_CLASS = "class"; //$NON-NLS-1$ + /** Extension of xml files, i.e. "xml" */ + public static final String EXT_XML = "xml"; //$NON-NLS-1$ + /** Extension of jar files, i.e. "jar" */ + public static final String EXT_JAR = "jar"; //$NON-NLS-1$ + /** Extension of aidl files, i.e. "aidl" */ + public static final String EXT_AIDL = "aidl"; //$NON-NLS-1$ + /** Extension of Renderscript files, i.e. "rs" */ + public static final String EXT_RS = "rs"; //$NON-NLS-1$ + /** Extension of dependency files, i.e. "d" */ + public static final String EXT_DEP = "d"; //$NON-NLS-1$ + /** Extension of native libraries, i.e. "so" */ + public static final String EXT_NATIVE_LIB = "so"; //$NON-NLS-1$ + /** Extension of dex files, i.e. "dex" */ + public static final String EXT_DEX = "dex"; //$NON-NLS-1$ + /** Extension for temporary resource files, ie "ap_ */ + public static final String EXT_RES = "ap_"; //$NON-NLS-1$ + /** Extension for pre-processable images. Right now pngs */ + public static final String EXT_PNG = "png"; //$NON-NLS-1$ + + private final static String DOT = "."; //$NON-NLS-1$ + + /** Dot-Extension of the Application package Files, i.e. ".apk". */ + public static final String DOT_ANDROID_PACKAGE = DOT + EXT_ANDROID_PACKAGE; + /** Dot-Extension of aidl files, i.e. ".aidl" */ + public static final String DOT_AIDL = DOT + EXT_AIDL; + /** Dot-Extension of renderscript files, i.e. ".rs" */ + public static final String DOT_RS = DOT + EXT_RS; + /** Dot-Extension of dependency files, i.e. ".d" */ + public static final String DOT_DEP = DOT + EXT_DEP; + /** Dot-Extension of dex files, i.e. ".dex" */ + public static final String DOT_DEX = DOT + EXT_DEX; + /** Dot-Extension for temporary resource files, ie "ap_ */ + public static final String DOT_RES = DOT + EXT_RES; + /** Dot-Extension for BMP files, i.e. ".bmp" */ + public static final String DOT_BMP = ".bmp"; //$NON-NLS-1$ + /** Dot-Extension for SVG files, i.e. ".svg" */ + public static final String DOT_SVG = ".svg"; //$NON-NLS-1$ + /** Dot-Extension for template files */ + public static final String DOT_FTL = ".ftl"; //$NON-NLS-1$ + /** Dot-Extension of text files, i.e. ".txt" */ + public static final String DOT_TXT = ".txt"; //$NON-NLS-1$ + + /** Resource base name for java files and classes */ + public static final String FN_RESOURCE_BASE = "R"; //$NON-NLS-1$ + /** Resource java class filename, i.e. "R.java" */ + public static final String FN_RESOURCE_CLASS = FN_RESOURCE_BASE + DOT_JAVA; + /** Resource class file filename, i.e. "R.class" */ + public static final String FN_COMPILED_RESOURCE_CLASS = FN_RESOURCE_BASE + DOT_CLASS; + /** Manifest java class filename, i.e. "Manifest.java" */ + public static final String FN_MANIFEST_CLASS = "Manifest.java"; //$NON-NLS-1$ + + public static final String DRAWABLE_FOLDER = "drawable"; //$NON-NLS-1$ + public static final String DRAWABLE_XHDPI = "drawable-xhdpi"; //$NON-NLS-1$ + public static final String DRAWABLE_HDPI = "drawable-hdpi"; //$NON-NLS-1$ + public static final String DRAWABLE_MDPI = "drawable-mdpi"; //$NON-NLS-1$ + public static final String DRAWABLE_LDPI = "drawable-ldpi"; //$NON-NLS-1$ + + // Resources + public static final String PREFIX_RESOURCE_REF = "@"; //$NON-NLS-1$ + public static final String PREFIX_THEME_REF = "?"; //$NON-NLS-1$ + public static final String ANDROID_PREFIX = "@android:"; //$NON-NLS-1$ + public static final String ANDROID_THEME_PREFIX = "?android:"; //$NON-NLS-1$ + public static final String LAYOUT_RESOURCE_PREFIX = "@layout/"; //$NON-NLS-1$ + public static final String STYLE_RESOURCE_PREFIX = "@style/"; //$NON-NLS-1$ + public static final String NEW_ID_PREFIX = "@+id/"; //$NON-NLS-1$ + public static final String ID_PREFIX = "@id/"; //$NON-NLS-1$ + public static final String DRAWABLE_PREFIX = "@drawable/"; //$NON-NLS-1$ + public static final String STRING_PREFIX = "@string/"; //$NON-NLS-1$ + public static final String ANDROID_STRING_PREFIX = "@android:string/"; //$NON-NLS-1$ + public static final String ANDROID_LAYOUT_RESOURCE_PREFIX = "@android:layout/"; //$NON-NLS-1$ + + public static final String RESOURCE_CLZ_ID = "id"; //$NON-NLS-1$ + public static final String RESOURCE_CLZ_COLOR = "color"; //$NON-NLS-1$ + public static final String RESOURCE_CLZ_ARRAY = "array"; //$NON-NLS-1$ + public static final String RESOURCE_CLZ_ATTR = "attr"; //$NON-NLS-1$ + public static final String RESOURCE_CLR_STYLEABLE = "styleable"; //$NON-NLS-1$ + public static final String NULL_RESOURCE = "@null"; //$NON-NLS-1$ + public static final String TRANSPARENT_COLOR = "@android:color/transparent"; //$NON-NLS-1$ + public static final String ANDROID_STYLE_RESOURCE_PREFIX = "@android:style/"; //$NON-NLS-1$ + public static final String REFERENCE_STYLE = "style/"; //$NON-NLS-1$ + public static final String PREFIX_ANDROID = "android:"; //$NON-NLS-1$ + + // Packages + public static final String ANDROID_PKG_PREFIX = "android."; //$NON-NLS-1$ + public static final String WIDGET_PKG_PREFIX = "android.widget."; //$NON-NLS-1$ + public static final String VIEW_PKG_PREFIX = "android.view."; //$NON-NLS-1$ + + // Project properties + public static final String ANDROID_LIBRARY = "android.library"; //$NON-NLS-1$ + public static final String PROGUARD_CONFIG = "proguard.config"; //$NON-NLS-1$ + public static final String ANDROID_LIBRARY_REFERENCE_FORMAT = "android.library.reference.%1$d";//$NON-NLS-1$ + public static final String PROJECT_PROPERTIES = "project.properties";//$NON-NLS-1$ + + // Java References + public static final String ATTR_REF_PREFIX = "?attr/"; //$NON-NLS-1$ + public static final String R_PREFIX = "R."; //$NON-NLS-1$ + public static final String R_ID_PREFIX = "R.id."; //$NON-NLS-1$ + public static final String R_LAYOUT_RESOURCE_PREFIX = "R.layout."; //$NON-NLS-1$ + public static final String R_DRAWABLE_PREFIX = "R.drawable."; //$NON-NLS-1$ + public static final String R_ATTR_PREFIX = "R.attr."; //$NON-NLS-1$ + + // Attributes related to tools + public static final String ATTR_IGNORE = "ignore"; //$NON-NLS-1$ + + // SuppressLint + public static final String SUPPRESS_ALL = "all"; //$NON-NLS-1$ + public static final String SUPPRESS_LINT = "SuppressLint"; //$NON-NLS-1$ + public static final String TARGET_API = "TargetApi"; //$NON-NLS-1$ + public static final String FQCN_SUPPRESS_LINT = "android.annotation." + SUPPRESS_LINT; //$NON-NLS-1$ + public static final String FQCN_TARGET_API = "android.annotation." + TARGET_API; //$NON-NLS-1$ + + // Class Names + public static final String CONSTRUCTOR_NAME = "<init>"; //$NON-NLS-1$ + public static final String FRAGMENT = "android/app/Fragment"; //$NON-NLS-1$ + public static final String FRAGMENT_V4 = "android/support/v4/app/Fragment"; //$NON-NLS-1$ + public static final String ANDROID_APP_ACTIVITY = "android/app/Activity"; //$NON-NLS-1$ + public static final String ANDROID_APP_SERVICE = "android/app/Service"; //$NON-NLS-1$ + public static final String ANDROID_CONTENT_CONTENT_PROVIDER = + "android/content/ContentProvider"; //$NON-NLS-1$ + public static final String ANDROID_CONTENT_BROADCAST_RECEIVER = + "android/content/BroadcastReceiver"; //$NON-NLS-1$ + + // Method Names + public static final String FORMAT_METHOD = "format"; //$NON-NLS-1$ + public static final String GET_STRING_METHOD = "getString"; //$NON-NLS-1$ + + + + + public static final String ATTR_TAG = "tag"; //$NON-NLS-1$ + public static final String ATTR_NUM_COLUMNS = "numColumns"; //$NON-NLS-1$ + + // Some common layout element names + public static final String CALENDAR_VIEW = "CalendarView"; //$NON-NLS-1$ + public static final String SPACE = "Space"; //$NON-NLS-1$ + public static final String GESTURE_OVERLAY_VIEW = "GestureOverlayView";//$NON-NLS-1$ + + public static final String ATTR_HANDLE = "handle"; //$NON-NLS-1$ + public static final String ATTR_CONTENT = "content"; //$NON-NLS-1$ + public static final String ATTR_CHECKED = "checked"; //$NON-NLS-1$ + + // TextView + public static final String ATTR_DRAWABLE_RIGHT = "drawableRight"; //$NON-NLS-1$ + public static final String ATTR_DRAWABLE_LEFT = "drawableLeft"; //$NON-NLS-1$ + public static final String ATTR_DRAWABLE_BOTTOM = "drawableBottom"; //$NON-NLS-1$ + public static final String ATTR_DRAWABLE_TOP = "drawableTop"; //$NON-NLS-1$ + public static final String ATTR_DRAWABLE_PADDING = "drawablePadding"; //$NON-NLS-1$ + + public static final String ATTR_USE_DEFAULT_MARGINS = "useDefaultMargins"; //$NON-NLS-1$ + public static final String ATTR_MARGINS_INCLUDED_IN_ALIGNMENT = "marginsIncludedInAlignment"; //$NON-NLS-1$ + + public static final String VALUE_WRAP_CONTENT = "wrap_content"; //$NON-NLS-1$ + public static final String VALUE_FALSE= "false"; //$NON-NLS-1$ + public static final String VALUE_N_DP = "%ddp"; //$NON-NLS-1$ + public static final String VALUE_ZERO_DP = "0dp"; //$NON-NLS-1$ + public static final String VALUE_ONE_DP = "1dp"; //$NON-NLS-1$ + public static final String VALUE_TOP = "top"; //$NON-NLS-1$ + public static final String VALUE_LEFT = "left"; //$NON-NLS-1$ + public static final String VALUE_RIGHT = "right"; //$NON-NLS-1$ + public static final String VALUE_BOTTOM = "bottom"; //$NON-NLS-1$ + public static final String VALUE_CENTER_VERTICAL = "center_vertical"; //$NON-NLS-1$ + public static final String VALUE_CENTER_HORIZONTAL = "center_horizontal"; //$NON-NLS-1$ + public static final String VALUE_FILL_HORIZONTAL = "fill_horizontal"; //$NON-NLS-1$ + public static final String VALUE_FILL_VERTICAL = "fill_vertical"; //$NON-NLS-1$ + public static final String VALUE_0 = "0"; //$NON-NLS-1$ + public static final String VALUE_1 = "1"; //$NON-NLS-1$ + + // Gravity values. These have the GRAVITY_ prefix in front of value because we already + // have VALUE_CENTER_HORIZONTAL defined for layouts, and its definition conflicts + // (centerHorizontal versus center_horizontal) + public static final String GRAVITY_VALUE_ = "center"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_CENTER = "center"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_RIGHT = "right"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_LEFT = "left"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_BOTTOM = "bottom"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_TOP = "top"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_FILL_HORIZONTAL = "fill_horizontal"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_FILL_VERTICAL = "fill_vertical"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_CENTER_HORIZONTAL = "center_horizontal"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_CENTER_VERTICAL = "center_vertical"; //$NON-NLS-1$ + public static final String GRAVITY_VALUE_FILL = "fill"; //$NON-NLS-1$ + + /** + * The top level android package as a prefix, "android.". + */ + public static final String ANDROID_SUPPORT_PKG_PREFIX = ANDROID_PKG_PREFIX + "support."; //$NON-NLS-1$ + + /** The android.view. package prefix */ + public static final String ANDROID_VIEW_PKG = ANDROID_PKG_PREFIX + "view."; //$NON-NLS-1$ + + /** The android.widget. package prefix */ + public static final String ANDROID_WIDGET_PREFIX = ANDROID_PKG_PREFIX + "widget."; //$NON-NLS-1$ + + /** The android.webkit. package prefix */ + public static final String ANDROID_WEBKIT_PKG = ANDROID_PKG_PREFIX + "webkit."; //$NON-NLS-1$ + + /** The LayoutParams inner-class name suffix, .LayoutParams */ + public static final String DOT_LAYOUT_PARAMS = ".LayoutParams"; //$NON-NLS-1$ + + /** The fully qualified class name of an EditText view */ + public static final String FQCN_EDIT_TEXT = "android.widget.EditText"; //$NON-NLS-1$ + + /** The fully qualified class name of a LinearLayout view */ + public static final String FQCN_LINEAR_LAYOUT = "android.widget.LinearLayout"; //$NON-NLS-1$ + + /** The fully qualified class name of a RelativeLayout view */ + public static final String FQCN_RELATIVE_LAYOUT = "android.widget.RelativeLayout"; //$NON-NLS-1$ + + /** The fully qualified class name of a RelativeLayout view */ + public static final String FQCN_GRID_LAYOUT = "android.widget.GridLayout"; //$NON-NLS-1$ + public static final String FQCN_GRID_LAYOUT_V7 = "android.support.v7.widget.GridLayout"; //$NON-NLS-1$ + + /** The fully qualified class name of a FrameLayout view */ + public static final String FQCN_FRAME_LAYOUT = "android.widget.FrameLayout"; //$NON-NLS-1$ + + /** The fully qualified class name of a TableRow view */ + public static final String FQCN_TABLE_ROW = "android.widget.TableRow"; //$NON-NLS-1$ + + /** The fully qualified class name of a TableLayout view */ + public static final String FQCN_TABLE_LAYOUT = "android.widget.TableLayout"; //$NON-NLS-1$ + + /** The fully qualified class name of a GridView view */ + public static final String FQCN_GRID_VIEW = "android.widget.GridView"; //$NON-NLS-1$ + + /** The fully qualified class name of a TabWidget view */ + public static final String FQCN_TAB_WIDGET = "android.widget.TabWidget"; //$NON-NLS-1$ + + /** The fully qualified class name of a Button view */ + public static final String FQCN_BUTTON = "android.widget.Button"; //$NON-NLS-1$ + + /** The fully qualified class name of a RadioButton view */ + public static final String FQCN_RADIO_BUTTON = "android.widget.RadioButton"; //$NON-NLS-1$ + + /** The fully qualified class name of a ToggleButton view */ + public static final String FQCN_TOGGLE_BUTTON = "android.widget.ToggleButton"; //$NON-NLS-1$ + + /** The fully qualified class name of a Spinner view */ + public static final String FQCN_SPINNER = "android.widget.Spinner"; //$NON-NLS-1$ + + /** The fully qualified class name of an AdapterView */ + public static final String FQCN_ADAPTER_VIEW = "android.widget.AdapterView"; //$NON-NLS-1$ + + /** The fully qualified class name of a ListView */ + public static final String FQCN_LIST_VIEW = "android.widget.ListView"; //$NON-NLS-1$ + + /** The fully qualified class name of an ExpandableListView */ + public static final String FQCN_EXPANDABLE_LIST_VIEW = "android.widget.ExpandableListView"; //$NON-NLS-1$ + + /** The fully qualified class name of a GestureOverlayView */ + public static final String FQCN_GESTURE_OVERLAY_VIEW = "android.gesture.GestureOverlayView"; //$NON-NLS-1$ + + /** The fully qualified class name of a DatePicker */ + public static final String FQCN_DATE_PICKER = "android.widget.DatePicker"; //$NON-NLS-1$ + + /** The fully qualified class name of a TimePicker */ + public static final String FQCN_TIME_PICKER = "android.widget.TimePicker"; //$NON-NLS-1$ + + /** The fully qualified class name of a RadioGroup */ + public static final String FQCN_RADIO_GROUP = "android.widgets.RadioGroup"; //$NON-NLS-1$ + + /** The fully qualified class name of a Space */ + public static final String FQCN_SPACE = "android.widget.Space"; //$NON-NLS-1$ + public static final String FQCN_SPACE_V7 = "android.support.v7.widget.Space"; //$NON-NLS-1$ + + /** The fully qualified class name of a TextView view */ + public static final String FQCN_TEXT_VIEW = "android.widget.TextView"; //$NON-NLS-1$ + + /** The fully qualified class name of an ImageView view */ + public static final String FQCN_IMAGE_VIEW = "android.widget.ImageView"; //$NON-NLS-1$ + + public static final String ATTR_SRC = "src"; //$NON-NLS-1$ + + public static final String ATTR_GRAVITY = "gravity"; //$NON-NLS-1$ + public static final String ATTR_WEIGHT_SUM = "weightSum"; //$NON-NLS-1$ + public static final String ATTR_EMS = "ems"; //$NON-NLS-1$ + + public static final String VALUE_HORIZONTAL = "horizontal"; //$NON-NLS-1$ + + /** + * The highest known API level. Note that the tools may also look at the + * installed platforms to see if they can find more recently released + * platforms, e.g. when the tools have not yet been updated for a new + * release. This number is used as a baseline and any more recent platforms + * found can be used to increase the highest known number. + */ + public static final int HIGHEST_KNOWN_API = 16; } diff --git a/common/src/com/android/utils/XmlUtils.java b/common/src/com/android/utils/XmlUtils.java index 7b51bc0..73e1d11 100644 --- a/common/src/com/android/utils/XmlUtils.java +++ b/common/src/com/android/utils/XmlUtils.java @@ -15,6 +15,18 @@ */ package com.android.utils; +import static com.android.SdkConstants.AMP_ENTITY; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.APOS_ENTITY; +import static com.android.SdkConstants.APP_PREFIX; +import static com.android.SdkConstants.LT_ENTITY; +import static com.android.SdkConstants.QUOT_ENTITY; +import static com.android.SdkConstants.XMLNS; +import static com.android.SdkConstants.XMLNS_PREFIX; +import static com.android.SdkConstants.XMLNS_URI; + +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -27,39 +39,6 @@ import java.util.HashSet; /** XML Utilities */ public class XmlUtils { - /** Namespace used in XML files for Android attributes */ - public static final String ANDROID_URI = - "http://schemas.android.com/apk/res/android"; //$NON-NLS-1$ - /** Namespace used in XML files for Android Tooling attributes */ - public static final String TOOLS_URI = - "http://schemas.android.com/tools"; //$NON-NLS-1$ - /** URI of the reserved "xmlns" prefix */ - public final static String XMLNS_URI = "http://www.w3.org/2000/xmlns/"; //$NON-NLS-1$ - /** The "xmlns" attribute name */ - public static final String XMLNS = "xmlns"; //$NON-NLS-1$ - /** The default prefix used for the {@link #XMLNS_URI} */ - public static final String XMLNS_PREFIX = "xmlns:"; //$NON-NLS-1$ - /** Qualified name of the xmlns android declaration element */ - public static final String XMLNS_ANDROID = "xmlns:android"; //$NON-NLS-1$ - /** The default prefix used for the {@link #ANDROID_URI} name space */ - public static final String ANDROID_NS_NAME = "android"; //$NON-NLS-1$ - /** The default prefix used for the {@link #ANDROID_URI} name space including the colon */ - public static final String ANDROID_NS_NAME_PREFIX = "android:"; //$NON-NLS-1$ - /** The default prefix used for the app */ - private static final String APP_PREFIX = "app"; //$NON-NLS-1$ - /** The "xmlns:" attribute prefix used for namespace declarations */ - public static final String XMLNS_COLON = "xmlns:"; //$NON-NLS-1$ - /** The entity for the ampersand character */ - public static final String AMP_ENTITY = "&"; //$NON-NLS-1$ - /** The entity for the quote character */ - public static final String QUOT_ENTITY = """; //$NON-NLS-1$ - /** The entity for the apostrophe character */ - public static final String APOS_ENTITY = "'"; //$NON-NLS-1$ - /** The entity for the less than character */ - public static final String LT_ENTITY = "<"; //$NON-NLS-1$ - /** The entity for the greater than character */ - public static final String GT_ENTITY = ">"; //$NON-NLS-1$ - /** * Returns the namespace prefix matching the requested namespace URI. * If no such declaration is found, returns the default "android" prefix for @@ -67,7 +46,7 @@ public class XmlUtils { * * @param node The current node. Must not be null. * @param nsUri The namespace URI of which the prefix is to be found, - * e.g. SdkConstants.NS_RESOURCES + * e.g. {@link SdkConstants#ANDROID_URI} * @return The first prefix declared or the default "android" prefix * (or "app" for non-Android URIs) */ @@ -83,7 +62,7 @@ public class XmlUtils { * * @param node The current node. Must not be null. * @param nsUri The namespace URI of which the prefix is to be found, - * e.g. SdkConstants.NS_RESOURCES + * e.g. {@link SdkConstants#ANDROID_URI} * @param defaultPrefix The default prefix (root) to use if the namespace * is not found. If null, do not create a new namespace * if this URI is not defined for the document. @@ -94,7 +73,7 @@ public class XmlUtils { @Nullable Node node, @Nullable String nsUri, @Nullable String defaultPrefix) { // Note: Node.lookupPrefix is not implemented in wst/xml/core NodeImpl.java // The following code emulates this simple call: - // String prefix = node.lookupPrefix(SdkConstants.NS_RESOURCES); + // String prefix = node.lookupPrefix(NS_RESOURCES); // if the requested URI is null, it denotes an attribute with no namespace. if (nsUri == null) { diff --git a/common/tests/src/com/android/utils/XmlUtilsTest.java b/common/tests/src/com/android/utils/XmlUtilsTest.java index a4758a5..6c28451 100644 --- a/common/tests/src/com/android/utils/XmlUtilsTest.java +++ b/common/tests/src/com/android/utils/XmlUtilsTest.java @@ -15,6 +15,7 @@ */ package com.android.utils; +import com.android.SdkConstants; import com.android.utils.XmlUtils; import org.w3c.dom.Attr; @@ -36,9 +37,9 @@ public class XmlUtilsTest extends TestCase { DocumentBuilder builder = factory.newDocumentBuilder(); Document document = builder.newDocument(); Element rootElement = document.createElement("root"); - Attr attr = document.createAttributeNS(XmlUtils.XMLNS_URI, + Attr attr = document.createAttributeNS(SdkConstants.XMLNS_URI, "xmlns:customPrefix"); - attr.setValue(XmlUtils.ANDROID_URI); + attr.setValue(SdkConstants.ANDROID_URI); rootElement.getAttributes().setNamedItemNS(attr); document.appendChild(rootElement); Element root = document.getDocumentElement(); @@ -51,7 +52,7 @@ public class XmlUtilsTest extends TestCase { Element baz = document.createElement("baz"); root.appendChild(baz); - String prefix = XmlUtils.lookupNamespacePrefix(baz, XmlUtils.ANDROID_URI); + String prefix = XmlUtils.lookupNamespacePrefix(baz, SdkConstants.ANDROID_URI); assertEquals("customPrefix", prefix); prefix = XmlUtils.lookupNamespacePrefix(baz, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java index 0ed2b63..3ec3b5f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/AbsoluteLayoutRule.java @@ -16,10 +16,10 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_X; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_Y; -import static com.android.ide.common.layout.LayoutConstants.VALUE_N_DP; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_X; +import static com.android.SdkConstants.ATTR_LAYOUT_Y; +import static com.android.SdkConstants.VALUE_N_DP; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseLayoutRule.java index 8fc1ed6..df2c8f4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseLayoutRule.java @@ -16,42 +16,42 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ABOVE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_IN_PARENT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_LEFT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_X; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_Y; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_ABOVE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_IN_PARENT; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_VERTICAL; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_LAYOUT_X; +import static com.android.SdkConstants.ATTR_LAYOUT_Y; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; import com.android.SdkConstants; import com.android.annotations.NonNull; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java index a53859d..a7dd7d4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java @@ -16,24 +16,24 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CLASS; -import static com.android.ide.common.layout.LayoutConstants.ATTR_HINT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_STYLE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.common.layout.LayoutConstants.DOT_LAYOUT_PARAMS; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FALSE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ATTR_HINT; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_STYLE; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.DOT_LAYOUT_PARAMS; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.VALUE_FALSE; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.VALUE_TRUE; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; +import static com.android.SdkConstants.VIEW_FRAGMENT; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -638,7 +638,7 @@ public class BaseViewRule extends AbstractViewRule { if (!definedBy.endsWith(DOT_LAYOUT_PARAMS)) { continue; } - } else if (!id.startsWith(ATTR_LAYOUT_PREFIX)) { + } else if (!id.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { continue; } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/CalendarViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/CalendarViewRule.java index 18be1b2..91684e2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/CalendarViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/CalendarViewRule.java @@ -16,9 +16,9 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java index 6736849..606bbd8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/DialerFilterRule.java @@ -16,12 +16,12 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_EDIT_TEXT; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.FQCN_EDIT_TEXT; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/EditTextRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/EditTextRule.java index e80fd27..03a5bc0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/EditTextRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/EditTextRule.java @@ -16,9 +16,9 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_EMS; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.REQUEST_FOCUS; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_EMS; +import static com.android.SdkConstants.REQUEST_FOCUS; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FragmentRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FragmentRule.java index 74fe2b7..e809d00 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FragmentRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FragmentRule.java @@ -15,8 +15,8 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_NAME; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FrameLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FrameLayoutRule.java index ab5ad15..0f90962 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FrameLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/FrameLayoutRule.java @@ -16,10 +16,10 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GravityHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GravityHelper.java index db9ab9f..4b8154b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GravityHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GravityHelper.java @@ -15,18 +15,18 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_CENTER; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_CENTER_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_LEFT; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_TOP; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.GRAVITY_VALUE_BOTTOM; +import static com.android.SdkConstants.GRAVITY_VALUE_CENTER; +import static com.android.SdkConstants.GRAVITY_VALUE_CENTER_HORIZONTAL; +import static com.android.SdkConstants.GRAVITY_VALUE_CENTER_VERTICAL; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL_HORIZONTAL; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL_VERTICAL; +import static com.android.SdkConstants.GRAVITY_VALUE_LEFT; +import static com.android.SdkConstants.GRAVITY_VALUE_RIGHT; +import static com.android.SdkConstants.GRAVITY_VALUE_TOP; import org.w3c.dom.Element; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridLayoutRule.java index 40063f2..a197e23 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridLayoutRule.java @@ -16,20 +16,20 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE_V7; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_LEFT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.FQCN_SPACE; +import static com.android.SdkConstants.FQCN_SPACE_V7; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL_HORIZONTAL; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL_VERTICAL; +import static com.android.SdkConstants.GRAVITY_VALUE_LEFT; +import static com.android.SdkConstants.VALUE_HORIZONTAL; +import static com.android.SdkConstants.VALUE_TRUE; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridViewRule.java index bd29ea6..b82f391 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/GridViewRule.java @@ -16,9 +16,9 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NUM_COLUMNS; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_NUM_COLUMNS; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java index a288933..7229490 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/HorizontalScrollViewRule.java @@ -16,12 +16,12 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; +import static com.android.SdkConstants.VALUE_HORIZONTAL; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageButtonRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageButtonRule.java index 78a0b32..9907950 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageButtonRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageButtonRule.java @@ -16,8 +16,8 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_SRC; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_SRC; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageViewRule.java index 4246aa6..bc0184c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ImageViewRule.java @@ -16,8 +16,8 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_SRC; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_SRC; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/IncludeRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/IncludeRule.java index 978455a..fcb1a6d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/IncludeRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/IncludeRule.java @@ -15,7 +15,7 @@ */ package com.android.ide.common.layout; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_LAYOUT; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java deleted file mode 100644 index ec9c435..0000000 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java +++ /dev/null @@ -1,283 +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.common.layout; - -import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG; - -/** - * A bunch of constants that map to either: - * <ul> - * <li>Android Layouts XML element names (Linear, Relative, Absolute, etc.) - * <li>Attributes for layout XML elements. - * <li>Values for attributes. - * </ul> - */ -public class LayoutConstants { - /** The element name in a {@code <view class="...">} element. */ - public static final String VIEW = "view"; //$NON-NLS-1$ - - /** The attribute name in a {@code <view class="...">} element. */ - public static final String ATTR_CLASS = "class"; //$NON-NLS-1$ - public static final String ATTR_ON_CLICK = "onClick"; //$NON-NLS-1$ - public static final String ATTR_TAG = "tag"; //$NON-NLS-1$ - public static final String ATTR_NUM_COLUMNS = "numColumns"; //$NON-NLS-1$ - public static final String ATTR_PADDING = "padding"; //$NON-NLS-1$ - - // Some common layout element names - public static final String RELATIVE_LAYOUT = "RelativeLayout"; //$NON-NLS-1$ - public static final String LINEAR_LAYOUT = "LinearLayout"; //$NON-NLS-1$ - public static final String ABSOLUTE_LAYOUT = "AbsoluteLayout"; //$NON-NLS-1$ - public static final String TABLE_LAYOUT = "TableLayout"; //$NON-NLS-1$ - public static final String TABLE_ROW = "TableRow"; //$NON-NLS-1$ - public static final String CALENDAR_VIEW = "CalendarView"; //$NON-NLS-1$ - public static final String LIST_VIEW = "ListView"; //$NON-NLS-1$ - public static final String EDIT_TEXT = "EditText"; //$NON-NLS-1$ - public static final String GALLERY = "Gallery"; //$NON-NLS-1$ - public static final String GRID_LAYOUT = "GridLayout"; //$NON-NLS-1$ - public static final String GRID_VIEW = "GridView"; //$NON-NLS-1$ - public static final String SPINNER = "Spinner"; //$NON-NLS-1$ - public static final String SCROLL_VIEW = "ScrollView"; //$NON-NLS-1$ - public static final String RADIO_BUTTON = "RadioButton"; //$NON-NLS-1$ - public static final String RADIO_GROUP = "RadioGroup"; //$NON-NLS-1$ - public static final String SPACE = "Space"; //$NON-NLS-1$ - public static final String EXPANDABLE_LIST_VIEW = "ExpandableListView";//$NON-NLS-1$ - public static final String GESTURE_OVERLAY_VIEW = "GestureOverlayView";//$NON-NLS-1$ - public static final String HORIZONTAL_SCROLL_VIEW = "HorizontalScrollView"; //$NON-NLS-1$ - - public static final String ATTR_CONTENT_DESCRIPTION = "contentDescription"; //$NON-NLS-1$ - public static final String ATTR_TEXT = "text"; //$NON-NLS-1$ - public static final String ATTR_HINT = "hint"; //$NON-NLS-1$ - public static final String ATTR_ID = "id"; //$NON-NLS-1$ - public static final String ATTR_INPUT_TYPE = "inputType"; //$NON-NLS-1$ - public static final String ATTR_STYLE = "style"; //$NON-NLS-1$ - public static final String ATTR_HANDLE = "handle"; //$NON-NLS-1$ - public static final String ATTR_CONTENT = "content"; //$NON-NLS-1$ - public static final String ATTR_CHECKED = "checked"; //$NON-NLS-1$ - public static final String ATTR_BACKGROUND = "background"; //$NON-NLS-1$ - - public static final String ATTR_LAYOUT_PREFIX = "layout_"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_HEIGHT = "layout_height"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_WIDTH = "layout_width"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_GRAVITY = "layout_gravity"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_WEIGHT = "layout_weight"; //$NON-NLS-1$ - - public static final String ATTR_LAYOUT_MARGIN = "layout_margin"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_LEFT = "layout_marginLeft"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_RIGHT = "layout_marginRight"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_TOP = "layout_marginTop"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_BOTTOM = "layout_marginBottom"; //$NON-NLS-1$ - - // TextView - public static final String ATTR_DRAWABLE_RIGHT = "drawableRight"; //$NON-NLS-1$ - public static final String ATTR_DRAWABLE_LEFT = "drawableLeft"; //$NON-NLS-1$ - public static final String ATTR_DRAWABLE_BOTTOM = "drawableBottom"; //$NON-NLS-1$ - public static final String ATTR_DRAWABLE_TOP = "drawableTop"; //$NON-NLS-1$ - public static final String ATTR_DRAWABLE_PADDING = "drawablePadding"; //$NON-NLS-1$ - - // RelativeLayout layout params: - public static final String ATTR_LAYOUT_ALIGN_LEFT = "layout_alignLeft"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_RIGHT = "layout_alignRight"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_TOP = "layout_alignTop"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_BOTTOM = "layout_alignBottom"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_TOP = "layout_alignParentTop"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_BOTTOM = "layout_alignParentBottom"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_LEFT = "layout_alignParentLeft";//$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_RIGHT = "layout_alignParentRight"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING = "layout_alignWithParentIfMissing"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_BASELINE = "layout_alignBaseline"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_CENTER_IN_PARENT = "layout_centerInParent"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_CENTER_VERTICAL = "layout_centerVertical"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_CENTER_HORIZONTAL = "layout_centerHorizontal"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_TO_RIGHT_OF = "layout_toRightOf"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_TO_LEFT_OF = "layout_toLeftOf"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_BELOW = "layout_below"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ABOVE = "layout_above"; //$NON-NLS-1$ - - // GridLayout - public static final String ATTR_ROW_COUNT = "rowCount"; //$NON-NLS-1$ - public static final String ATTR_COLUMN_COUNT = "columnCount"; //$NON-NLS-1$ - public static final String ATTR_USE_DEFAULT_MARGINS = "useDefaultMargins"; //$NON-NLS-1$ - public static final String ATTR_MARGINS_INCLUDED_IN_ALIGNMENT = "marginsIncludedInAlignment"; //$NON-NLS-1$ - - // GridLayout layout params - public static final String ATTR_LAYOUT_ROW = "layout_row"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ROW_SPAN = "layout_rowSpan"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_COLUMN = "layout_column"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_COLUMN_SPAN = "layout_columnSpan"; //$NON-NLS-1$ - - public static final String ATTR_LAYOUT_Y = "layout_y"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_X = "layout_x"; //$NON-NLS-1$ - public static final String ATTR_NAME = "name"; //$NON-NLS-1$ - - public static final String VALUE_WRAP_CONTENT = "wrap_content"; //$NON-NLS-1$ - public static final String VALUE_FILL_PARENT = "fill_parent"; //$NON-NLS-1$ - public static final String VALUE_TRUE = "true"; //$NON-NLS-1$ - public static final String VALUE_FALSE= "false"; //$NON-NLS-1$ - public static final String VALUE_N_DP = "%ddp"; //$NON-NLS-1$ - public static final String VALUE_ZERO_DP = "0dp"; //$NON-NLS-1$ - public static final String VALUE_ONE_DP = "1dp"; //$NON-NLS-1$ - public static final String VALUE_TOP = "top"; //$NON-NLS-1$ - public static final String VALUE_LEFT = "left"; //$NON-NLS-1$ - public static final String VALUE_RIGHT = "right"; //$NON-NLS-1$ - public static final String VALUE_BOTTOM = "bottom"; //$NON-NLS-1$ - public static final String VALUE_CENTER_VERTICAL = "center_vertical"; //$NON-NLS-1$ - public static final String VALUE_CENTER_HORIZONTAL = "center_horizontal"; //$NON-NLS-1$ - public static final String VALUE_FILL_HORIZONTAL = "fill_horizontal"; //$NON-NLS-1$ - public static final String VALUE_FILL_VERTICAL = "fill_vertical"; //$NON-NLS-1$ - public static final String VALUE_0 = "0"; //$NON-NLS-1$ - public static final String VALUE_1 = "1"; //$NON-NLS-1$ - - // Gravity values. These have the GRAVITY_ prefix in front of value because we already - // have VALUE_CENTER_HORIZONTAL defined for layouts, and its definition conflicts - // (centerHorizontal versus center_horizontal) - public static final String GRAVITY_VALUE_ = "center"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_CENTER = "center"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_RIGHT = "right"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_LEFT = "left"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_BOTTOM = "bottom"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_TOP = "top"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_FILL_HORIZONTAL = "fill_horizontal"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_FILL_VERTICAL = "fill_vertical"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_CENTER_HORIZONTAL = "center_horizontal"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_CENTER_VERTICAL = "center_vertical"; //$NON-NLS-1$ - public static final String GRAVITY_VALUE_FILL = "fill"; //$NON-NLS-1$ - - /** - * The top level android package as a prefix, "android.". - */ - public static final String ANDROID_PKG_PREFIX = ANDROID_PKG + '.'; - public static final String ANDROID_SUPPORT_PKG_PREFIX = ANDROID_PKG_PREFIX + "support."; //$NON-NLS-1$ - - /** The android.view. package prefix */ - public static final String ANDROID_VIEW_PKG = ANDROID_PKG_PREFIX + "view."; //$NON-NLS-1$ - - /** The android.widget. package prefix */ - public static final String ANDROID_WIDGET_PREFIX = ANDROID_PKG_PREFIX + "widget."; //$NON-NLS-1$ - - /** The android.webkit. package prefix */ - public static final String ANDROID_WEBKIT_PKG = ANDROID_PKG_PREFIX + "webkit."; //$NON-NLS-1$ - - /** The LayoutParams inner-class name suffix, .LayoutParams */ - public static final String DOT_LAYOUT_PARAMS = ".LayoutParams"; //$NON-NLS-1$ - - /** The fully qualified class name of an EditText view */ - public static final String FQCN_EDIT_TEXT = "android.widget.EditText"; //$NON-NLS-1$ - - /** The fully qualified class name of a LinearLayout view */ - public static final String FQCN_LINEAR_LAYOUT = "android.widget.LinearLayout"; //$NON-NLS-1$ - - /** The fully qualified class name of a RelativeLayout view */ - public static final String FQCN_RELATIVE_LAYOUT = "android.widget.RelativeLayout"; //$NON-NLS-1$ - - /** The fully qualified class name of a RelativeLayout view */ - public static final String FQCN_GRID_LAYOUT = "android.widget.GridLayout"; //$NON-NLS-1$ - public static final String FQCN_GRID_LAYOUT_V7 = "android.support.v7.widget.GridLayout"; //$NON-NLS-1$ - - /** The fully qualified class name of a FrameLayout view */ - public static final String FQCN_FRAME_LAYOUT = "android.widget.FrameLayout"; //$NON-NLS-1$ - - /** The fully qualified class name of a TableRow view */ - public static final String FQCN_TABLE_ROW = "android.widget.TableRow"; //$NON-NLS-1$ - - /** The fully qualified class name of a TableLayout view */ - public static final String FQCN_TABLE_LAYOUT = "android.widget.TableLayout"; //$NON-NLS-1$ - - /** The fully qualified class name of a GridView view */ - public static final String FQCN_GRID_VIEW = "android.widget.GridView"; //$NON-NLS-1$ - - /** The fully qualified class name of a TabWidget view */ - public static final String FQCN_TAB_WIDGET = "android.widget.TabWidget"; //$NON-NLS-1$ - - /** The fully qualified class name of a Button view */ - public static final String FQCN_BUTTON = "android.widget.Button"; //$NON-NLS-1$ - - /** The fully qualified class name of a RadioButton view */ - public static final String FQCN_RADIO_BUTTON = "android.widget.RadioButton"; //$NON-NLS-1$ - - /** The fully qualified class name of a ToggleButton view */ - public static final String FQCN_TOGGLE_BUTTON = "android.widget.ToggleButton"; //$NON-NLS-1$ - - /** The fully qualified class name of a Spinner view */ - public static final String FQCN_SPINNER = "android.widget.Spinner"; //$NON-NLS-1$ - - /** The fully qualified class name of an AdapterView */ - public static final String FQCN_ADAPTER_VIEW = "android.widget.AdapterView"; //$NON-NLS-1$ - - /** The fully qualified class name of a ListView */ - public static final String FQCN_LIST_VIEW = "android.widget.ListView"; //$NON-NLS-1$ - - /** The fully qualified class name of an ExpandableListView */ - public static final String FQCN_EXPANDABLE_LIST_VIEW = "android.widget.ExpandableListView"; //$NON-NLS-1$ - - /** The fully qualified class name of a GestureOverlayView */ - public static final String FQCN_GESTURE_OVERLAY_VIEW = "android.gesture.GestureOverlayView"; //$NON-NLS-1$ - - /** The fully qualified class name of a DatePicker */ - public static final String FQCN_DATE_PICKER = "android.widget.DatePicker"; //$NON-NLS-1$ - - /** The fully qualified class name of a TimePicker */ - public static final String FQCN_TIME_PICKER = "android.widget.TimePicker"; //$NON-NLS-1$ - - /** The fully qualified class name of a RadioGroup */ - public static final String FQCN_RADIO_GROUP = "android.widgets.RadioGroup"; //$NON-NLS-1$ - - /** The fully qualified class name of a Space */ - public static final String FQCN_SPACE = "android.widget.Space"; //$NON-NLS-1$ - public static final String FQCN_SPACE_V7 = "android.support.v7.widget.Space"; //$NON-NLS-1$ - - /** The fully qualified class name of a TextView view */ - public static final String FQCN_TEXT_VIEW = "android.widget.TextView"; //$NON-NLS-1$ - - /** The fully qualified class name of an ImageView view */ - public static final String FQCN_IMAGE_VIEW = "android.widget.ImageView"; //$NON-NLS-1$ - - public static final String ATTR_SRC = "src"; //$NON-NLS-1$ - - // like fill_parent for API 8 - public static final String VALUE_MATCH_PARENT = "match_parent"; //$NON-NLS-1$ - - public static final String ATTR_GRAVITY = "gravity"; //$NON-NLS-1$ - public static final String ATTR_WEIGHT_SUM = "weightSum"; //$NON-NLS-1$ - public static final String ATTR_BASELINE_ALIGNED = "baselineAligned"; //$NON-NLS-1$ - public static String ATTR_ORIENTATION = "orientation"; //$NON-NLS-1$ - public static String ATTR_EMS = "ems"; //$NON-NLS-1$ - - public static String VALUE_HORIZONTAL = "horizontal"; //$NON-NLS-1$ - - public static String VALUE_VERTICAL = "vertical"; //$NON-NLS-1$ - - /** The prefix for new id attribute values, @+id/ */ - public static String NEW_ID_PREFIX = "@+id/"; //$NON-NLS-1$ - - /** The prefix for existing id attribute values, @id/ */ - public static String ID_PREFIX = "@id/"; //$NON-NLS-1$ - - /** Prefix for resources that reference layouts */ - public static String LAYOUT_PREFIX = "@layout/"; //$NON-NLS-1$ - - /** Prefix for resources that reference drawables */ - public static String DRAWABLE_PREFIX = "@drawable/"; //$NON-NLS-1$ - - /** Prefix for resources that reference strings */ - public static String STRING_PREFIX = "@string/"; //$NON-NLS-1$ - - /** Prefix for resources that reference Android strings */ - public static String ANDROID_STRING_PREFIX = "@android:string/"; //$NON-NLS-1$ - - /** Prefix for resources that reference Android layouts */ - public static String ANDROID_LAYOUT_PREFIX = "@android:layout/"; //$NON-NLS-1$ -} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java index 48a7e83..e6f4a4e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java @@ -16,20 +16,20 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_BASELINE_ALIGNED; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.ATTR_WEIGHT_SUM; -import static com.android.ide.common.layout.LayoutConstants.VALUE_1; -import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ZERO_DP; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_BASELINE_ALIGNED; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.ATTR_WEIGHT_SUM; +import static com.android.SdkConstants.VALUE_1; +import static com.android.SdkConstants.VALUE_HORIZONTAL; +import static com.android.SdkConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; +import static com.android.SdkConstants.VALUE_ZERO_DP; import static com.android.ide.eclipse.adt.AdtUtils.formatFloatAttribute; -import static com.android.utils.XmlUtils.ANDROID_URI; import com.android.SdkConstants; import com.android.annotations.NonNull; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java index 31d6259..70728c8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ListViewRule.java @@ -16,8 +16,8 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/MapViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/MapViewRule.java index 6106b05..006661e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/MapViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/MapViewRule.java @@ -16,7 +16,7 @@ package com.android.ide.common.layout; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RadioGroupRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RadioGroupRule.java index 30e6bfc..c9aa207 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RadioGroupRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RadioGroupRule.java @@ -15,11 +15,13 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CHECKED; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CHECKED; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.VALUE_TRUE; + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; import com.android.ide.common.api.IViewRule; @@ -37,7 +39,7 @@ public class RadioGroupRule extends LinearLayoutRule { if (insertType.isCreate()) { for (int i = 0; i < 3; i++) { - INode handle = node.appendChild(LayoutConstants.FQCN_RADIO_BUTTON); + INode handle = node.appendChild(SdkConstants.FQCN_RADIO_BUTTON); handle.setAttribute(ANDROID_URI, ATTR_ID, String.format("@+id/radio%d", i)); if (i == 0) { handle.setAttribute(ANDROID_URI, ATTR_CHECKED, VALUE_TRUE); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java index 850d017..b4bc869 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java @@ -16,27 +16,27 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ABOVE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_IN_PARENT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_LEFT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_ABOVE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_IN_PARENT; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_VERTICAL; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.VALUE_TRUE; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -118,8 +118,8 @@ public class RelativeLayoutRule extends BaseLayoutRule { if (a != null && a.length() > 0) { // Display the layout parameters without the leading layout_ prefix // and id references without the @+id/ prefix - if (propertyName.startsWith(ATTR_LAYOUT_PREFIX)) { - propertyName = propertyName.substring(ATTR_LAYOUT_PREFIX.length()); + if (propertyName.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { + propertyName = propertyName.substring(ATTR_LAYOUT_RESOURCE_PREFIX.length()); } a = stripIdPrefix(a); String s = propertyName + ": " + a; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ResizeState.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ResizeState.java index e95957a..42b9083 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ResizeState.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ResizeState.java @@ -16,8 +16,8 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.VALUE_N_DP; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; +import static com.android.SdkConstants.VALUE_N_DP; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; import com.android.ide.common.api.INode; import com.android.ide.common.api.Rect; @@ -128,4 +128,4 @@ class ResizeState { return String.format(VALUE_N_DP, mRule.mRulesEngine.pxToDp(bounds.h)); } } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java index 8ab5682..1dafe53 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java @@ -16,10 +16,10 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java index abafb53..b88f8ab 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SeekBarRule.java @@ -16,8 +16,8 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SlidingDrawerRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SlidingDrawerRule.java index fd5bcf9..e4267bb 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SlidingDrawerRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/SlidingDrawerRule.java @@ -15,14 +15,16 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CONTENT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_HANDLE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CONTENT; +import static com.android.SdkConstants.ATTR_HANDLE; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_TEXT; + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; import com.android.ide.common.api.IViewRule; @@ -52,12 +54,12 @@ public class SlidingDrawerRule extends BaseLayoutRule { node.setAttribute(ANDROID_URI, ATTR_CONTENT, contentId); // Handle - INode handle = node.appendChild(LayoutConstants.FQCN_BUTTON); + INode handle = node.appendChild(SdkConstants.FQCN_BUTTON); handle.setAttribute(ANDROID_URI, ATTR_TEXT, "Handle"); handle.setAttribute(ANDROID_URI, ATTR_ID, handleId); // Content - INode content = node.appendChild(LayoutConstants.FQCN_LINEAR_LAYOUT); + INode content = node.appendChild(SdkConstants.FQCN_LINEAR_LAYOUT); content.setAttribute(ANDROID_URI, ATTR_ID, contentId); content.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, matchParent); content.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, matchParent); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java index 21c368f..cb2153b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TabHostRule.java @@ -16,16 +16,16 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.FQCN_FRAME_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_TAB_WIDGET; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.FQCN_FRAME_LAYOUT; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; +import static com.android.SdkConstants.FQCN_TAB_WIDGET; +import static com.android.SdkConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableLayoutRule.java index b2cb1e4..b6aeeb4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableLayoutRule.java @@ -15,7 +15,7 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.FQCN_TABLE_ROW; +import static com.android.SdkConstants.FQCN_TABLE_ROW; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableRowRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableRowRule.java index af6f7a0..6e3f202 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableRowRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/TableRowRule.java @@ -15,7 +15,7 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.FQCN_TABLE_LAYOUT; +import static com.android.SdkConstants.FQCN_TABLE_LAYOUT; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/WebViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/WebViewRule.java index 95d532e..42b06e6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/WebViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/WebViewRule.java @@ -16,9 +16,9 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ZoomButtonRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ZoomButtonRule.java index af38913..66cbd45 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ZoomButtonRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ZoomButtonRule.java @@ -15,8 +15,8 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_SRC; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_SRC; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridDropHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridDropHandler.java index e01e045..8a6fdef 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridDropHandler.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridDropHandler.java @@ -20,12 +20,12 @@ import static com.android.ide.common.layout.GridLayoutRule.GRID_SIZE; import static com.android.ide.common.layout.GridLayoutRule.MARGIN_SIZE; import static com.android.ide.common.layout.GridLayoutRule.MAX_CELL_DIFFERENCE; import static com.android.ide.common.layout.GridLayoutRule.SHORT_GAP_DP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_COLUMN_COUNT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW_SPAN; +import static com.android.SdkConstants.ATTR_COLUMN_COUNT; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW_SPAN; import static com.android.ide.common.layout.grid.GridModel.UNDEFINED; import static java.lang.Math.abs; @@ -753,4 +753,4 @@ public class GridDropHandler { public GridModel getGrid() { return mGrid; } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java index fe38c42..fa9a11f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java @@ -15,34 +15,33 @@ */ package com.android.ide.common.layout.grid; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_COLUMN_COUNT; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.ATTR_ROW_COUNT; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.FQCN_SPACE; +import static com.android.SdkConstants.FQCN_SPACE_V7; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.SPACE; +import static com.android.SdkConstants.VALUE_BOTTOM; +import static com.android.SdkConstants.VALUE_CENTER_VERTICAL; +import static com.android.SdkConstants.VALUE_N_DP; +import static com.android.SdkConstants.VALUE_TOP; +import static com.android.SdkConstants.VALUE_VERTICAL; import static com.android.ide.common.layout.GravityHelper.GRAVITY_BOTTOM; import static com.android.ide.common.layout.GravityHelper.GRAVITY_CENTER_HORIZ; import static com.android.ide.common.layout.GravityHelper.GRAVITY_CENTER_VERT; import static com.android.ide.common.layout.GravityHelper.GRAVITY_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_COLUMN_COUNT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ROW_COUNT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE_V7; -import static com.android.ide.common.layout.LayoutConstants.GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.SPACE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.VALUE_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_N_DP; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TOP; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.utils.XmlUtils.ANDROID_URI; - import static java.lang.Math.abs; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java index bb32086..ed4ac1b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java @@ -23,22 +23,22 @@ import static com.android.ide.common.api.SegmentType.LEFT; import static com.android.ide.common.api.SegmentType.RIGHT; import static com.android.ide.common.api.SegmentType.TOP; import static com.android.ide.common.api.SegmentType.UNKNOWN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ABOVE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_IN_PARENT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_LEFT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_ABOVE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_IN_PARENT; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_VERTICAL; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -238,4 +238,4 @@ enum ConstraintType { return null; } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DeletionHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DeletionHandler.java index 30f12c0..3eac510 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DeletionHandler.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DeletionHandler.java @@ -15,21 +15,21 @@ */ package com.android.ide.common.layout.relative; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; import static com.android.ide.common.layout.BaseViewRule.stripIdPrefix; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; import static com.android.ide.common.layout.relative.ConstraintType.LAYOUT_CENTER_HORIZONTAL; import static com.android.ide.common.layout.relative.ConstraintType.LAYOUT_CENTER_VERTICAL; -import static com.android.utils.XmlUtils.ANDROID_URI; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.api.INode; import com.android.ide.common.api.INode.IAttribute; -import com.android.ide.common.layout.LayoutConstants; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -42,7 +42,7 @@ import java.util.Set; * deleted nodes * <p> * TODO: Consider adding the - * {@link LayoutConstants#ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING} attribute to a + * {@link SdkConstants#ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING} attribute to a * node if it's pointing to a node which is deleted and which has no transitive * reference to another node. */ @@ -96,7 +96,7 @@ public class DeletionHandler { @Nullable private static String getId(@NonNull IAttribute attribute) { - if (attribute.getName().startsWith(ATTR_LAYOUT_PREFIX) + if (attribute.getName().startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attribute.getUri()) && !attribute.getName().startsWith(ATTR_LAYOUT_MARGIN)) { String id = attribute.getValue(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DependencyGraph.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DependencyGraph.java index 9a2eeaa..43d52d1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DependencyGraph.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/DependencyGraph.java @@ -15,11 +15,13 @@ */ package com.android.ide.common.layout.relative; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.VALUE_TRUE; + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.IDragElement; import com.android.ide.common.api.IDragElement.IDragAttribute; import com.android.ide.common.api.INode; @@ -314,8 +316,8 @@ class DependencyGraph { } private static String stripLayoutAttributePrefix(String name) { - if (name.startsWith(ATTR_LAYOUT_PREFIX)) { - return name.substring(ATTR_LAYOUT_PREFIX.length()); + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { + return name.substring(ATTR_LAYOUT_RESOURCE_PREFIX.length()); } return name; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelineHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelineHandler.java index 135cabe..db08b18 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelineHandler.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelineHandler.java @@ -26,33 +26,35 @@ import static com.android.ide.common.api.SegmentType.LEFT; import static com.android.ide.common.api.SegmentType.RIGHT; import static com.android.ide.common.api.SegmentType.TOP; import static com.android.ide.common.layout.BaseLayoutRule.getMaxMatchDistance; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ABOVE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_IN_PARENT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_LEFT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.ide.common.layout.LayoutConstants.VALUE_N_DP; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_ABOVE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_IN_PARENT; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_VERTICAL; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.VALUE_N_DP; +import static com.android.SdkConstants.VALUE_TRUE; import static com.android.ide.common.layout.relative.ConstraintType.ALIGN_BASELINE; -import static com.android.utils.XmlUtils.ANDROID_URI; + import static java.lang.Math.abs; +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.DropFeedback; import com.android.ide.common.api.IClientRulesEngine; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelinePainter.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelinePainter.java index 46038ee..2fe7476 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelinePainter.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/GuidelinePainter.java @@ -15,13 +15,13 @@ */ package com.android.ide.common.layout.relative; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; import com.android.annotations.NonNull; import com.android.ide.common.api.DrawingStyle; @@ -153,8 +153,8 @@ public final class GuidelinePainter implements IFeedbackPainter { // usually not a prefix of the value (for example, 'layout_alignBottom=@+id/foo'). String constraint = m.getConstraint(false /* generateId */); String description = constraint.replace(NEW_ID_PREFIX, "").replace(ID_PREFIX, ""); - if (description.startsWith(ATTR_LAYOUT_PREFIX)) { - description = description.substring(ATTR_LAYOUT_PREFIX.length()); + if (description.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { + description = description.substring(ATTR_LAYOUT_RESOURCE_PREFIX.length()); } if (margin > 0) { int dp = state.getRulesEngine().pxToDp(margin); @@ -205,4 +205,4 @@ public final class GuidelinePainter implements IFeedbackPainter { gc.drawLine(points.get(i-1), points.get(i)); } } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/Match.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/Match.java index 9c998f2..6f3f0d0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/Match.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/Match.java @@ -15,10 +15,12 @@ */ package com.android.ide.common.layout.relative; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.VALUE_TRUE; + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.Segment; /** A match is a potential pairing of two segments with a given {@link ConstraintType}. */ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/MoveHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/MoveHandler.java index cc1953a..0fa915d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/MoveHandler.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/MoveHandler.java @@ -23,10 +23,12 @@ import static com.android.ide.common.api.SegmentType.CENTER_VERTICAL; import static com.android.ide.common.api.SegmentType.LEFT; import static com.android.ide.common.api.SegmentType.RIGHT; import static com.android.ide.common.api.SegmentType.TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; + import static java.lang.Math.abs; +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.DropFeedback; import com.android.ide.common.api.IClientRulesEngine; import com.android.ide.common.api.IDragElement; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ResizeHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ResizeHandler.java index 0e44724..a5e071d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ResizeHandler.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ResizeHandler.java @@ -23,10 +23,12 @@ import static com.android.ide.common.api.SegmentType.CENTER_VERTICAL; import static com.android.ide.common.api.SegmentType.LEFT; import static com.android.ide.common.api.SegmentType.RIGHT; import static com.android.ide.common.api.SegmentType.TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; + import static java.lang.Math.abs; +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.DropFeedback; import com.android.ide.common.api.IClientRulesEngine; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java index 6549361..3c1fa97 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java @@ -16,7 +16,7 @@ package com.android.ide.common.resources.platform; -import static com.android.ide.common.layout.LayoutConstants.DOT_LAYOUT_PARAMS; +import static com.android.SdkConstants.DOT_LAYOUT_PARAMS; import static com.android.ide.eclipse.adt.AdtConstants.DOC_HIDE; import com.android.ide.common.api.IAttributeInfo.Format; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java index 2e97d93..e9cee47 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtConstants.java @@ -16,7 +16,11 @@ package com.android.ide.eclipse.adt; -import com.android.AndroidConstants; +import static com.android.SdkConstants.DOT_AIDL; +import static com.android.SdkConstants.DOT_DEP; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.DOT_RS; + import com.android.SdkConstants; import com.android.ide.eclipse.adt.internal.build.builders.PostCompilerBuilder; import com.android.ide.eclipse.adt.internal.build.builders.PreCompilerBuilder; @@ -68,87 +72,12 @@ public class AdtConstants { /** Separator character for workspace path, i.e. '/'. */ public final static char WS_SEP_CHAR = '/'; - /** Extension of the Application package Files, i.e. "apk". */ - public final static String EXT_ANDROID_PACKAGE = "apk"; //$NON-NLS-1$ - /** Extension of java files, i.e. "java" */ - public final static String EXT_JAVA = "java"; //$NON-NLS-1$ - /** Extension of compiled java files, i.e. "class" */ - public final static String EXT_CLASS = "class"; //$NON-NLS-1$ - /** Extension of xml files, i.e. "xml" */ - public final static String EXT_XML = "xml"; //$NON-NLS-1$ - /** Extension of jar files, i.e. "jar" */ - public final static String EXT_JAR = "jar"; //$NON-NLS-1$ - /** Extension of aidl files, i.e. "aidl" */ - public final static String EXT_AIDL = "aidl"; //$NON-NLS-1$ - /** Extension of Renderscript files, i.e. "rs" */ - public final static String EXT_RS = "rs"; //$NON-NLS-1$ - /** Extension of dependency files, i.e. "d" */ - public final static String EXT_DEP = "d"; //$NON-NLS-1$ - /** Extension of native libraries, i.e. "so" */ - public final static String EXT_NATIVE_LIB = "so"; //$NON-NLS-1$ - /** Extension of dex files, i.e. "dex" */ - public final static String EXT_DEX = "dex"; //$NON-NLS-1$ - /** Extension for temporary resource files, ie "ap_ */ - public final static String EXT_RES = "ap_"; //$NON-NLS-1$ - /** Extension for pre-processable images. Right now pngs */ - public final static String EXT_PNG = "png"; //$NON-NLS-1$ - - private final static String DOT = "."; //$NON-NLS-1$ - - /** Dot-Extension of the Application package Files, i.e. ".apk". */ - public final static String DOT_ANDROID_PACKAGE = DOT + EXT_ANDROID_PACKAGE; - /** Dot-Extension of java files, i.e. ".java" */ - public final static String DOT_JAVA = DOT + EXT_JAVA; - /** Dot-Extension of compiled java files, i.e. ".class" */ - public final static String DOT_CLASS = DOT + EXT_CLASS; - /** Dot-Extension of xml files, i.e. ".xml" */ - public final static String DOT_XML = DOT + EXT_XML; - /** Dot-Extension of jar files, i.e. ".jar" */ - public final static String DOT_JAR = DOT + EXT_JAR; - /** Dot-Extension of aidl files, i.e. ".aidl" */ - public final static String DOT_AIDL = DOT + EXT_AIDL; - /** Dot-Extension of renderscript files, i.e. ".rs" */ - public final static String DOT_RS = DOT + EXT_RS; - /** Dot-Extension of dependency files, i.e. ".d" */ - public final static String DOT_DEP = DOT + EXT_DEP; - /** Dot-Extension of dex files, i.e. ".dex" */ - public final static String DOT_DEX = DOT + EXT_DEX; - /** Dot-Extension for temporary resource files, ie "ap_ */ - public final static String DOT_RES = DOT + EXT_RES; - /** Dot-Extension for PNG files, i.e. ".png" */ - public static final String DOT_PNG = ".png"; //$NON-NLS-1$ - /** Dot-Extension for 9-patch files, i.e. ".9.png" */ - public static final String DOT_9PNG = ".9.png"; //$NON-NLS-1$ - /** Dot-Extension for GIF files, i.e. ".gif" */ - public static final String DOT_GIF = ".gif"; //$NON-NLS-1$ - /** Dot-Extension for JPEG files, i.e. ".jpg" */ - public static final String DOT_JPG = ".jpg"; //$NON-NLS-1$ - /** Dot-Extension for BMP files, i.e. ".bmp" */ - public static final String DOT_BMP = ".bmp"; //$NON-NLS-1$ - /** Dot-Extension for SVG files, i.e. ".svg" */ - public static final String DOT_SVG = ".svg"; //$NON-NLS-1$ - /** Dot-Extension for template files */ - public static final String DOT_FTL = ".ftl"; //$NON-NLS-1$ - /** Dot-Extension of text files, i.e. ".txt" */ - public final static String DOT_TXT = ".txt"; //$NON-NLS-1$ - - /** Name of the android sources directory */ - public static final String FD_ANDROID_SOURCES = "sources"; //$NON-NLS-1$ - - /** Resource base name for java files and classes */ - public final static String FN_RESOURCE_BASE = "R"; //$NON-NLS-1$ - /** Resource java class filename, i.e. "R.java" */ - public final static String FN_RESOURCE_CLASS = FN_RESOURCE_BASE + DOT_JAVA; - /** Resource class file filename, i.e. "R.class" */ - public final static String FN_COMPILED_RESOURCE_CLASS = FN_RESOURCE_BASE + DOT_CLASS; - /** Manifest java class filename, i.e. "Manifest.java" */ - public final static String FN_MANIFEST_CLASS = "Manifest.java"; //$NON-NLS-1$ - /** Temporary packaged resources file name, i.e. "resources.ap_" */ - public final static String FN_RESOURCES_AP_ = "resources.ap_"; //$NON-NLS-1$ - /** aapt's proguard output */ public final static String FN_AAPT_PROGUARD = "proguard.txt"; //$NON-NLS-1$ + /** Temporary packaged resources file name, i.e. "resources.ap_" */ + public final static String FN_RESOURCES_AP_ = "resources.ap_"; //$NON-NLS-1$ + public final static String FN_TRACEVIEW = (SdkConstants.CURRENT_PLATFORM == SdkConstants.PLATFORM_WINDOWS) ? "traceview.bat" : "traceview"; //$NON-NLS-1$ //$NON-NLS-2$ @@ -171,7 +100,7 @@ public class AdtConstants { public final static String WS_ASSETS = WS_SEP + SdkConstants.FD_ASSETS; /** Absolute path of the layout folder, e.g. "/res/layout".<br> This is a workspace path. */ - public final static String WS_LAYOUTS = WS_RESOURCES + WS_SEP + AndroidConstants.FD_RES_LAYOUT; + public final static String WS_LAYOUTS = WS_RESOURCES + WS_SEP + SdkConstants.FD_RES_LAYOUT; /** Leaf of the javaDoc folder. Does not start with a separator. */ public final static String WS_JAVADOC_FOLDER_LEAF = SdkConstants.FD_DOCS + "/" + //$NON-NLS-1$ @@ -197,8 +126,8 @@ public class AdtConstants { * <p/> * This string contains a %s. It must be combined with the desired Java package, e.g.: * <pre> - * String.format(AndroidConstants.NS_CUSTOM_RESOURCES, "android"); - * String.format(AndroidConstants.NS_CUSTOM_RESOURCES, "com.test.mycustomapp"); + * String.format(SdkConstants.NS_CUSTOM_RESOURCES, "android"); + * String.format(SdkConstants.NS_CUSTOM_RESOURCES, "com.test.mycustomapp"); * </pre> * * Note: if you need an URI specifically for the "android" namespace, consider using @@ -208,9 +137,6 @@ public class AdtConstants { // another CL. public final static String NS_CUSTOM_RESOURCES = "http://schemas.android.com/apk/res/%1$s"; //$NON-NLS-1$ - /** The package "android" as used in resource urls etc */ - public static final String ANDROID_PKG = "android"; //$NON-NLS-1$ - /** The old common plug-in ID. Please do not use for new features. */ private static final String LEGACY_PLUGIN_ID = "com.android.ide.eclipse.common"; //$NON-NLS-1$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java index de043aa..692adc7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java @@ -21,7 +21,6 @@ import static com.android.SdkConstants.PLATFORM_DARWIN; import static com.android.SdkConstants.PLATFORM_LINUX; import static com.android.SdkConstants.PLATFORM_WINDOWS; -import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -1583,7 +1582,7 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger { @Override public void fileChanged(@NonNull IFile file, @NonNull IMarkerDelta[] markerDeltas, int kind, @Nullable String extension, int flags) { - if (flags == IResourceDelta.MARKERS || !AdtConstants.EXT_XML.equals(extension)) { + if (flags == IResourceDelta.MARKERS || !SdkConstants.EXT_XML.equals(extension)) { // ONLY the markers changed, or not XML file: not relevant to this listener return; } @@ -1603,7 +1602,7 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger { // we are inside a res/ folder, get the ResourceFolderType of the // parent folder. String[] folderSegments = file.getParent().getName().split( - AndroidConstants.RES_QUALIFIER_SEP); + SdkConstants.RES_QUALIFIER_SEP); // get the enum for the resource type. ResourceFolderType type = ResourceFolderType.getTypeByName( diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java index eb80984..f5f7770 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtUtils.java @@ -16,10 +16,10 @@ package com.android.ide.eclipse.adt; -import static com.android.tools.lint.detector.api.LintConstants.HIGHEST_KNOWN_API; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_URI; +import static com.android.SdkConstants.TOOLS_PREFIX; +import static com.android.SdkConstants.TOOLS_URI; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.eclipse.adt.internal.editors.AndroidXmlEditor; @@ -950,7 +950,7 @@ public class AdtUtils { * @return the highest known API number */ public static int getHighestKnownApiLevel() { - return HIGHEST_KNOWN_API; + return SdkConstants.HIGHEST_KNOWN_API; } /** diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/SourceRevealer.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/SourceRevealer.java index 5ef7d7e..85f6992 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/SourceRevealer.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/SourceRevealer.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper; import com.android.ide.eclipse.adt.internal.project.ProjectHelper; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFix.java index 5586c81..defaca6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFix.java @@ -16,9 +16,9 @@ package com.android.ide.eclipse.adt.internal.build; -import static com.android.utils.XmlUtils.ANDROID_URI; -import static com.android.utils.XmlUtils.XMLNS_ANDROID; -import static com.android.utils.XmlUtils.XMLNS_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.XMLNS_ANDROID; +import static com.android.SdkConstants.XMLNS_URI; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AidlProcessor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AidlProcessor.java index 7f5ca7a..52e887a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AidlProcessor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/AidlProcessor.java @@ -84,7 +84,7 @@ public class AidlProcessor extends SourceProcessor { @Override protected String getExtension() { - return AdtConstants.EXT_AIDL; + return SdkConstants.EXT_AIDL; } @Override @@ -390,7 +390,7 @@ public class AidlProcessor extends SourceProcessor { String javaName; if (replaceExt) { javaName = sourceFile.getName().replaceAll( - AdtConstants.RE_AIDL_EXT, AdtConstants.DOT_JAVA); + AdtConstants.RE_AIDL_EXT, SdkConstants.DOT_JAVA); } else { javaName = sourceFile.getName(); } @@ -441,7 +441,7 @@ public class AidlProcessor extends SourceProcessor { // TODO: properly parse aidl file to determine type and generate dependency graphs. // // String className = file.getName().substring(0, -// file.getName().length() - AndroidConstants.DOT_AIDL.length()); +// file.getName().length() - SdkConstants.DOT_AIDL.length()); // // InputStream input = file.getContents(true /* force*/); // try { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java index 7e756bc..fe0863c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/BuildHelper.java @@ -961,7 +961,7 @@ public class BuildHelper { // if it's a project we should just ignore it because it's going to be added // later when we add all the referenced projects. - } else if (AdtConstants.EXT_JAR.equalsIgnoreCase(path.getFileExtension())) { + } else if (SdkConstants.EXT_JAR.equalsIgnoreCase(path.getFileExtension())) { // case of a jar file (which could be relative to the workspace or a full path) if (resource != null && resource.exists() && resource.getType() == IResource.FILE) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java index aff02a3..5b58c4f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java @@ -16,7 +16,6 @@ package com.android.ide.eclipse.adt.internal.build; -import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; @@ -71,7 +70,7 @@ public class RenderScriptProcessor extends SourceProcessor { boolean r = super.handleGeneratedFile(file, kind); if (r == false && kind == IResourceDelta.REMOVED && - AdtConstants.EXT_DEP.equalsIgnoreCase(file.getFileExtension())) { + SdkConstants.EXT_DEP.equalsIgnoreCase(file.getFileExtension())) { // This looks to be a dependency file. // For future-proofness let's make sure this dependency file was generated by // this processor even if it's the only processor using them for now. @@ -87,7 +86,7 @@ public class RenderScriptProcessor extends SourceProcessor { relative = relative.removeLastSegments(1); // add the file name of a Renderscript file. relative = relative.append(file.getName().replaceAll(AdtConstants.RE_DEP_EXT, - AdtConstants.DOT_RS)); + SdkConstants.DOT_RS)); // now look for a match in the source folders. List<IPath> sourceFolders = BaseProjectHelper.getSourceClasspaths( @@ -123,7 +122,7 @@ public class RenderScriptProcessor extends SourceProcessor { @Override protected String getExtension() { - return AdtConstants.EXT_RS; + return SdkConstants.EXT_RS; } @Override @@ -143,7 +142,7 @@ public class RenderScriptProcessor extends SourceProcessor { IFolder genFolder = getGenFolder(); IFolder rawFolder = project.getFolder( - new Path(SdkConstants.FD_RES).append(AndroidConstants.FD_RES_RAW)); + new Path(SdkConstants.FD_RES).append(SdkConstants.FD_RES_RAW)); int depIndex; @@ -440,7 +439,7 @@ public class RenderScriptProcessor extends SourceProcessor { private IFile getDependencyFileFor(IFile sourceFile) { IFolder depFolder = getDependencyFolder(sourceFile); return depFolder.getFile(sourceFile.getName().replaceAll(AdtConstants.RE_RS_EXT, - AdtConstants.DOT_DEP)); + SdkConstants.DOT_DEP)); } /** diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/ChangedFileSetHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/ChangedFileSetHelper.java index e8e55d5..67c7e8a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/ChangedFileSetHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/ChangedFileSetHelper.java @@ -120,7 +120,7 @@ class ChangedFileSetHelper { String path = getRelativeJavaCOut(project); ChangedFileSet set = new ChangedFileSet("compiledCode", //$NON-NLS-1$ - path + "/**/*" + AdtConstants.DOT_CLASS); //$NON-NLS-1$ + path + "/**/*" + SdkConstants.DOT_CLASS); //$NON-NLS-1$ return set; } @@ -154,8 +154,8 @@ class ChangedFileSetHelper { String path = getRelativeJavaCOut(project); ChangedFileSet set = new ChangedFileSet("classAndJars", //$NON-NLS-1$ - path + "/**/*" + AdtConstants.DOT_CLASS, //$NON-NLS-1$ - SdkConstants.FD_NATIVE_LIBS + "/*" + AdtConstants.DOT_JAR); //$NON-NLS-1$ + path + "/**/*" + SdkConstants.DOT_CLASS, //$NON-NLS-1$ + SdkConstants.FD_NATIVE_LIBS + "/*" + SdkConstants.DOT_JAR); //$NON-NLS-1$ // output file is based on the project's android output folder path = getRelativeAndroidOut(project); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java index 5911d79..5373002 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java @@ -356,7 +356,7 @@ public class PostCompilerBuilder extends BaseBuilder { if (isLibrary) { // check the jar output file is present, if not create it. IFile jarIFile = androidOutputFolder.getFile( - project.getName().toLowerCase() + AdtConstants.DOT_JAR); + project.getName().toLowerCase() + SdkConstants.DOT_JAR); if (mConvertToDex == false && jarIFile.exists() == false) { mConvertToDex = true; } @@ -746,7 +746,7 @@ public class PostCompilerBuilder extends BaseBuilder { public void addFile(IFile file, IFolder rootFolder) throws ApkCreationException { // we only package class file from the output folder - if (AdtConstants.EXT_CLASS.equals(file.getFileExtension()) == false) { + if (SdkConstants.EXT_CLASS.equals(file.getFileExtension()) == false) { return; } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java index d5b1b9a..d4c8525 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java @@ -995,7 +995,7 @@ public class PreCompilerBuilder extends BaseBuilder { // We actually need to delete the manifest.java as it may become empty and // in this case aapt doesn't generate an empty one, but instead doesn't // touch it. - IFile manifestJavaFile = packageFolder.getFile(AdtConstants.FN_MANIFEST_CLASS); + IFile manifestJavaFile = packageFolder.getFile(SdkConstants.FN_MANIFEST_CLASS); manifestJavaFile.getLocation().toFile().delete(); // launch aapt: create the command line diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerDeltaVisitor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerDeltaVisitor.java index 2c4c13c..f868224 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerDeltaVisitor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerDeltaVisitor.java @@ -275,8 +275,8 @@ class PreCompilerDeltaVisitor extends BaseDeltaVisitor implements IResourceDelta String fileName = resource.getName(); // Special case of R.java/Manifest.java. - if (AdtConstants.FN_RESOURCE_CLASS.equals(fileName) || - AdtConstants.FN_MANIFEST_CLASS.equals(fileName)) { + if (SdkConstants.FN_RESOURCE_CLASS.equals(fileName) || + SdkConstants.FN_MANIFEST_CLASS.equals(fileName)) { // if it was removed, there's a possibility that it was removed due to a // package change, or an aidl that was removed, but the only thing // that will happen is that we'll have an extra build. Not much of a problem. @@ -341,12 +341,12 @@ class PreCompilerDeltaVisitor extends BaseDeltaVisitor implements IResourceDelta case IResourceDelta.ADDED: // display verbose message message = String.format(Messages.Added_s_s_Needs_Updating, p, - AdtConstants.FN_RESOURCE_CLASS); + SdkConstants.FN_RESOURCE_CLASS); break; case IResourceDelta.REMOVED: // display verbose message message = String.format(Messages.s_Removed_s_Needs_Updating, p, - AdtConstants.FN_RESOURCE_CLASS); + SdkConstants.FN_RESOURCE_CLASS); break; } if (message != null) { @@ -358,7 +358,7 @@ class PreCompilerDeltaVisitor extends BaseDeltaVisitor implements IResourceDelta handler.handleResourceFile((IFile)resource, kind); } // If it's an XML resource, check the syntax - if (AdtConstants.EXT_XML.equalsIgnoreCase(ext) && kind != IResourceDelta.REMOVED) { + if (SdkConstants.EXT_XML.equalsIgnoreCase(ext) && kind != IResourceDelta.REMOVED) { // check xml Validity mBuilder.checkXML(resource, this); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java index af8de68..2ea70fc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java @@ -16,12 +16,12 @@ package com.android.ide.eclipse.adt.internal.editors; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.UNIT_DP; +import static com.android.SdkConstants.UNIT_PX; +import static com.android.SdkConstants.UNIT_SP; import static com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor.ATTRIBUTE_ICON_FILENAME; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_DP; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_PX; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_SP; import com.android.ide.common.api.IAttributeInfo; import com.android.ide.common.api.IAttributeInfo.Format; @@ -742,9 +742,9 @@ public abstract class AndroidContentAssist implements IContentAssistProcessor { } } - if (!matches && word.startsWith(ATTR_LAYOUT_PREFIX, wordStart) - && !prefix.startsWith(ATTR_LAYOUT_PREFIX, prefixStart)) { - wordStart += ATTR_LAYOUT_PREFIX.length(); + if (!matches && word.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX, wordStart) + && !prefix.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX, prefixStart)) { + wordStart += ATTR_LAYOUT_RESOURCE_PREFIX.length(); if (wordLength - wordStart < prefixLength - prefixStart) { return false; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java index 8c15965..18135aa 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/Hyperlinks.java @@ -16,29 +16,28 @@ package com.android.ide.eclipse.adt.internal.editors; +import static com.android.SdkConstants.ANDROID_PKG; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.ANDROID_THEME_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_ON_CLICK; +import static com.android.SdkConstants.CLASS_ACTIVITY; +import static com.android.SdkConstants.EXT_XML; import static com.android.SdkConstants.FD_DOCS; import static com.android.SdkConstants.FD_DOCS_REFERENCE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CLASS; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NAME; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ON_CLICK; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.VIEW; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_THEME_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_THEME_REF; -import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; -import static com.android.ide.eclipse.adt.AdtConstants.FN_RESOURCE_BASE; -import static com.android.ide.eclipse.adt.AdtConstants.FN_RESOURCE_CLASS; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.NAME_ATTR; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.ROOT_ELEMENT; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.STYLE_ELEMENT; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_STYLE_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.NEW_ID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.STYLE_RESOURCE_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.FN_RESOURCE_BASE; +import static com.android.SdkConstants.FN_RESOURCE_CLASS; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.PREFIX_THEME_REF; +import static com.android.SdkConstants.STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.TAG_RESOURCES; +import static com.android.SdkConstants.TAG_STYLE; +import static com.android.SdkConstants.VIEW; +import static com.android.SdkConstants.VIEW_FRAGMENT; import static com.android.xml.AndroidManifest.ATTRIBUTE_NAME; import static com.android.xml.AndroidManifest.ATTRIBUTE_PACKAGE; import static com.android.xml.AndroidManifest.NODE_ACTIVITY; @@ -57,7 +56,6 @@ import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.GraphicalEditorPart; import com.android.ide.eclipse.adt.internal.editors.manifest.ManifestEditor; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper; import com.android.ide.eclipse.adt.internal.resources.ResourceHelper; import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources; @@ -215,7 +213,7 @@ public class Hyperlinks { } String value = attribute.getValue(); - if (value.startsWith(NEW_ID_RESOURCE_PREFIX)) { + if (value.startsWith(NEW_ID_PREFIX)) { // It's a value -declaration-, nowhere else to jump // (though we could consider jumping to the R-file; would that // be helpful?) @@ -329,7 +327,7 @@ public class Hyperlinks { /** Returns true if this represents a style attribute */ private static boolean isStyleAttribute(XmlContext context) { String tag = context.getElement().getTagName(); - return STYLE_ELEMENT.equals(tag); + return TAG_STYLE.equals(tag); } /** @@ -508,7 +506,7 @@ public class Hyperlinks { public static String getTagName(ResourceType type) { if (type == ResourceType.ID) { // Ids are recorded in <item> tags instead of <id> tags - return ValuesDescriptors.ITEM_TAG; + return SdkConstants.TAG_ITEM; } return type.getName(); @@ -629,7 +627,7 @@ public class Hyperlinks { IType activityType = null; IJavaProject javaProject = BaseProjectHelper.getJavaProject(project); if (javaProject != null) { - activityType = javaProject.findType(SdkConstants.CLASS_ACTIVITY); + activityType = javaProject.findType(CLASS_ACTIVITY); if (activityType != null) { scope = SearchEngine.createHierarchyScope(activityType); } @@ -897,14 +895,14 @@ public class Hyperlinks { ResourceType type, String name, IFile file, Document document) { String targetTag = getTagName(type); Element root = document.getDocumentElement(); - if (root.getTagName().equals(ROOT_ELEMENT)) { + if (root.getTagName().equals(TAG_RESOURCES)) { NodeList children = root.getChildNodes(); for (int i = 0, n = children.getLength(); i < n; i++) { Node child = children.item(i); if (child.getNodeType() == Node.ELEMENT_NODE) { Element element = (Element)child; if (element.getTagName().equals(targetTag)) { - String elementName = element.getAttribute(NAME_ATTR); + String elementName = element.getAttribute(ATTR_NAME); if (elementName.equals(name)) { IRegion region = null; if (element instanceof IndexedRegion) { @@ -1050,7 +1048,7 @@ public class Hyperlinks { if (child.getNodeType() == Node.ELEMENT_NODE) { Element element = (Element) child; if (element.getTagName().equals(targetTag)) { - String elementName = element.getAttribute(NAME_ATTR); + String elementName = element.getAttribute(ATTR_NAME); if (elementName.equals(name)) { return Pair.of(file, parser.getOffset(element)); } @@ -1080,10 +1078,10 @@ public class Hyperlinks { Pair<ResourceType,String> resource = parseResource(url); if (resource == null) { String androidStyle = ANDROID_STYLE_RESOURCE_PREFIX; - if (url.startsWith(PREFIX_ANDROID_RESOURCE_REF)) { - url = androidStyle + url.substring(PREFIX_ANDROID_RESOURCE_REF.length()); - } else if (url.startsWith(PREFIX_ANDROID_THEME_REF)) { - url = androidStyle + url.substring(PREFIX_ANDROID_THEME_REF.length()); + if (url.startsWith(ANDROID_PREFIX)) { + url = androidStyle + url.substring(ANDROID_PREFIX.length()); + } else if (url.startsWith(ANDROID_THEME_PREFIX)) { + url = androidStyle + url.substring(ANDROID_THEME_PREFIX.length()); } else if (url.startsWith(ANDROID_PKG + ':')) { url = androidStyle + url.substring(ANDROID_PKG.length() + 1); } else { @@ -1130,8 +1128,8 @@ public class Hyperlinks { ResourceType type = resource.getFirst(); String name = resource.getSecond(); - boolean isFramework = url.startsWith(PREFIX_ANDROID_RESOURCE_REF) - || url.startsWith(PREFIX_ANDROID_THEME_REF); + boolean isFramework = url.startsWith(ANDROID_PREFIX) + || url.startsWith(ANDROID_THEME_PREFIX); if (project == null) { // Local reference *within* a framework isFramework = true; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/OutlineLabelProvider.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/OutlineLabelProvider.java index f38c554..1d27e33 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/OutlineLabelProvider.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/OutlineLabelProvider.java @@ -13,26 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.ide.eclipse.adt.internal.editors; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NAME; -import static com.android.ide.common.layout.LayoutConstants.ATTR_SRC; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.common.layout.LayoutConstants.DRAWABLE_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.LAYOUT_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; +package com.android.ide.eclipse.adt.internal.editors; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_SRC; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.DRAWABLE_PREFIX; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; import org.eclipse.swt.graphics.Image; import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider; import org.w3c.dom.DOMException; import org.w3c.dom.Element; -/** Label provider for the XML outlines and quick outlines: Use our own icons, - * when available, and and include the most important attribute (id, name, or text) */ -@SuppressWarnings("restriction") // XML UI API +/** + * Label provider for the XML outlines and quick outlines: Use our own icons, + * when available, and and include the most important attribute (id, name, or + * text) + */ +@SuppressWarnings("restriction") +// XML UI API class OutlineLabelProvider extends JFaceNodeLabelProvider { @Override public Image getImage(Object element) { @@ -70,10 +74,10 @@ class OutlineLabelProvider extends JFaceNodeLabelProvider { id = id.substring(DRAWABLE_PREFIX.length()); } } else { - id = e.getAttribute(LayoutDescriptors.ATTR_LAYOUT); + id = e.getAttribute(ATTR_LAYOUT); if (id != null && id.length() > 0) { - if (id.startsWith(LAYOUT_PREFIX)) { - id = id.substring(LAYOUT_PREFIX.length()); + if (id.startsWith(LAYOUT_RESOURCE_PREFIX)) { + id = id.substring(LAYOUT_RESOURCE_PREFIX.length()); } } } @@ -81,7 +85,6 @@ class OutlineLabelProvider extends JFaceNodeLabelProvider { } } } - if (id != null && id.length() > 0) { return text + ": " + id; //$NON-NLS-1$ } @@ -92,8 +95,8 @@ class OutlineLabelProvider extends JFaceNodeLabelProvider { /** * Wrapper around {@link Element#getAttributeNS(String, String)}. * <p/> - * The implementation used in Eclipse's XML editor sometimes internally throws - * an NPE instead of politely returning null. + * The implementation used in Eclipse's XML editor sometimes internally + * throws an NPE instead of politely returning null. * * @see Element#getAttributeNS(String, String) */ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimDescriptors.java index 978b202..2489cf5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimDescriptors.java @@ -15,9 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.animator; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; - +import com.android.SdkConstants; import com.android.ide.common.resources.platform.DeclareStyleableInfo; import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.IDescriptorProvider; @@ -71,8 +69,8 @@ public class AnimDescriptors implements IDescriptorProvider { return; } - XmlnsAttributeDescriptor xmlns = new XmlnsAttributeDescriptor(ANDROID_NS_NAME, - ANDROID_URI); + XmlnsAttributeDescriptor xmlns = new XmlnsAttributeDescriptor(SdkConstants.ANDROID_NS_NAME, + SdkConstants.ANDROID_URI); List<ElementDescriptor> descriptors = new ArrayList<ElementDescriptor>(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimationContentAssist.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimationContentAssist.java index bd9114e..777cf1d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimationContentAssist.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimationContentAssist.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.animator; -import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_PKG; import com.android.annotations.VisibleForTesting; import com.android.ide.common.api.IAttributeInfo.Format; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimatorDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimatorDescriptors.java index efef5e7..713f6d9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimatorDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/animator/AnimatorDescriptors.java @@ -15,10 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.editors.animator; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; -import com.android.SdkConstants; import com.android.ide.common.resources.platform.DeclareStyleableInfo; import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.DescriptorsUtils; @@ -56,7 +55,7 @@ public class AnimatorDescriptors implements IDescriptorProvider { return mRootDescriptors; } - public ElementDescriptor getElementDescriptor(String mRootTag) { + ElementDescriptor getElementDescriptor(String rootTag) { if (nameToDescriptor == null) { nameToDescriptor = new HashMap<String, ElementDescriptor>(); for (ElementDescriptor descriptor : getRootElementDescriptors()) { @@ -64,7 +63,7 @@ public class AnimatorDescriptors implements IDescriptorProvider { } } - ElementDescriptor descriptor = nameToDescriptor.get(mRootTag); + ElementDescriptor descriptor = nameToDescriptor.get(rootTag); if (descriptor == null) { descriptor = getDescriptor(); } @@ -153,7 +152,7 @@ public class AnimatorDescriptors implements IDescriptorProvider { DescriptorsUtils.appendAttributes(descs, null, // elementName - SdkConstants.NS_RESOURCES, + ANDROID_URI, style.getAttributes(), null, // requiredAttributes null); // overrides @@ -164,7 +163,7 @@ public class AnimatorDescriptors implements IDescriptorProvider { if (style != null) { DescriptorsUtils.appendAttributes(descs, null, // elementName - SdkConstants.NS_RESOURCES, + ANDROID_URI, style.getAttributes(), null, // requiredAttributes null); // overrides diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/color/ColorDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/color/ColorDescriptors.java index fd6e7a4..16add3e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/color/ColorDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/color/ColorDescriptors.java @@ -15,10 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.editors.color; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; -import com.android.SdkConstants; import com.android.ide.common.api.IAttributeInfo.Format; import com.android.ide.common.resources.platform.AttributeInfo; import com.android.ide.common.resources.platform.DeclareStyleableInfo; @@ -77,7 +76,7 @@ public class ColorDescriptors implements IDescriptorProvider { SDK_URL, new ReferenceAttributeDescriptor( ResourceType.COLOR, ATTR_COLOR, - SdkConstants.NS_RESOURCES, + ANDROID_URI, new AttributeInfo(ATTR_COLOR, Format.COLOR_SET)).setTooltip( "Hexadeximal color. Required. The color is specified with an RGB value and " + "optional alpha channel.\n" diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/DescriptorsUtils.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/DescriptorsUtils.java index e6f296a..ff555cc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/DescriptorsUtils.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/DescriptorsUtils.java @@ -16,30 +16,30 @@ package com.android.ide.eclipse.adt.internal.editors.descriptors; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.common.layout.LayoutConstants.EDIT_TEXT; -import static com.android.ide.common.layout.LayoutConstants.EXPANDABLE_LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_ADAPTER_VIEW; -import static com.android.ide.common.layout.LayoutConstants.GALLERY; -import static com.android.ide.common.layout.LayoutConstants.GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.GRID_VIEW; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.RELATIVE_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.SPACE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.REQUEST_FOCUS; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_MERGE; -import static com.android.utils.XmlUtils.ANDROID_URI; -import static com.android.utils.XmlUtils.GT_ENTITY; -import static com.android.utils.XmlUtils.LT_ENTITY; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.EDIT_TEXT; +import static com.android.SdkConstants.EXPANDABLE_LIST_VIEW; +import static com.android.SdkConstants.FQCN_ADAPTER_VIEW; +import static com.android.SdkConstants.GALLERY; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.GT_ENTITY; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.LIST_VIEW; +import static com.android.SdkConstants.LT_ENTITY; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.REQUEST_FOCUS; +import static com.android.SdkConstants.SPACE; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; +import static com.android.SdkConstants.VIEW_INCLUDE; +import static com.android.SdkConstants.VIEW_MERGE; import com.android.SdkConstants; import com.android.annotations.NonNull; @@ -715,12 +715,12 @@ public final class DescriptorsUtils { node.getUiParent() instanceof UiDocumentNode; node.setAttributeValue( ATTR_LAYOUT_WIDTH, - SdkConstants.NS_RESOURCES, + ANDROID_URI, fill ? VALUE_FILL_PARENT : VALUE_WRAP_CONTENT, false /* override */); node.setAttributeValue( ATTR_LAYOUT_HEIGHT, - SdkConstants.NS_RESOURCES, + ANDROID_URI, fill ? VALUE_FILL_PARENT : VALUE_WRAP_CONTENT, false /* override */); } @@ -730,7 +730,7 @@ public final class DescriptorsUtils { if (freeId != null) { node.setAttributeValue( ATTR_ID, - SdkConstants.NS_RESOURCES, + ANDROID_URI, freeId, false /* override */); } @@ -744,7 +744,7 @@ public final class DescriptorsUtils { String type = getBasename(descriptor.getUiName()); node.setAttributeValue( ATTR_TEXT, - SdkConstants.NS_RESOURCES, + ANDROID_URI, type, false /*override*/); } @@ -761,7 +761,7 @@ public final class DescriptorsUtils { id = id.replace("@+", "@"); //$NON-NLS-1$ //$NON-NLS-2$ node.setAttributeValue( ATTR_LAYOUT_BELOW, - SdkConstants.NS_RESOURCES, + ANDROID_URI, id, false /* override */); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/ElementDescriptor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/ElementDescriptor.java index fb09b61..0d62ec0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/ElementDescriptor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/ElementDescriptor.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.descriptors; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.editors.IconFactory; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/XmlnsAttributeDescriptor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/XmlnsAttributeDescriptor.java index 22b09d4..39bb0f5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/XmlnsAttributeDescriptor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/descriptors/XmlnsAttributeDescriptor.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.descriptors; -import static com.android.utils.XmlUtils.XMLNS; -import static com.android.utils.XmlUtils.XMLNS_URI; +import static com.android.SdkConstants.XMLNS; +import static com.android.SdkConstants.XMLNS_URI; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiAttributeNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/drawable/DrawableDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/drawable/DrawableDescriptors.java index f269b79..4858ac7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/drawable/DrawableDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/drawable/DrawableDescriptors.java @@ -15,10 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.editors.drawable; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; -import com.android.SdkConstants; import com.android.ide.common.api.IAttributeInfo.Format; import com.android.ide.common.resources.platform.AttributeInfo; import com.android.ide.common.resources.platform.DeclareStyleableInfo; @@ -212,7 +211,7 @@ public class DrawableDescriptors implements IDescriptorProvider { + "its attributes. Must be a child of a <selector> element.", SDK_URL_BASE + "drawable-resource.html#StateList", //$NON-NLS-1$ new ReferenceAttributeDescriptor( - ResourceType.DRAWABLE, "drawable", SdkConstants.NS_RESOURCES, //$NON-NLS-1$ + ResourceType.DRAWABLE, "drawable", ANDROID_URI, //$NON-NLS-1$ new AttributeInfo("drawable", Format.REFERENCE_SET)) .setTooltip("Reference to a drawable resource."), null, /* This is wrong -- we can now embed any above drawable diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/AndroidXmlFormattingStrategy.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/AndroidXmlFormattingStrategy.java index 59073f6..9c29077 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/AndroidXmlFormattingStrategy.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/AndroidXmlFormattingStrategy.java @@ -18,7 +18,6 @@ package com.android.ide.eclipse.adt.internal.editors.formatting; import static com.android.ide.eclipse.adt.internal.editors.AndroidXmlAutoEditStrategy.findLineStart; import static com.android.ide.eclipse.adt.internal.editors.AndroidXmlAutoEditStrategy.findTextStart; import static com.android.ide.eclipse.adt.internal.editors.color.ColorDescriptors.SELECTOR_TAG; - import static org.eclipse.jface.text.formatter.FormattingContextProperties.CONTEXT_MEDIUM; import static org.eclipse.jface.text.formatter.FormattingContextProperties.CONTEXT_PARTITION; import static org.eclipse.jface.text.formatter.FormattingContextProperties.CONTEXT_REGION; @@ -31,7 +30,6 @@ import com.android.SdkConstants; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.DomUtilities; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs; import com.android.resources.ResourceType; @@ -512,7 +510,7 @@ public class AndroidXmlFormattingStrategy extends ContextBasedFormattingStrategy // integer-arrays, string-arrays, and typed-arrays Element rootElement = domDocument.getDocumentElement(); if (rootElement != null - && ValuesDescriptors.ROOT_ELEMENT.equals(rootElement.getTagName())) { + && SdkConstants.TAG_RESOURCES.equals(rootElement.getTagName())) { style = XmlFormatStyle.RESOURCE; } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/XmlPrettyPrinter.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/XmlPrettyPrinter.java index 57c10e3..6f15d83 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/XmlPrettyPrinter.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/formatting/XmlPrettyPrinter.java @@ -15,12 +15,12 @@ */ package com.android.ide.eclipse.adt.internal.editors.formatting; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.COLOR_ELEMENT; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.DIMEN_ELEMENT; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.ITEM_TAG; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.STRING_ELEMENT; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.STYLE_ELEMENT; -import static com.android.utils.XmlUtils.XMLNS; +import static com.android.SdkConstants.TAG_COLOR; +import static com.android.SdkConstants.TAG_DIMEN; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_STRING; +import static com.android.SdkConstants.TAG_STYLE; +import static com.android.SdkConstants.XMLNS; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -708,7 +708,7 @@ public class XmlPrettyPrinter { // element if (mPrefs.spaceBeforeClose && (mStyle != XmlFormatStyle.RESOURCE || isClosed) // in <selector> files etc still treat the <item> entries as in resource files - && !ITEM_TAG.equals(element.getTagName()) + && !TAG_ITEM.equals(element.getTagName()) && (isClosed || element.getAttributes().getLength() > 0)) { mOut.append(' '); } @@ -777,7 +777,7 @@ public class XmlPrettyPrinter { Node curr = element.getPreviousSibling(); // <style> elements are traditionally separated unless it follows a comment - if (STYLE_ELEMENT.equals(element.getTagName())) { + if (TAG_STYLE.equals(element.getTagName())) { if (curr == null || curr.getNodeType() == Node.ELEMENT_NODE || (curr.getNodeType() == Node.TEXT_NODE @@ -908,7 +908,7 @@ public class XmlPrettyPrinter { Node curr = element.getParentNode(); while (curr != null) { - if (STRING_ELEMENT.equals(curr.getNodeName())) { + if (TAG_STRING.equals(curr.getNodeName())) { return true; } @@ -928,10 +928,10 @@ public class XmlPrettyPrinter { private boolean isSingleLineTag(Element element) { String tag = element.getTagName(); - return (tag.equals(ITEM_TAG) && mStyle == XmlFormatStyle.RESOURCE) - || tag.equals(STRING_ELEMENT) - || tag.equals(DIMEN_ELEMENT) - || tag.equals(COLOR_ELEMENT); + return (tag.equals(TAG_ITEM) && mStyle == XmlFormatStyle.RESOURCE) + || tag.equals(TAG_STRING) + || tag.equals(TAG_DIMEN) + || tag.equals(TAG_COLOR); } private boolean keepElementAsSingleLine(int depth, Element element) { @@ -973,4 +973,4 @@ public class XmlPrettyPrinter { } return isClosed; } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.java index 26f5223..0eee47a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ContextPullParser.java @@ -16,13 +16,13 @@ package com.android.ide.eclipse.adt.internal.editors.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.ATTR_LAYOUT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; import static com.android.ide.eclipse.adt.internal.editors.layout.gle2.LayoutMetadata.KEY_FRAGMENT_LAYOUT; import com.android.SdkConstants; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java index e51f880..d9e798e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutReloadMonitor.java @@ -177,8 +177,8 @@ public final class LayoutReloadMonitor { public void fileChanged(@NonNull IFile file, @NonNull IMarkerDelta[] markerDeltas, int kind, @Nullable String extension, int flags) { // This listener only cares about .class files and AndroidManifest.xml files - if (!(AdtConstants.EXT_CLASS.equals(extension) - || AdtConstants.EXT_XML.equals(extension) + if (!(SdkConstants.EXT_CLASS.equals(extension) + || SdkConstants.EXT_XML.equals(extension) && SdkConstants.FN_ANDROID_MANIFEST_XML.equals(file.getName()))) { return; } @@ -233,7 +233,7 @@ public final class LayoutReloadMonitor { // here we only care about code change (so change for .class files). // Resource changes is handled by the IResourceListener. - if (AdtConstants.EXT_CLASS.equals(extension)) { + if (SdkConstants.EXT_CLASS.equals(extension)) { if (file.getName().matches("R[\\$\\.](.*)")) { // this is a R change! if (changeFlags == null) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java index 7a4b5ba..98f5317 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java @@ -16,15 +16,15 @@ package com.android.ide.eclipse.adt.internal.editors.layout; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_PKG_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.CALENDAR_VIEW; -import static com.android.ide.common.layout.LayoutConstants.EXPANDABLE_LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPINNER; -import static com.android.ide.common.layout.LayoutConstants.GRID_VIEW; -import static com.android.ide.common.layout.LayoutConstants.LIST_VIEW; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; +import static com.android.SdkConstants.ANDROID_PKG_PREFIX; +import static com.android.SdkConstants.CALENDAR_VIEW; +import static com.android.SdkConstants.EXPANDABLE_LIST_VIEW; +import static com.android.SdkConstants.FQCN_GRID_VIEW; +import static com.android.SdkConstants.FQCN_SPINNER; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.LIST_VIEW; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; import com.android.SdkConstants; import com.android.ide.common.rendering.LayoutLibrary; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParser.java index 46079d7..53f1e6b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/UiElementPullParser.java @@ -16,18 +16,17 @@ package com.android.ide.eclipse.adt.internal.editors.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_PADDING; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.ATTR_LAYOUT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; -import static com.android.tools.lint.detector.api.LintConstants.AUTO_URI; -import static com.android.utils.XmlUtils.ANDROID_URI; - -import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_PADDING; +import static com.android.SdkConstants.AUTO_URI; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; + import com.android.ide.common.rendering.api.ILayoutPullParser; import com.android.ide.common.rendering.api.ViewInfo; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; @@ -166,7 +165,7 @@ public class UiElementPullParser extends BasePullParser { ViewElementDescriptor descriptor = mDescriptors.findDescriptorByTag(xml); if (descriptor != null) { NamedNodeMap attributes = node.getXmlNode().getAttributes(); - Node padding = attributes.getNamedItemNS(SdkConstants.NS_RESOURCES, ATTR_PADDING); + Node padding = attributes.getNamedItemNS(ANDROID_URI, ATTR_PADDING); if (padding == null) { // we'll return an extra padding mZeroAttributeIsPadding = true; @@ -271,7 +270,7 @@ public class UiElementPullParser extends BasePullParser { public String getAttributeNamespace(int i) { if (mZeroAttributeIsPadding) { if (i == 0) { - return SdkConstants.NS_RESOURCES; + return ANDROID_URI; } else { i--; } @@ -294,7 +293,7 @@ public class UiElementPullParser extends BasePullParser { if (i == 0) { // figure out the prefix associated with the android namespace. Document doc = mRoot.getXmlDocument(); - return doc.lookupPrefix(SdkConstants.NS_RESOURCES); + return doc.lookupPrefix(ANDROID_URI); } else { i--; } @@ -325,7 +324,7 @@ public class UiElementPullParser extends BasePullParser { if (attribute != null) { String value = attribute.getNodeValue(); if (mIncreaseExistingPadding && ATTR_PADDING.equals(attribute.getLocalName()) && - SdkConstants.NS_RESOURCES.equals(attribute.getNamespaceURI())) { + ANDROID_URI.equals(attribute.getNamespaceURI())) { // add the padding and return the value return addPaddingToValue(value); } @@ -341,7 +340,7 @@ public class UiElementPullParser extends BasePullParser { @Override public String getAttributeValue(String namespace, String localName) { if (mExplodeNodes != null && ATTR_PADDING.equals(localName) && - SdkConstants.NS_RESOURCES.equals(namespace)) { + ANDROID_URI.equals(namespace)) { UiElementNode node = getCurrentNode(); if (node != null && mExplodeNodes.contains(node)) { return FIXED_PADDING_VALUE; @@ -349,7 +348,7 @@ public class UiElementPullParser extends BasePullParser { } if (mZeroAttributeIsPadding && ATTR_PADDING.equals(localName) && - SdkConstants.NS_RESOURCES.equals(namespace)) { + ANDROID_URI.equals(namespace)) { return DEFAULT_PADDING_VALUE; } @@ -380,7 +379,7 @@ public class UiElementPullParser extends BasePullParser { if (attribute != null) { String value = attribute.getNodeValue(); if (mIncreaseExistingPadding && ATTR_PADDING.equals(localName) && - SdkConstants.NS_RESOURCES.equals(namespace)) { + ANDROID_URI.equals(namespace)) { // add the padding and return the value return addPaddingToValue(value); } @@ -390,7 +389,7 @@ public class UiElementPullParser extends BasePullParser { if (VALUE_MATCH_PARENT.equals(value) && (ATTR_LAYOUT_WIDTH.equals(localName) || ATTR_LAYOUT_HEIGHT.equals(localName)) && - SdkConstants.NS_RESOURCES.equals(namespace)) { + ANDROID_URI.equals(namespace)) { return VALUE_FILL_PARENT; } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java index 4324b10..1dec5cd 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java @@ -16,15 +16,14 @@ package com.android.ide.eclipse.adt.internal.editors.layout.configuration; -import static com.android.AndroidConstants.FD_RES_LAYOUT; -import static com.android.AndroidConstants.RES_QUALIFIER_SEP; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_STYLE; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_STYLE; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_URI; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; - -import com.android.AndroidConstants; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.FD_RES_LAYOUT; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.RES_QUALIFIER_SEP; +import static com.android.SdkConstants.STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.TOOLS_URI; + import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.api.Rect; @@ -336,9 +335,9 @@ public class ConfigurationComposite extends Composite // can be mistaken for {@link #SEP}. Instead use {@link #MARKER_FRAMEWORK}. if (theme != null) { String themeName = ResourceHelper.styleToTheme(theme); - if (theme.startsWith(PREFIX_STYLE)) { + if (theme.startsWith(STYLE_RESOURCE_PREFIX)) { sb.append(MARKER_PROJECT); - } else if (theme.startsWith(PREFIX_ANDROID_STYLE)) { + } else if (theme.startsWith(ANDROID_STYLE_RESOURCE_PREFIX)) { sb.append(MARKER_FRAMEWORK); } sb.append(themeName); @@ -396,10 +395,11 @@ public class ConfigurationComposite extends Composite // Decode the theme name: See {@link #getData} theme = values[3]; if (theme.startsWith(MARKER_FRAMEWORK)) { - theme = PREFIX_ANDROID_STYLE + theme = ANDROID_STYLE_RESOURCE_PREFIX + theme.substring(MARKER_FRAMEWORK.length()); } else if (theme.startsWith(MARKER_PROJECT)) { - theme = PREFIX_STYLE + theme.substring(MARKER_PROJECT.length()); + theme = STYLE_RESOURCE_PREFIX + + theme.substring(MARKER_PROJECT.length()); } uiMode = UiMode.getEnum(values[4]); @@ -1102,7 +1102,8 @@ public class ConfigurationComposite extends Composite } void selectTheme(String theme) { - assert theme.startsWith(PREFIX_STYLE) || theme.startsWith(PREFIX_ANDROID_STYLE) : theme; + assert theme.startsWith(STYLE_RESOURCE_PREFIX) + || theme.startsWith(ANDROID_STYLE_RESOURCE_PREFIX) : theme; mThemeCombo.setData(theme); if (theme != null) { mThemeCombo.setText(getThemeLabel(theme, true)); @@ -1686,7 +1687,7 @@ public class ConfigurationComposite extends Composite //String current = fileConfig.toDisplayString(); //String current = fileConfig.getFolderName(ResourceFolderType.LAYOUT); String current = mEditedFile.getParent().getName(); - if (current.equals(AndroidConstants.FD_RES_LAYOUT)) { + if (current.equals(FD_RES_LAYOUT)) { current = "default"; } @@ -2396,7 +2397,7 @@ public class ConfigurationComposite extends Composite for (String theme : themes) { if (!theme.startsWith(PREFIX_RESOURCE_REF)) { - theme = PREFIX_STYLE + theme; + theme = STYLE_RESOURCE_PREFIX + theme; } mThemeList.add(theme); } @@ -2428,7 +2429,7 @@ public class ConfigurationComposite extends Composite for (String theme : themes) { if (!theme.startsWith(PREFIX_RESOURCE_REF)) { - theme = PREFIX_ANDROID_STYLE + theme; + theme = ANDROID_STYLE_RESOURCE_PREFIX + theme; } mThemeList.add(theme); } @@ -2442,8 +2443,8 @@ public class ConfigurationComposite extends Composite // or a framework style. For now we need to migrate. Search through the // theme list until we have a match if (!mState.theme.startsWith(PREFIX_RESOURCE_REF)) { - String projectStyle = PREFIX_STYLE + mState.theme; - String frameworkStyle = PREFIX_ANDROID_STYLE + mState.theme; + String projectStyle = STYLE_RESOURCE_PREFIX + mState.theme; + String frameworkStyle = ANDROID_STYLE_RESOURCE_PREFIX + mState.theme; for (String theme : mThemeList) { if (theme.equals(projectStyle)) { mState.theme = projectStyle; @@ -2656,7 +2657,8 @@ public class ConfigurationComposite extends Composite public boolean isProjectTheme() { String theme = getSelectedTheme(); if (theme != null) { - assert theme.startsWith(PREFIX_STYLE) || theme.startsWith(PREFIX_ANDROID_STYLE); + assert theme.startsWith(STYLE_RESOURCE_PREFIX) + || theme.startsWith(ANDROID_STYLE_RESOURCE_PREFIX); return ResourceHelper.isProjectStyle(theme); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java index 8d92d3c..a8f6504 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/SelectThemeAction.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.layout.configuration; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_STYLE; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_STYLE; +import static com.android.SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.STYLE_RESOURCE_PREFIX; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -33,7 +33,8 @@ class SelectThemeAction extends Action { public SelectThemeAction(ConfigurationComposite configuration, String title, String theme, boolean selected) { super(title, IAction.AS_RADIO_BUTTON); - assert theme.startsWith(PREFIX_STYLE) || theme.startsWith(PREFIX_ANDROID_STYLE) : theme; + assert theme.startsWith(STYLE_RESOURCE_PREFIX) + || theme.startsWith(ANDROID_STYLE_RESOURCE_PREFIX) : theme; mConfiguration = configuration; mTheme = theme; if (selected) { @@ -46,4 +47,4 @@ class SelectThemeAction extends Action { mConfiguration.selectTheme(mTheme); mConfiguration.onThemeChange(); } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java index 0836709..7d8c487 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ThemeMenuAction.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.editors.layout.configuration; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_STYLE; +import static com.android.SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX; import com.android.ide.eclipse.adt.internal.editors.Hyperlinks; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.SubmenuAction; @@ -49,17 +49,17 @@ import java.util.Set; */ class ThemeMenuAction extends SubmenuAction { private static final String DEVICE_LIGHT_PREFIX = - PREFIX_ANDROID_STYLE + "Theme.DeviceDefault.Light"; //$NON-NLS-1$ + ANDROID_STYLE_RESOURCE_PREFIX + "Theme.DeviceDefault.Light"; //$NON-NLS-1$ private static final String HOLO_LIGHT_PREFIX = - PREFIX_ANDROID_STYLE + "Theme.Holo.Light"; //$NON-NLS-1$ + ANDROID_STYLE_RESOURCE_PREFIX + "Theme.Holo.Light"; //$NON-NLS-1$ private static final String DEVICE_PREFIX = - PREFIX_ANDROID_STYLE + "Theme.DeviceDefault"; //$NON-NLS-1$ + ANDROID_STYLE_RESOURCE_PREFIX + "Theme.DeviceDefault"; //$NON-NLS-1$ private static final String HOLO_PREFIX = - PREFIX_ANDROID_STYLE + "Theme.Holo"; //$NON-NLS-1$ + ANDROID_STYLE_RESOURCE_PREFIX + "Theme.Holo"; //$NON-NLS-1$ private static final String LIGHT_PREFIX = - PREFIX_ANDROID_STYLE +"Theme.Light"; //$NON-NLS-1$ + ANDROID_STYLE_RESOURCE_PREFIX +"Theme.Light"; //$NON-NLS-1$ private static final String THEME_PREFIX = - PREFIX_ANDROID_STYLE +"Theme"; //$NON-NLS-1$ + ANDROID_STYLE_RESOURCE_PREFIX +"Theme"; //$NON-NLS-1$ // Constants used to indicate what type of menu is being shown, such that // the submenus can lazily construct their contents diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/CustomViewDescriptorService.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/CustomViewDescriptorService.java index 330c7d4..ca229a4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/CustomViewDescriptorService.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/CustomViewDescriptorService.java @@ -16,11 +16,11 @@ package com.android.ide.eclipse.adt.internal.editors.layout.descriptors; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.AUTO_URI; import static com.android.SdkConstants.CLASS_VIEWGROUP; -import static com.android.tools.lint.detector.api.LintConstants.AUTO_URI; -import static com.android.tools.lint.detector.api.LintConstants.URI_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.URI_PREFIX; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/LayoutDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/LayoutDescriptors.java index fb8cc25..15dc356 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/LayoutDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/LayoutDescriptors.java @@ -16,11 +16,16 @@ package com.android.ide.eclipse.adt.internal.editors.layout.descriptors; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CLASS; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NAME; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TAG; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GESTURE_OVERLAY_VIEW; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_TAG; +import static com.android.SdkConstants.FQCN_GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.REQUEST_FOCUS; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; +import static com.android.SdkConstants.VIEW_MERGE; import com.android.SdkConstants; import com.android.ide.common.api.IAttributeInfo.Format; @@ -50,54 +55,6 @@ import java.util.Map.Entry; * Complete description of the layout structure. */ public final class LayoutDescriptors implements IDescriptorProvider { - - /** - * The XML name of the special {@code <include>} layout tag. - * A synthetic element with that name is created as part of the view descriptors list - * returned by {@link #getViewDescriptors()}. - */ - public static final String VIEW_INCLUDE = "include"; //$NON-NLS-1$ - - /** - * The XML name of the special {@code <merge>} layout tag. - * A synthetic element with that name is created as part of the view descriptors list - * returned by {@link #getViewDescriptors()}. - */ - public static final String VIEW_MERGE = "merge"; //$NON-NLS-1$ - - /** - * The XML name of the special {@code <fragment>} layout tag. - * A synthetic element with that name is created as part of the view descriptors list - * returned by {@link #getViewDescriptors()}. - */ - public static final String VIEW_FRAGMENT = "fragment"; //$NON-NLS-1$ - - /** - * The XML name of the special {@code <view>} layout tag. This is used to add generic - * views with a class attribute to specify the view. - * <p> - * TODO: We should add a synthetic descriptor for this, similar to our descriptors for - * include, merge and requestFocus. - */ - public static final String VIEW_VIEWTAG = "view"; //$NON-NLS-1$ - - /** - * The XML name of the special {@code <requestFocus>} layout tag. - * A synthetic element with that name is created as part of the view descriptors list - * returned by {@link #getViewDescriptors()}. - */ - public static final String REQUEST_FOCUS = "requestFocus";//$NON-NLS-1$ - - /** - * The attribute name of the include tag's url naming the resource to be inserted - * <p> - * <b>NOTE</b>: The layout attribute is NOT in the Android namespace! - */ - public static final String ATTR_LAYOUT = "layout"; //$NON-NLS-1$ - - // Public attributes names, attributes descriptors and elements descriptors - public static final String ID_ATTR = "id"; //$NON-NLS-1$ - /** The document descriptor. Contains all layouts and views linked together. */ private DocumentDescriptor mRootDescriptor = new DocumentDescriptor("layout_doc", null); //$NON-NLS-1$ @@ -288,7 +245,7 @@ public final class LayoutDescriptors implements IDescriptorProvider { // Process all View attributes DescriptorsUtils.appendAttributes(attributes, null, // elementName - SdkConstants.NS_RESOURCES, + ANDROID_URI, info.getAttributes(), null, // requiredAttributes null /* overrides */); @@ -306,7 +263,7 @@ public final class LayoutDescriptors implements IDescriptorProvider { attributeSources.add(link.getFullClassName()); DescriptorsUtils.appendAttributes(attributes, null, // elementName - SdkConstants.NS_RESOURCES, + ANDROID_URI, attrList, null, // requiredAttributes null /* overrides */); @@ -320,12 +277,12 @@ public final class LayoutDescriptors implements IDescriptorProvider { for(; layoutParams != null; layoutParams = layoutParams.getSuperClass()) { for (AttributeInfo attrInfo : layoutParams.getAttributes()) { if (DescriptorsUtils.containsAttribute(layoutAttributes, - SdkConstants.NS_RESOURCES, attrInfo)) { + ANDROID_URI, attrInfo)) { continue; } DescriptorsUtils.appendAttribute(layoutAttributes, null, // elementName - SdkConstants.NS_RESOURCES, + ANDROID_URI, attrInfo, false, // required null /* overrides */); @@ -371,7 +328,7 @@ public final class LayoutDescriptors implements IDescriptorProvider { DescriptorsUtils.appendAttribute(attributes, null, //elementXmlName - SdkConstants.NS_RESOURCES, //nsUri + ANDROID_URI, //nsUri new AttributeInfo( "id", //$NON-NLS-1$ Format.REFERENCE_SET ), @@ -455,7 +412,7 @@ public final class LayoutDescriptors implements IDescriptorProvider { descs.add(classAttribute); DescriptorsUtils.appendAttributes(descs, null, // elementName - SdkConstants.NS_RESOURCES, + ANDROID_URI, style.getAttributes(), null, // requiredAttributes null); // overrides diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/ViewElementDescriptor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/ViewElementDescriptor.java index fdfe191..466720a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/ViewElementDescriptor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/descriptors/ViewElementDescriptor.java @@ -16,9 +16,9 @@ package com.android.ide.eclipse.adt.internal.editors.layout.descriptors; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_VIEW_PKG; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WEBKIT_PKG; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.ANDROID_VIEW_PKG; +import static com.android.SdkConstants.ANDROID_WEBKIT_PKG; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; import com.android.ide.common.resources.platform.AttributeInfo; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java index a443a9d..0298fbb 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasViewInfo.java @@ -16,11 +16,12 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE_V7; -import static com.android.ide.common.layout.LayoutConstants.GESTURE_OVERLAY_VIEW; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_MERGE; +import static com.android.SdkConstants.FQCN_SPACE; +import static com.android.SdkConstants.FQCN_SPACE_V7; +import static com.android.SdkConstants.GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.VIEW_MERGE; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.api.Margins; @@ -31,7 +32,6 @@ import com.android.ide.common.rendering.api.MergeCookie; import com.android.ide.common.rendering.api.ViewInfo; import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.layout.UiElementPullParser; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; import com.android.ide.eclipse.adt.internal.editors.layout.uimodel.UiViewElementNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiAttributeNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; @@ -566,14 +566,14 @@ public class CanvasViewInfo implements IPropertySource { if (node != null && node.getNodeType() == Node.ELEMENT_NODE) { String nodeName = node.getNodeName(); if (node.getNamespaceURI() == null - && LayoutDescriptors.VIEW_INCLUDE.equals(nodeName)) { + && SdkConstants.VIEW_INCLUDE.equals(nodeName)) { // Note: the layout attribute is NOT in the Android namespace Element element = (Element) node; - String url = element.getAttribute(LayoutDescriptors.ATTR_LAYOUT); + String url = element.getAttribute(SdkConstants.ATTR_LAYOUT); if (url.length() > 0) { return url; } - } else if (LayoutDescriptors.VIEW_FRAGMENT.equals(nodeName)) { + } else if (SdkConstants.VIEW_FRAGMENT.equals(nodeName)) { String url = FragmentMenu.getFragmentLayout(node); if (url != null) { return url; @@ -910,7 +910,7 @@ public class CanvasViewInfo implements IPropertySource { UiViewElementNode uiViewNode = view.getUiViewNode(); String containerName = uiViewNode != null ? uiViewNode.getDescriptor().getXmlLocalName() : ""; //$NON-NLS-1$ - if (containerName.equals(LayoutDescriptors.VIEW_INCLUDE)) { + if (containerName.equals(SdkConstants.VIEW_INCLUDE)) { // This is expected -- we don't WANT to get node keys for the content // of an include since it's in a different file and should be treated // as a single unit that cannot be edited (hence, no CanvasViewInfo diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java index 22666a2..3f9c13b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ClipboardSupport.java @@ -15,7 +15,10 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.NS_RESOURCES; +import static com.android.SdkConstants.XMLNS_URI; + import com.android.ide.common.api.IDragElement; import com.android.ide.common.api.IDragElement.IDragAttribute; import com.android.ide.common.api.INode; @@ -28,7 +31,6 @@ import com.android.ide.eclipse.adt.internal.editors.layout.gre.RulesEngine; import com.android.ide.eclipse.adt.internal.editors.layout.uimodel.UiViewElementNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiDocumentNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; -import com.android.utils.XmlUtils; import org.eclipse.jface.action.Action; import org.eclipse.swt.custom.StyledText; @@ -338,10 +340,7 @@ public class ClipboardSupport { UiElementNode uiNew = uiDoc.appendNewUiChild(viewDesc); // A root node requires the Android XMLNS - uiNew.setAttributeValue( - XmlUtils.ANDROID_NS_NAME, - XmlUtils.XMLNS_URI, - SdkConstants.NS_RESOURCES, + uiNew.setAttributeValue(ANDROID_NS_NAME, XMLNS_URI, NS_RESOURCES, true /*override*/); // Copy all the attributes from the pasted element diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilities.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilities.java index bb4fbda..1625195 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilities.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilities.java @@ -15,14 +15,16 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_URI; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.TOOLS_URI; + import static org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML.ContentTypeID_XML; +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DynamicContextMenu.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DynamicContextMenu.java index 27c98d0..fc71272 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DynamicContextMenu.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DynamicContextMenu.java @@ -16,17 +16,17 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.EXPANDABLE_LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GESTURE_OVERLAY_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_IMAGE_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_TEXT_VIEW; -import static com.android.ide.common.layout.LayoutConstants.GRID_VIEW; -import static com.android.ide.common.layout.LayoutConstants.LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.SPINNER; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.EXPANDABLE_LIST_VIEW; +import static com.android.SdkConstants.FQCN_GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.FQCN_IMAGE_VIEW; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; +import static com.android.SdkConstants.FQCN_TEXT_VIEW; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.LIST_VIEW; +import static com.android.SdkConstants.SPINNER; +import static com.android.SdkConstants.VIEW_FRAGMENT; import com.android.SdkConstants; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ExportScreenshotAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ExportScreenshotAction.java index 8b3dec1..6829c40 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ExportScreenshotAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ExportScreenshotAction.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_PNG; +import static com.android.SdkConstants.DOT_PNG; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/FragmentMenu.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/FragmentMenu.java index 28a477b..0dbd152 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/FragmentMenu.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/FragmentMenu.java @@ -15,13 +15,15 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CLASS; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NAME; -import static com.android.ide.common.layout.LayoutConstants.LAYOUT_PREFIX; +import static com.android.SdkConstants.ANDROID_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; import static com.android.ide.eclipse.adt.internal.editors.layout.gle2.LayoutMetadata.KEY_FRAGMENT_LAYOUT; -import static com.android.utils.XmlUtils.ANDROID_URI; + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.resources.ResourceRepository; @@ -58,7 +60,7 @@ import java.util.List; * Fragment context menu allowing a layout to be chosen for previewing in the fragment frame. */ public class FragmentMenu extends SubmenuAction { - private static final String R_LAYOUT_PREFIX = "R.layout."; //$NON-NLS-1$ + private static final String R_LAYOUT_RESOURCE_PREFIX = "R.layout."; //$NON-NLS-1$ private static final String ANDROID_R_PREFIX = "android.R.layout"; //$NON-NLS-1$ /** Associated canvas */ @@ -94,8 +96,8 @@ public class FragmentMenu extends SubmenuAction { String selected = getSelectedLayout(); if (selected != null) { - if (selected.startsWith(ANDROID_LAYOUT_PREFIX)) { - selected = selected.substring(ANDROID_LAYOUT_PREFIX.length()); + if (selected.startsWith(ANDROID_LAYOUT_RESOURCE_PREFIX)) { + selected = selected.substring(ANDROID_LAYOUT_RESOURCE_PREFIX.length()); } } @@ -129,11 +131,11 @@ public class FragmentMenu extends SubmenuAction { int index = 0; while (true) { - index = source.indexOf(R_LAYOUT_PREFIX, index); + index = source.indexOf(R_LAYOUT_RESOURCE_PREFIX, index); if (index == -1) { break; } else { - index += R_LAYOUT_PREFIX.length(); + index += R_LAYOUT_RESOURCE_PREFIX.length(); int end = index; while (end < source.length()) { char c = source.charAt(end); @@ -148,9 +150,9 @@ public class FragmentMenu extends SubmenuAction { // Is this R.layout part of an android.R.layout? int len = ANDROID_R_PREFIX.length() + 1; // prefix length to check if (index > len && source.startsWith(ANDROID_R_PREFIX, index - len)) { - layout = ANDROID_LAYOUT_PREFIX + title; + layout = ANDROID_LAYOUT_RESOURCE_PREFIX + title; } else { - layout = LAYOUT_PREFIX + title; + layout = LAYOUT_RESOURCE_PREFIX + title; } if (!self.equals(title)) { layouts.add(Pair.of(title, layout)); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java index ded2f76..0f1b373 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/GraphicalEditorPart.java @@ -17,25 +17,26 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; import static com.android.SdkConstants.FD_GEN_SOURCES; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_STRING_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.SCROLL_VIEW; -import static com.android.ide.common.layout.LayoutConstants.STRING_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG; +import static com.android.SdkConstants.ANDROID_STRING_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.SCROLL_VIEW; +import static com.android.SdkConstants.STRING_PREFIX; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; +import static com.android.SdkConstants.ANDROID_PKG; import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor.viewNeedsPackage; -import static com.android.utils.XmlUtils.ANDROID_URI; + import static org.eclipse.wb.core.controls.flyout.IFlyoutPreferences.DOCK_EAST; import static org.eclipse.wb.core.controls.flyout.IFlyoutPreferences.DOCK_WEST; import static org.eclipse.wb.core.controls.flyout.IFlyoutPreferences.STATE_COLLAPSED; import static org.eclipse.wb.core.controls.flyout.IFlyoutPreferences.STATE_OPEN; import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.ide.common.api.Rect; import com.android.ide.common.layout.BaseLayoutRule; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageUtils.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageUtils.java index aae1f99..0178173 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageUtils.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageUtils.java @@ -15,11 +15,11 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_9PNG; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_BMP; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_GIF; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_JPG; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_PNG; +import static com.android.SdkConstants.DOT_9PNG; +import static com.android.SdkConstants.DOT_BMP; +import static com.android.SdkConstants.DOT_GIF; +import static com.android.SdkConstants.DOT_JPG; +import static com.android.SdkConstants.DOT_PNG; import static com.android.ide.eclipse.adt.AdtUtils.endsWithIgnoreCase; import com.android.annotations.NonNull; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java index ca345b6..0b8f784 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/IncludeFinder.java @@ -16,24 +16,24 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.AndroidConstants.FD_RES_LAYOUT; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.EXT_XML; +import static com.android.SdkConstants.FD_RESOURCES; +import static com.android.SdkConstants.FD_RES_LAYOUT; +import static com.android.SdkConstants.VIEW_INCLUDE; import static com.android.ide.eclipse.adt.AdtConstants.WS_LAYOUTS; import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP; import static com.android.resources.ResourceType.LAYOUT; - import static org.eclipse.core.resources.IResourceDelta.ADDED; import static org.eclipse.core.resources.IResourceDelta.CHANGED; import static org.eclipse.core.resources.IResourceDelta.CONTENT; import static org.eclipse.core.resources.IResourceDelta.REMOVED; -import com.android.SdkConstants; import com.android.annotations.VisibleForTesting; import com.android.ide.common.resources.ResourceFile; import com.android.ide.common.resources.ResourceFolder; import com.android.ide.common.resources.ResourceItem; import com.android.ide.eclipse.adt.AdtPlugin; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper; import com.android.ide.eclipse.adt.internal.resources.manager.ProjectResources; import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager; @@ -529,12 +529,12 @@ public class IncludeFinder { /** Searches the given DOM document and returns the list of includes, if any */ private List<String> findIncludesInDocument(Document document) { - NodeList includes = document.getElementsByTagName(LayoutDescriptors.VIEW_INCLUDE); + NodeList includes = document.getElementsByTagName(VIEW_INCLUDE); if (includes.getLength() > 0) { List<String> urls = new ArrayList<String>(); for (int i = 0; i < includes.getLength(); i++) { Element element = (Element) includes.item(i); - String url = element.getAttribute(LayoutDescriptors.ATTR_LAYOUT); + String url = element.getAttribute(ATTR_LAYOUT); if (url.length() > 0) { String resourceName = urlToLocalResource(url); if (resourceName != null) { @@ -921,7 +921,7 @@ public class IncludeFinder { reference = FD_RES_LAYOUT + WS_SEP + reference; } - String projectPath = SdkConstants.FD_RESOURCES + WS_SEP + reference + '.' + EXT_XML; + String projectPath = FD_RESOURCES + WS_SEP + reference + '.' + EXT_XML; IResource member = mProject.findMember(projectPath); if (member instanceof IFile) { return (IFile) member; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutActionBar.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutActionBar.java index 37f44bf..285cba2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutActionBar.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutActionBar.java @@ -15,9 +15,11 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.ide.common.api.INode; import com.android.ide.common.api.RuleAction; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutCanvas.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutCanvas.java index 78c8cba..6eb5f27 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutCanvas.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutCanvas.java @@ -37,7 +37,6 @@ import com.android.ide.eclipse.adt.internal.editors.uimodel.UiDocumentNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; import com.android.ide.eclipse.adt.internal.lint.LintEditAction; import com.android.resources.Density; -import com.android.utils.XmlUtils; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; @@ -1507,8 +1506,8 @@ public class LayoutCanvas extends Canvas { // A root node requires the Android XMLNS uiNew.setAttributeValue( - XmlUtils.ANDROID_NS_NAME, - XmlUtils.XMLNS_URI, + SdkConstants.ANDROID_NS_NAME, + SdkConstants.XMLNS_URI, SdkConstants.NS_RESOURCES, true /*override*/); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java index 7b669bd..a164e3d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadata.java @@ -15,14 +15,16 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NUM_COLUMNS; -import static com.android.ide.common.layout.LayoutConstants.EXPANDABLE_LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.GRID_VIEW; -import static com.android.ide.common.layout.LayoutConstants.LAYOUT_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_URI; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_NUM_COLUMNS; +import static com.android.SdkConstants.EXPANDABLE_LIST_VIEW; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.TOOLS_URI; + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.rendering.api.AdapterBinding; @@ -359,10 +361,10 @@ public class LayoutMetadata { /** Strips out @layout/ or @android:layout/ from the given layout reference */ private static String stripLayoutPrefix(String layout) { - if (layout.startsWith(ANDROID_LAYOUT_PREFIX)) { - layout = layout.substring(ANDROID_LAYOUT_PREFIX.length()); - } else if (layout.startsWith(LAYOUT_PREFIX)) { - layout = layout.substring(LAYOUT_PREFIX.length()); + if (layout.startsWith(ANDROID_LAYOUT_RESOURCE_PREFIX)) { + layout = layout.substring(ANDROID_LAYOUT_RESOURCE_PREFIX.length()); + } else if (layout.startsWith(LAYOUT_RESOURCE_PREFIX)) { + layout = layout.substring(LAYOUT_RESOURCE_PREFIX.length()); } return layout; @@ -401,23 +403,23 @@ public class LayoutMetadata { AdapterBinding binding = new AdapterBinding(count); if (header != null) { - boolean isFramework = header.startsWith(ANDROID_LAYOUT_PREFIX); + boolean isFramework = header.startsWith(ANDROID_LAYOUT_RESOURCE_PREFIX); binding.addHeader(new ResourceReference(stripLayoutPrefix(header), isFramework)); } if (footer != null) { - boolean isFramework = footer.startsWith(ANDROID_LAYOUT_PREFIX); + boolean isFramework = footer.startsWith(ANDROID_LAYOUT_RESOURCE_PREFIX); binding.addFooter(new ResourceReference(stripLayoutPrefix(footer), isFramework)); } if (layout != null) { - boolean isFramework = layout.startsWith(ANDROID_LAYOUT_PREFIX); + boolean isFramework = layout.startsWith(ANDROID_LAYOUT_RESOURCE_PREFIX); if (isFramework) { - layout = layout.substring(ANDROID_LAYOUT_PREFIX.length()); - } else if (layout.startsWith(LAYOUT_PREFIX)) { - layout = layout.substring(LAYOUT_PREFIX.length()); + layout = layout.substring(ANDROID_LAYOUT_RESOURCE_PREFIX.length()); + } else if (layout.startsWith(LAYOUT_RESOURCE_PREFIX)) { + layout = layout.substring(LAYOUT_RESOURCE_PREFIX.length()); } binding.addItem(new DataBindingItem(layout, isFramework, 1)); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintTooltip.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintTooltip.java index bc2f390..cedd436 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintTooltip.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LintTooltip.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_ID; import com.android.ide.common.layout.BaseLayoutRule; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ListViewTypeMenu.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ListViewTypeMenu.java index d840c30..076b11a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ListViewTypeMenu.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ListViewTypeMenu.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_LAYOUT_PREFIX; +import static com.android.SdkConstants.ANDROID_LAYOUT_RESOURCE_PREFIX; import static com.android.ide.eclipse.adt.internal.editors.layout.gle2.LayoutMetadata.KEY_LV_FOOTER; import static com.android.ide.eclipse.adt.internal.editors.layout.gle2.LayoutMetadata.KEY_LV_HEADER; import static com.android.ide.eclipse.adt.internal.editors.layout.gle2.LayoutMetadata.KEY_LV_ITEM; @@ -80,8 +80,8 @@ public class ListViewTypeMenu extends SubmenuAction { String selected = getSelectedLayout(); if (selected != null) { - if (selected.startsWith(ANDROID_LAYOUT_PREFIX)) { - selected = selected.substring(ANDROID_LAYOUT_PREFIX.length()); + if (selected.startsWith(ANDROID_LAYOUT_RESOURCE_PREFIX)) { + selected = selected.substring(ANDROID_LAYOUT_RESOURCE_PREFIX.length()); } } @@ -151,7 +151,7 @@ public class ListViewTypeMenu extends SubmenuAction { @Override public void run() { if (isChecked()) { - setNewType(KEY_LV_ITEM, ANDROID_LAYOUT_PREFIX + mLayout); + setNewType(KEY_LV_ITEM, ANDROID_LAYOUT_RESOURCE_PREFIX + mLayout); } } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java index f9a3e02..8178c68 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/OutlinePage.java @@ -16,25 +16,25 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_COLUMN_COUNT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ROW_COUNT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_SRC; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.common.layout.LayoutConstants.DRAWABLE_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.LAYOUT_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.AUTO_URI; -import static com.android.tools.lint.detector.api.LintConstants.URI_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; - +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_COLUMN_COUNT; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW_SPAN; +import static com.android.SdkConstants.ATTR_ROW_COUNT; +import static com.android.SdkConstants.ATTR_SRC; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.AUTO_URI; +import static com.android.SdkConstants.DRAWABLE_PREFIX; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.URI_PREFIX; import static org.eclipse.jface.viewers.StyledString.COUNTER_STYLER; import static org.eclipse.jface.viewers.StyledString.QUALIFIER_STYLER; +import com.android.SdkConstants; import com.android.annotations.VisibleForTesting; import com.android.ide.common.api.INode; import com.android.ide.common.api.InsertType; @@ -45,7 +45,6 @@ import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.editors.IconFactory; import com.android.ide.eclipse.adt.internal.editors.descriptors.DescriptorsUtils; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.IncludeFinder.Reference; import com.android.ide.eclipse.adt.internal.editors.layout.gre.NodeProxy; import com.android.ide.eclipse.adt.internal.editors.layout.properties.PropertySheetPage; @@ -918,14 +917,14 @@ public class OutlinePage extends ContentOutlinePage styledString.append(LABEL_SEPARATOR, QUALIFIER_STYLER); styledString.append(truncate(src, styledString), QUALIFIER_STYLER); } - } else if (e.getTagName().equals(LayoutDescriptors.VIEW_INCLUDE)) { + } else if (e.getTagName().equals(SdkConstants.VIEW_INCLUDE)) { // Show the include reference. // Note: the layout attribute is NOT in the Android namespace - String src = e.getAttribute(LayoutDescriptors.ATTR_LAYOUT); + String src = e.getAttribute(SdkConstants.ATTR_LAYOUT); if (src != null && src.length() > 0) { - if (src.startsWith(LAYOUT_PREFIX)) { - src = src.substring(LAYOUT_PREFIX.length()); + if (src.startsWith(LAYOUT_RESOURCE_PREFIX)) { + src = src.substring(LAYOUT_RESOURCE_PREFIX.length()); } styledString.append(LABEL_SEPARATOR, QUALIFIER_STYLER); styledString.append(truncate(src, styledString), QUALIFIER_STYLER); @@ -938,7 +937,7 @@ public class OutlinePage extends ContentOutlinePage if (includedWithin != null) { styledString = new StyledString(); styledString.append(includedWithin.getDisplayName(), QUALIFIER_STYLER); - image = IconFactory.getInstance().getIcon(LayoutDescriptors.VIEW_INCLUDE); + image = IconFactory.getInstance().getIcon(SdkConstants.VIEW_INCLUDE); } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java index dcb2d96..a3be5cc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java @@ -16,13 +16,13 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.utils.XmlUtils.ANDROID_URI; -import static com.android.utils.XmlUtils.XMLNS_ANDROID; -import static com.android.utils.XmlUtils.XMLNS_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; +import static com.android.SdkConstants.XMLNS_ANDROID; +import static com.android.SdkConstants.XMLNS_URI; import com.android.ide.common.api.InsertType; import com.android.ide.common.api.Rect; @@ -925,10 +925,8 @@ public class PaletteControl extends Composite { attr.setValue(ANDROID_URI); element.getAttributes().setNamedItemNS(attr); - element.setAttributeNS(ANDROID_URI, - ATTR_LAYOUT_WIDTH, VALUE_WRAP_CONTENT); - element.setAttributeNS(ANDROID_URI, - ATTR_LAYOUT_HEIGHT, VALUE_WRAP_CONTENT); + element.setAttributeNS(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_WRAP_CONTENT); + element.setAttributeNS(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_WRAP_CONTENT); // This doesn't apply to all, but doesn't seem to cause harm and makes for a // better experience with text-oriented views like buttons and texts diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java index c531848..629a42f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.AndroidConstants.FD_RES_ANIMATOR; import static com.android.SdkConstants.FD_RESOURCES; +import static com.android.SdkConstants.FD_RES_ANIMATOR; import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP; import com.android.ide.common.rendering.api.Capability; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java index 345cfe2..e68c47c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PreviewIconFactory.java @@ -16,11 +16,11 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.FQCN_DATE_PICKER; -import static com.android.ide.common.layout.LayoutConstants.FQCN_EXPANDABLE_LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LIST_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_TIME_PICKER; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_PNG; +import static com.android.SdkConstants.FQCN_DATE_PICKER; +import static com.android.SdkConstants.FQCN_EXPANDABLE_LIST_VIEW; +import static com.android.SdkConstants.FQCN_LIST_VIEW; +import static com.android.SdkConstants.FQCN_TIME_PICKER; +import static com.android.SdkConstants.DOT_PNG; import com.android.ide.common.rendering.LayoutLibrary; import com.android.ide.common.rendering.api.Capability; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java index b4b4433..8f6eb56 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/RenderService.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.LAYOUT_PREFIX; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; import com.android.ide.common.api.IClientRulesEngine; import com.android.ide.common.api.INode; @@ -303,7 +303,7 @@ public class RenderService { // Find the layout file. ResourceValue contextLayout = mResourceResolver.findResValue( - LAYOUT_PREFIX + contextLayoutName, false /* forceFrameworkOnly*/); + LAYOUT_RESOURCE_PREFIX + contextLayoutName, false /* forceFrameworkOnly*/); if (contextLayout != null) { File layoutFile = new File(contextLayout.getValue()); if (layoutFile.isFile()) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java index 6f6259c..57b7871 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionManager.java @@ -15,15 +15,16 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE_V7; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.FQCN_SPACE; +import static com.android.SdkConstants.FQCN_SPACE_V7; +import static com.android.SdkConstants.NEW_ID_PREFIX; import static com.android.ide.eclipse.adt.internal.editors.layout.gle2.SelectionHandle.PIXEL_MARGIN; import static com.android.ide.eclipse.adt.internal.editors.layout.gle2.SelectionHandle.PIXEL_RADIUS; -import static com.android.utils.XmlUtils.ANDROID_URI; + import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java index ef016fb..01dd21e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ViewHierarchy.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_MERGE; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.VIEW_MERGE; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ClientRulesEngine.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ClientRulesEngine.java index 83479ce..2fb16ff 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ClientRulesEngine.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ClientRulesEngine.java @@ -16,13 +16,13 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gre; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.AUTO_URI; import static com.android.SdkConstants.CLASS_FRAGMENT; import static com.android.SdkConstants.CLASS_V4_FRAGMENT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.AUTO_URI; -import static com.android.tools.lint.detector.api.LintConstants.URI_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.URI_PREFIX; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeFactory.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeFactory.java index b0b9971..b0b9971 100755..100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeFactory.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeFactory.java diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeProxy.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeProxy.java index 19d5e16..19d5e16 100755..100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeProxy.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/NodeProxy.java diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/PaletteMetadataDescriptor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/PaletteMetadataDescriptor.java index abd4486..884cb07 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/PaletteMetadataDescriptor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/PaletteMetadataDescriptor.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gre; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.eclipse.adt.internal.editors.IconFactory; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java index 616d4ab..f7eac4434 100755..100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gre; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_MERGE; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.VIEW_MERGE; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ViewMetadataRepository.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ViewMetadataRepository.java index c448695..586da12 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ViewMetadataRepository.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/ViewMetadataRepository.java @@ -16,15 +16,15 @@ package com.android.ide.eclipse.adt.internal.editors.layout.gre; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.FQCN_BUTTON; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPINNER; -import static com.android.ide.common.layout.LayoutConstants.FQCN_TOGGLE_BUTTON; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.FQCN_BUTTON; +import static com.android.SdkConstants.FQCN_SPINNER; +import static com.android.SdkConstants.FQCN_TOGGLE_BUTTON; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; import com.android.annotations.VisibleForTesting; import com.android.ide.common.api.IViewMetadata.FillPreference; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/BooleanXmlPropertyEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/BooleanXmlPropertyEditor.java index 32b1192..d6ff4d5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/BooleanXmlPropertyEditor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/BooleanXmlPropertyEditor.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.layout.properties; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FALSE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; +import static com.android.SdkConstants.VALUE_FALSE; +import static com.android.SdkConstants.VALUE_TRUE; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyFactory.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyFactory.java index 68a4c07..59754af 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyFactory.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyFactory.java @@ -15,9 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.properties; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; import com.android.annotations.Nullable; import com.android.ide.common.api.IAttributeInfo; @@ -276,7 +276,7 @@ public class PropertyFactory { } String firstName = descriptor.getXmlLocalName(); - if (firstName.startsWith(ATTR_LAYOUT_PREFIX)) { + if (firstName.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { if (firstName.startsWith(ATTR_LAYOUT_MARGIN)) { if (marginProperties == null) { marginProperties = Lists.newArrayListWithExpectedSize(5); @@ -443,7 +443,7 @@ public class PropertyFactory { } String firstName = descriptor.getXmlLocalName(); - if (firstName.startsWith(ATTR_LAYOUT_PREFIX)) { + if (firstName.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { if (firstName.startsWith(ATTR_LAYOUT_MARGIN)) { if (marginProperties == null) { marginProperties = Lists.newArrayListWithExpectedSize(5); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyMetadata.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyMetadata.java index cdf7664..b230aa9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyMetadata.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/PropertyMetadata.java @@ -15,9 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.properties; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CONTENT_DESCRIPTION; -import static com.android.ide.common.layout.LayoutConstants.ATTR_HINT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; +import static com.android.SdkConstants.ATTR_CONTENT_DESCRIPTION; +import static com.android.SdkConstants.ATTR_HINT; +import static com.android.SdkConstants.ATTR_TEXT; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ResourceValueCompleter.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ResourceValueCompleter.java index a5e3f64..f6b80d7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ResourceValueCompleter.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ResourceValueCompleter.java @@ -15,12 +15,12 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.properties; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_THEME_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_THEME_REF; -import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG; +import static com.android.SdkConstants.ANDROID_PKG; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ANDROID_THEME_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.PREFIX_THEME_REF; import com.android.ide.common.resources.ResourceItem; import com.android.ide.common.resources.ResourceRepository; @@ -93,16 +93,16 @@ class ResourceValueCompleter implements IContentProposalProvider { // System matches: only do this if the value already matches at least @a, // and doesn't start with something that can't possibly be @android if (prefix.startsWith("@a") && //$NON-NLS-1$ - prefix.regionMatches(true /* ignoreCase */, 0, PREFIX_ANDROID_RESOURCE_REF, 0, - Math.min(prefix.length() - 1, PREFIX_ANDROID_RESOURCE_REF.length()))) { + prefix.regionMatches(true /* ignoreCase */, 0, ANDROID_PREFIX, 0, + Math.min(prefix.length() - 1, ANDROID_PREFIX.length()))) { AndroidTargetData data = editor.getTargetData(); if (data != null) { ResourceRepository repository = data.getFrameworkResources(); addMatches(repository, prefix, true /* isSystem */, results); } } else if (prefix.startsWith("?") && //$NON-NLS-1$ - prefix.regionMatches(true /* ignoreCase */, 0, PREFIX_ANDROID_THEME_REF, 0, - Math.min(prefix.length() - 1, PREFIX_ANDROID_THEME_REF.length()))) { + prefix.regionMatches(true /* ignoreCase */, 0, ANDROID_THEME_PREFIX, 0, + Math.min(prefix.length() - 1, ANDROID_THEME_PREFIX.length()))) { AndroidTargetData data = editor.getTargetData(); if (data != null) { ResourceRepository repository = data.getFrameworkResources(); @@ -141,7 +141,7 @@ class ResourceValueCompleter implements IContentProposalProvider { private static void addMatches(ResourceRepository repository, String prefix, boolean isSystem, List<String> results) { int typeStart = isSystem - ? PREFIX_ANDROID_RESOURCE_REF.length() : PREFIX_RESOURCE_REF.length(); + ? ANDROID_PREFIX.length() : PREFIX_RESOURCE_REF.length(); for (ResourceType type : repository.getAvailableResourceTypes()) { if (prefix.regionMatches(typeStart, type.getName(), 0, @@ -179,4 +179,4 @@ class ResourceValueCompleter implements IContentProposalProvider { } } } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleter.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleter.java index 944b889..132855d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleter.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleter.java @@ -15,6 +15,13 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.properties; +import static com.android.SdkConstants.ATTR_TEXT_SIZE; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.PREFIX_THEME_REF; +import static com.android.SdkConstants.UNIT_DP; +import static com.android.SdkConstants.UNIT_SP; +import static com.android.SdkConstants.VALUE_FALSE; +import static com.android.SdkConstants.VALUE_TRUE; import static com.android.ide.common.api.IAttributeInfo.Format.BOOLEAN; import static com.android.ide.common.api.IAttributeInfo.Format.DIMENSION; import static com.android.ide.common.api.IAttributeInfo.Format.ENUM; @@ -23,13 +30,6 @@ import static com.android.ide.common.api.IAttributeInfo.Format.FLOAT; import static com.android.ide.common.api.IAttributeInfo.Format.INTEGER; import static com.android.ide.common.api.IAttributeInfo.Format.REFERENCE; import static com.android.ide.common.api.IAttributeInfo.Format.STRING; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FALSE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_THEME_REF; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TEXT_SIZE; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_DP; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_SP; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -183,4 +183,4 @@ abstract class ValueCompleter implements IContentProposalProvider { return proposals.toArray(new IContentProposal[proposals.size()]); } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlProperty.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlProperty.java index 2a756c9..a320b68 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlProperty.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlProperty.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.properties; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -91,12 +91,12 @@ class XmlProperty extends Property { String name = mDescriptor.getXmlLocalName(); int nameLength = name.length(); - if (name.startsWith(ATTR_LAYOUT_PREFIX)) { + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { if (name.startsWith(ATTR_LAYOUT_MARGIN) && nameLength > ATTR_LAYOUT_MARGIN.length()) { name = name.substring(ATTR_LAYOUT_MARGIN.length()); } else { - name = name.substring(ATTR_LAYOUT_PREFIX.length()); + name = name.substring(ATTR_LAYOUT_RESOURCE_PREFIX.length()); } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlPropertyEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlPropertyEditor.java index 7cb3f66..72577a5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlPropertyEditor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/properties/XmlPropertyEditor.java @@ -16,13 +16,13 @@ package com.android.ide.eclipse.adt.internal.editors.layout.properties; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_THEME_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_THEME_REF; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_PNG; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ANDROID_THEME_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.DOT_PNG; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.PREFIX_THEME_REF; import com.android.annotations.NonNull; import com.android.ide.common.api.IAttributeInfo; @@ -127,8 +127,8 @@ class XmlPropertyEditor extends AbstractTextPropertyEditor { GraphicalEditorPart graphicalEditor = xmlProperty.getGraphicalEditor(); if (graphicalEditor != null) { ResourceResolver resolver = graphicalEditor.getResourceResolver(); - boolean isFramework = text.startsWith(PREFIX_ANDROID_RESOURCE_REF) - || text.startsWith(PREFIX_ANDROID_THEME_REF); + boolean isFramework = text.startsWith(ANDROID_PREFIX) + || text.startsWith(ANDROID_THEME_PREFIX); resValue = resolver.findResValue(text, isFramework); while (resValue != null && resValue.getValue() != null) { String value = resValue.getValue(); @@ -136,8 +136,8 @@ class XmlPropertyEditor extends AbstractTextPropertyEditor { || value.startsWith(PREFIX_THEME_REF)) { // TODO: do I have to strip off the @ too? isFramework = isFramework - || value.startsWith(PREFIX_ANDROID_RESOURCE_REF) - || value.startsWith(PREFIX_ANDROID_THEME_REF);; + || value.startsWith(ANDROID_PREFIX) + || value.startsWith(ANDROID_THEME_PREFIX);; ResourceValue v = resolver.findResValue(text, isFramework); if (v != null && !value.equals(v.getValue())) { resValue = v; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoring.java index ceb3b76..b01b4b1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoring.java @@ -15,30 +15,30 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_BASELINE_ALIGNED; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GESTURE_OVERLAY_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_RELATIVE_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_TABLE_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.GESTURE_OVERLAY_VIEW; -import static com.android.ide.common.layout.LayoutConstants.LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.TABLE_ROW; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FALSE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; - +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.ATTR_BASELINE_ALIGNED; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.EXT_XML; +import static com.android.SdkConstants.FQCN_GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; +import static com.android.SdkConstants.FQCN_RELATIVE_LAYOUT; +import static com.android.SdkConstants.FQCN_TABLE_LAYOUT; +import static com.android.SdkConstants.GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.TABLE_ROW; +import static com.android.SdkConstants.VALUE_FALSE; +import static com.android.SdkConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; + +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; import com.android.ide.eclipse.adt.AdtPlugin; @@ -309,10 +309,10 @@ public class ChangeLayoutRefactoring extends VisualRefactoring { String value = nameValue[1]; String prefix = null; String namespaceUri = null; - if (attribute.startsWith(ANDROID_NS_NAME_PREFIX)) { + if (attribute.startsWith(SdkConstants.ANDROID_NS_NAME_PREFIX)) { prefix = namespace; namespaceUri = ANDROID_URI; - attribute = attribute.substring(ANDROID_NS_NAME_PREFIX.length()); + attribute = attribute.substring(SdkConstants.ANDROID_NS_NAME_PREFIX.length()); } setAttribute(rootEdit, layout, namespaceUri, prefix, attribute, value); @@ -568,7 +568,7 @@ public class ChangeLayoutRefactoring extends VisualRefactoring { Node attributeNode = attributeMap.item(i); String name = attributeNode.getLocalName(); - if (!name.startsWith(ATTR_LAYOUT_PREFIX) + if (!name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attributeNode.getNamespaceURI())) { if (!defined.contains(name)) { // Remove it diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java index 004e66e..f558271 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutWizard.java @@ -16,13 +16,13 @@ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_RELATIVE_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.RELATIVE_LAYOUT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_MERGE; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.FQCN_RELATIVE_LAYOUT; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; +import static com.android.SdkConstants.VIEW_MERGE; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoring.java index a9a78e9..73f5eb1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoring.java @@ -15,13 +15,13 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.EXT_XML; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; @@ -255,7 +255,7 @@ public class ChangeViewRefactoring extends VisualRefactoring { Node attributeNode = attributes.item(i); String name = attributeNode.getLocalName(); - if (!name.startsWith(ATTR_LAYOUT_PREFIX) + if (!name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attributeNode.getNamespaceURI())) { result.add((Attr) attributeNode); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java index 775a7b5..0ac7106 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewWizard.java @@ -16,9 +16,9 @@ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.REQUEST_FOCUS; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; +import static com.android.SdkConstants.REQUEST_FOCUS; +import static com.android.SdkConstants.VIEW_FRAGMENT; +import static com.android.SdkConstants.VIEW_INCLUDE; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoring.java index 7cc0b1e..65edd54 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoring.java @@ -15,35 +15,33 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.AndroidConstants.FD_RES_LAYOUT; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.EXT_XML; import static com.android.SdkConstants.FD_RES; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; +import static com.android.SdkConstants.FD_RESOURCES; +import static com.android.SdkConstants.FD_RES_LAYOUT; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; +import static com.android.SdkConstants.VIEW_INCLUDE; +import static com.android.SdkConstants.XMLNS; +import static com.android.SdkConstants.XMLNS_PREFIX; import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP; import static com.android.resources.ResourceType.LAYOUT; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; -import static com.android.utils.XmlUtils.XMLNS; -import static com.android.utils.XmlUtils.XMLNS_COLON; -import com.android.AndroidConstants; -import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; -import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.editors.formatting.XmlFormatPreferences; import com.android.ide.eclipse.adt.internal.editors.formatting.XmlFormatStyle; import com.android.ide.eclipse.adt.internal.editors.formatting.XmlPrettyPrinter; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.CanvasViewInfo; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.DomUtilities; import com.android.ide.eclipse.adt.internal.editors.layout.uimodel.UiViewElementNode; @@ -161,7 +159,7 @@ public class ExtractIncludeRefactoring extends VisualRefactoring { UiViewElementNode uiNode = infos.get(0).getUiViewNode(); if (uiNode != null) { Node xmlNode = uiNode.getXmlNode(); - if (xmlNode.getLocalName().equals(LayoutDescriptors.VIEW_INCLUDE)) { + if (xmlNode.getLocalName().equals(VIEW_INCLUDE)) { status.addWarning("No point in refactoring a single include tag"); } } @@ -327,7 +325,7 @@ public class ExtractIncludeRefactoring extends VisualRefactoring { IPath parentPath = parent.getProjectRelativePath(); final IFile file = project.getFile(new Path(parentPath + WS_SEP + newFileName)); TextFileChange addFile = new TextFileChange("Create new separate layout", file); - addFile.setTextType(AdtConstants.EXT_XML); + addFile.setTextType(EXT_XML); changes.add(addFile); String newFile = sb.toString(); @@ -401,10 +399,10 @@ public class ExtractIncludeRefactoring extends VisualRefactoring { private List<IFile> getOtherLayouts(IFile sourceFile) { List<IFile> layouts = new ArrayList<IFile>(100); IPath sourcePath = sourceFile.getProjectRelativePath(); - IFolder resources = mProject.getFolder(SdkConstants.FD_RESOURCES); + IFolder resources = mProject.getFolder(FD_RESOURCES); try { for (IResource folder : resources.members()) { - if (folder.getName().startsWith(AndroidConstants.FD_RES_LAYOUT) && + if (folder.getName().startsWith(FD_RES_LAYOUT) && folder instanceof IFolder) { IFolder layoutFolder = (IFolder) folder; for (IResource file : layoutFolder.members()) { @@ -494,8 +492,8 @@ public class ExtractIncludeRefactoring extends VisualRefactoring { String value = attributeNode.getNodeValue(); if (value.equals(ANDROID_URI)) { androidNsPrefix = name; - if (androidNsPrefix.startsWith(XMLNS_COLON)) { - androidNsPrefix = androidNsPrefix.substring(XMLNS_COLON.length()); + if (androidNsPrefix.startsWith(XMLNS_PREFIX)) { + androidNsPrefix = androidNsPrefix.substring(XMLNS_PREFIX.length()); } } sb.append(XmlUtils.toXmlAttributeValue(value)); @@ -511,7 +509,7 @@ public class ExtractIncludeRefactoring extends VisualRefactoring { if (namespaceDeclarations.length() == 0) { sb.setLength(0); sb.append(' '); - sb.append(XMLNS_COLON); + sb.append(XMLNS_PREFIX); sb.append(androidNsPrefix); sb.append('=').append('"'); sb.append(ANDROID_URI); @@ -606,7 +604,7 @@ public class ExtractIncludeRefactoring extends VisualRefactoring { for (int i = 0, n = attributes.getLength(); i < n; i++) { Node attr = attributes.item(i); String name = attr.getLocalName(); - if (name.startsWith(ATTR_LAYOUT_PREFIX) + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attr.getNamespaceURI())) { if (name.equals(ATTR_LAYOUT_WIDTH) || name.equals(ATTR_LAYOUT_HEIGHT)) { // Already handled diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractStyleRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractStyleRefactoring.java index e35dc1b..ffe6892 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractStyleRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractStyleRefactoring.java @@ -15,26 +15,29 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.AndroidConstants.FD_RES_VALUES; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_HINT; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_ON_CLICK; +import static com.android.SdkConstants.ATTR_PARENT; +import static com.android.SdkConstants.ATTR_SRC; +import static com.android.SdkConstants.ATTR_STYLE; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.EXT_XML; import static com.android.SdkConstants.FD_RESOURCES; -import static com.android.ide.common.layout.LayoutConstants.ATTR_HINT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ON_CLICK; -import static com.android.ide.common.layout.LayoutConstants.ATTR_SRC; -import static com.android.ide.common.layout.LayoutConstants.ATTR_STYLE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_TEXT; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; +import static com.android.SdkConstants.FD_RES_VALUES; +import static com.android.SdkConstants.PREFIX_ANDROID; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.REFERENCE_STYLE; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_RESOURCES; +import static com.android.SdkConstants.XMLNS_PREFIX; import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.ITEM_TAG; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.NAME_ATTR; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.PARENT_ATTR; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.ROOT_ELEMENT; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; -import static com.android.utils.XmlUtils.XMLNS_COLON; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; @@ -309,7 +312,7 @@ public class ExtractStyleRefactoring extends VisualRefactoring { return !(name == null || name.equals(ATTR_ID) || name.startsWith(ATTR_STYLE) - || (name.startsWith(ATTR_LAYOUT_PREFIX) && + || (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && !name.startsWith(ATTR_LAYOUT_MARGIN)) || name.equals(ATTR_TEXT) || name.equals(ATTR_HINT) @@ -363,8 +366,7 @@ public class ExtractStyleRefactoring extends VisualRefactoring { // Set the style attribute? if (mApplyStyle) { for (Element element : getElements()) { - String value = ResourceResolver.PREFIX_RESOURCE_REF + - ResourceResolver.REFERENCE_STYLE + mStyleName; + String value = PREFIX_RESOURCE_REF + REFERENCE_STYLE + mStyleName; setAttribute(rootEdit, element, null, null, ATTR_STYLE, value); } } @@ -395,8 +397,8 @@ public class ExtractStyleRefactoring extends VisualRefactoring { StringBuilder sb = new StringBuilder(); if (createFile) { sb.append(NewXmlFileWizard.XML_HEADER_LINE); - sb.append('<').append(ROOT_ELEMENT).append(' '); - sb.append(XMLNS_COLON).append(ANDROID_NS_NAME).append('=').append('"'); + sb.append('<').append(TAG_RESOURCES).append(' '); + sb.append(XMLNS_PREFIX).append(ANDROID_NS_NAME).append('=').append('"'); sb.append(ANDROID_URI); sb.append('"').append('>').append('\n'); } @@ -413,11 +415,11 @@ public class ExtractStyleRefactoring extends VisualRefactoring { } sb.append(initialIndent); String styleTag = "style"; //$NON-NLS-1$ // TODO - use constant in parallel changeset - sb.append('<').append(styleTag).append(' ').append(NAME_ATTR).append('=').append('"'); + sb.append('<').append(styleTag).append(' ').append(ATTR_NAME).append('=').append('"'); sb.append(mStyleName); sb.append('"'); if (mParent != null) { - sb.append(' ').append(PARENT_ATTR).append('=').append('"'); + sb.append(' ').append(ATTR_PARENT).append('=').append('"'); sb.append(mParent); sb.append('"'); } @@ -425,7 +427,7 @@ public class ExtractStyleRefactoring extends VisualRefactoring { for (Attr attribute : mChosenAttributes) { sb.append(initialIndent).append(indent); - sb.append('<').append(ITEM_TAG).append(' ').append(NAME_ATTR).append('=').append('"'); + sb.append('<').append(TAG_ITEM).append(' ').append(ATTR_NAME).append('=').append('"'); // We've already enforced that regardless of prefix, only attributes with // an Android namespace can be in the set of chosen attributes. Rewrite the // prefix to android here. @@ -435,12 +437,12 @@ public class ExtractStyleRefactoring extends VisualRefactoring { sb.append(attribute.getLocalName()); sb.append('"').append('>'); sb.append(attribute.getValue()); - sb.append('<').append('/').append(ITEM_TAG).append('>').append('\n'); + sb.append('<').append('/').append(TAG_ITEM).append('>').append('\n'); } sb.append(initialIndent).append('<').append('/').append(styleTag).append('>').append('\n'); if (createFile) { - sb.append('<').append('/').append(ROOT_ELEMENT).append('>').append('\n'); + sb.append('<').append('/').append(TAG_RESOURCES).append('>').append('\n'); } String styleString = sb.toString(); return styleString; @@ -494,7 +496,7 @@ public class ExtractStyleRefactoring extends VisualRefactoring { if (insertAtIndex == -1) { String contents = AdtPlugin.readFile(file); - insertAtIndex = contents.indexOf("</" + ROOT_ELEMENT + ">"); //$NON-NLS-1$ + insertAtIndex = contents.indexOf("</" + TAG_RESOURCES + ">"); //$NON-NLS-1$ if (insertAtIndex == -1) { insertAtIndex = contents.length(); } @@ -564,7 +566,7 @@ public class ExtractStyleRefactoring extends VisualRefactoring { String name = resolvedValue.getName(); if (name != null) { if (resolvedValue.isFramework()) { - return ResourceResolver.PREFIX_ANDROID + name; + return PREFIX_ANDROID + name; } else { return name; } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/GridLayoutConverter.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/GridLayoutConverter.java index 0ec664d..868d790 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/GridLayoutConverter.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/GridLayoutConverter.java @@ -17,42 +17,44 @@ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; import static com.android.ide.common.layout.GravityHelper.GRAVITY_HORIZ_MASK; import static com.android.ide.common.layout.GravityHelper.GRAVITY_VERT_MASK; -import static com.android.ide.common.layout.LayoutConstants.ATTR_BACKGROUND; -import static com.android.ide.common.layout.LayoutConstants.ATTR_COLUMN_COUNT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.GRAVITY_VALUE_FILL_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.RADIO_GROUP; -import static com.android.ide.common.layout.LayoutConstants.RELATIVE_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.SPACE; -import static com.android.ide.common.layout.LayoutConstants.TABLE_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.TABLE_ROW; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.utils.XmlUtils.ANDROID_URI; - +import static com.android.SdkConstants.ATTR_BACKGROUND; +import static com.android.SdkConstants.ATTR_COLUMN_COUNT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL_HORIZONTAL; +import static com.android.SdkConstants.GRAVITY_VALUE_FILL_VERTICAL; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.RADIO_GROUP; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.SPACE; +import static com.android.SdkConstants.TABLE_LAYOUT; +import static com.android.SdkConstants.TABLE_ROW; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_HORIZONTAL; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; + + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.IViewMetadata.FillPreference; import com.android.ide.common.layout.BaseLayoutRule; import com.android.ide.common.layout.GravityHelper; @@ -879,7 +881,7 @@ class GridLayoutConverter { for (int i = 0, n = attributes.getLength(); i < n; i++) { Attr attr = (Attr) attributes.item(i); String name = attr.getLocalName(); - if (name.startsWith(ATTR_LAYOUT_PREFIX)) { + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { boolean alignVertical = name.equals(ATTR_LAYOUT_ALIGN_TOP) || name.equals(ATTR_LAYOUT_ALIGN_BOTTOM) || diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java index d4b008d..7f9cc71 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RelativeLayoutConversionHelper.java @@ -24,42 +24,44 @@ import static com.android.ide.common.layout.GravityHelper.GRAVITY_LEFT; import static com.android.ide.common.layout.GravityHelper.GRAVITY_RIGHT; import static com.android.ide.common.layout.GravityHelper.GRAVITY_TOP; import static com.android.ide.common.layout.GravityHelper.GRAVITY_VERT_MASK; -import static com.android.ide.common.layout.LayoutConstants.ATTR_BACKGROUND; -import static com.android.ide.common.layout.LayoutConstants.ATTR_BASELINE_ALIGNED; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ABOVE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_LEFT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.RELATIVE_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FALSE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_N_DP; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.utils.XmlUtils.ANDROID_URI; - +import static com.android.SdkConstants.ATTR_BACKGROUND; +import static com.android.SdkConstants.ATTR_BASELINE_ALIGNED; +import static com.android.SdkConstants.ATTR_LAYOUT_ABOVE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_VERTICAL; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_WEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.VALUE_FALSE; +import static com.android.SdkConstants.VALUE_N_DP; +import static com.android.SdkConstants.VALUE_TRUE; +import static com.android.SdkConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; + + +import com.android.SdkConstants; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.layout.GravityHelper; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor; @@ -695,7 +697,7 @@ class RelativeLayoutConversionHelper { if (name.equals(ATTR_LAYOUT_WIDTH) || name.equals(ATTR_LAYOUT_HEIGHT)) { // Ignore these for now - } else if (name.startsWith(ATTR_LAYOUT_PREFIX) + } else if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attribute.getNamespaceURI())) { // Determine if the reference is to a known edge String id = getIdBasename(value); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UnwrapRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UnwrapRefactoring.java index bfdac27..1dcc1b7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UnwrapRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UnwrapRefactoring.java @@ -15,10 +15,10 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.EXT_XML; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UseCompoundDrawableRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UseCompoundDrawableRefactoring.java index 427f187..8f678c1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UseCompoundDrawableRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/UseCompoundDrawableRefactoring.java @@ -15,29 +15,29 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.ATTR_DRAWABLE_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_DRAWABLE_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_DRAWABLE_PADDING; -import static com.android.ide.common.layout.LayoutConstants.ATTR_DRAWABLE_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_DRAWABLE_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_GRAVITY; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_MARGIN_TOP; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.ATTR_SRC; -import static com.android.ide.common.layout.LayoutConstants.LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; -import static com.android.tools.lint.detector.api.LintConstants.IMAGE_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.TEXT_VIEW; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_DRAWABLE_BOTTOM; +import static com.android.SdkConstants.ATTR_DRAWABLE_LEFT; +import static com.android.SdkConstants.ATTR_DRAWABLE_PADDING; +import static com.android.SdkConstants.ATTR_DRAWABLE_RIGHT; +import static com.android.SdkConstants.ATTR_DRAWABLE_TOP; +import static com.android.SdkConstants.ATTR_GRAVITY; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.ATTR_SRC; +import static com.android.SdkConstants.EXT_XML; +import static com.android.SdkConstants.IMAGE_VIEW; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.TEXT_VIEW; +import static com.android.SdkConstants.VALUE_VERTICAL; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -254,7 +254,7 @@ public class UseCompoundDrawableRefactoring extends VisualRefactoring { for (int i = 0, n = attributes.getLength(); i < n; i++) { Attr attribute = (Attr) attributes.item(i); String name = attribute.getLocalName(); - if (name.startsWith(ATTR_LAYOUT_PREFIX) + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attribute.getNamespaceURI()) && !(name.equals(ATTR_LAYOUT_WIDTH) || name.equals(ATTR_LAYOUT_HEIGHT))) { // Ignore layout params: the parent layout is going away diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/VisualRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/VisualRefactoring.java index 64212b5..5d8d700 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/VisualRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/VisualRefactoring.java @@ -15,17 +15,17 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; -import static com.android.utils.XmlUtils.XMLNS; -import static com.android.utils.XmlUtils.XMLNS_COLON; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.XMLNS; +import static com.android.SdkConstants.XMLNS_PREFIX; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; @@ -361,7 +361,7 @@ public abstract class VisualRefactoring extends Refactoring { return Collections.emptyList(); } - String namePrefix = androidNamePrefix + ':' + ATTR_LAYOUT_PREFIX; + String namePrefix = androidNamePrefix + ':' + ATTR_LAYOUT_RESOURCE_PREFIX; List<TextEdit> edits = new ArrayList<TextEdit>(); IStructuredDocumentRegion region = doc.getFirstStructuredDocumentRegion(); @@ -425,9 +425,9 @@ public abstract class VisualRefactoring extends Refactoring { String value = attributeNode.getNodeValue(); if (value.equals(ANDROID_URI)) { mAndroidNamespacePrefix = name; - if (mAndroidNamespacePrefix.startsWith(XMLNS_COLON)) { + if (mAndroidNamespacePrefix.startsWith(XMLNS_PREFIX)) { mAndroidNamespacePrefix = - mAndroidNamespacePrefix.substring(XMLNS_COLON.length()); + mAndroidNamespacePrefix.substring(XMLNS_PREFIX.length()); } } } @@ -451,9 +451,9 @@ public abstract class VisualRefactoring extends Refactoring { String value = attributeNode.getNodeValue(); if (value.equals(ANDROID_URI)) { nsPrefix = name; - if (nsPrefix.startsWith(XMLNS_COLON)) { + if (nsPrefix.startsWith(XMLNS_PREFIX)) { nsPrefix = - nsPrefix.substring(XMLNS_COLON.length()); + nsPrefix.substring(XMLNS_PREFIX.length()); } } } @@ -502,7 +502,7 @@ public abstract class VisualRefactoring extends Refactoring { Node attributeNode = attributes.item(i); String name = attributeNode.getLocalName(); - if (name.startsWith(ATTR_LAYOUT_PREFIX) + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attributeNode.getNamespaceURI())) { result.add((Attr) attributeNode); } @@ -537,7 +537,7 @@ public abstract class VisualRefactoring extends Refactoring { for (int i = 0, n = attributes.getLength(); i < n; i++) { Node attr = attributes.item(i); String name = attr.getLocalName(); - if (name.startsWith(ATTR_LAYOUT_PREFIX) + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attr.getNamespaceURI())) { if (name.equals(ATTR_LAYOUT_WIDTH) || name.equals(ATTR_LAYOUT_HEIGHT)) { // These are special and are left in diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoring.java index fbc09ad..ff2e9bd 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoring.java @@ -15,16 +15,16 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.EXT_XML; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInWizard.java index 893703f..2e06a3b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInWizard.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInWizard.java @@ -16,12 +16,12 @@ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GESTURE_OVERLAY_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_RADIO_BUTTON; -import static com.android.ide.common.layout.LayoutConstants.GESTURE_OVERLAY_VIEW; -import static com.android.ide.common.layout.LayoutConstants.RADIO_GROUP; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_INCLUDE; +import static com.android.SdkConstants.FQCN_GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; +import static com.android.SdkConstants.FQCN_RADIO_BUTTON; +import static com.android.SdkConstants.GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.RADIO_GROUP; +import static com.android.SdkConstants.VIEW_INCLUDE; import com.android.ide.eclipse.adt.internal.editors.layout.LayoutEditorDelegate; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.ViewElementDescriptor; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java index f4a026c..7050be4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/uimodel/UiViewElementNode.java @@ -16,13 +16,14 @@ package com.android.ide.eclipse.adt.internal.editors.layout.uimodel; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CLASS; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.FQCN_FRAME_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_VIEWTAG; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.FQCN_FRAME_LAYOUT; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.VIEW_TAG; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.editors.AndroidXmlEditor; @@ -38,7 +39,6 @@ import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData; import com.android.ide.eclipse.adt.internal.sdk.Sdk; import com.android.sdklib.IAndroidTarget; -import com.android.utils.XmlUtils; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; @@ -125,9 +125,7 @@ public class UiViewElementNode extends UiElementNode { mCachedAttributeDescriptors, direct_attrs.length, layout_attrs.length); if (need_xmlns) { - AttributeDescriptor desc = new XmlnsAttributeDescriptor( - XmlUtils.ANDROID_NS_NAME, - XmlUtils.ANDROID_URI); + AttributeDescriptor desc = new XmlnsAttributeDescriptor(ANDROID_NS_NAME, ANDROID_URI); mCachedAttributeDescriptors[direct_attrs.length + layout_attrs.length] = desc; } @@ -144,12 +142,11 @@ public class UiViewElementNode extends UiElementNode { IconFactory icons = IconFactory.getInstance(); if (uiName.equals(LINEAR_LAYOUT)) { Element e = (Element) getXmlNode(); - if (VALUE_VERTICAL.equals(e.getAttributeNS(ANDROID_URI, - ATTR_ORIENTATION))) { + if (VALUE_VERTICAL.equals(e.getAttributeNS(ANDROID_URI, ATTR_ORIENTATION))) { IconFactory factory = icons; img = factory.getIcon("VerticalLinearLayout"); //$NON-NLS-1$ } - } else if (uiName.equals(VIEW_VIEWTAG)) { + } else if (uiName.equals(VIEW_TAG)) { Node xmlNode = getXmlNode(); if (xmlNode instanceof Element) { String className = ((Element) xmlNode).getAttribute(ATTR_CLASS); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestEditor.java index 3e815f5..69a6b84 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestEditor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestEditor.java @@ -16,9 +16,9 @@ package com.android.ide.eclipse.adt.internal.editors.manifest; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NAME; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_NAME; import static com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors.USES_PERMISSION; -import static com.android.utils.XmlUtils.ANDROID_URI; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java index aee75e8..ed93b73 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/ManifestInfo.java @@ -16,8 +16,9 @@ package com.android.ide.eclipse.adt.internal.editors.manifest; +import static com.android.SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.CLASS_ACTIVITY; import static com.android.SdkConstants.NS_RESOURCES; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_STYLE; import static com.android.xml.AndroidManifest.ATTRIBUTE_ICON; import static com.android.xml.AndroidManifest.ATTRIBUTE_LABEL; import static com.android.xml.AndroidManifest.ATTRIBUTE_MIN_SDK_VERSION; @@ -27,10 +28,8 @@ import static com.android.xml.AndroidManifest.ATTRIBUTE_TARGET_SDK_VERSION; import static com.android.xml.AndroidManifest.ATTRIBUTE_THEME; import static com.android.xml.AndroidManifest.NODE_ACTIVITY; import static com.android.xml.AndroidManifest.NODE_USES_SDK; - import static org.eclipse.jdt.core.search.IJavaSearchConstants.REFERENCES; -import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.eclipse.adt.AdtPlugin; @@ -358,9 +357,9 @@ public class ManifestInfo { // For now this theme works only on XLARGE screens. When it works for all sizes, // add that new apiLevel to this check. if (apiLevel >= 11 && screenSize == ScreenSize.XLARGE || apiLevel >= 14) { - return PREFIX_ANDROID_STYLE + "Theme.Holo"; //$NON-NLS-1$ + return ANDROID_STYLE_RESOURCE_PREFIX + "Theme.Holo"; //$NON-NLS-1$ } else { - return PREFIX_ANDROID_STYLE + "Theme"; //$NON-NLS-1$ + return ANDROID_STYLE_RESOURCE_PREFIX + "Theme"; //$NON-NLS-1$ } } @@ -562,7 +561,7 @@ public class ManifestInfo { final IJavaProject javaProject = BaseProjectHelper.getJavaProject(project); if (javaProject != null) { IType[] activityTypes = new IType[0]; - IType activityType = javaProject.findType(SdkConstants.CLASS_ACTIVITY); + IType activityType = javaProject.findType(CLASS_ACTIVITY); if (activityType != null) { ITypeHierarchy hierarchy = activityType.newTypeHierarchy(javaProject, new NullProgressMonitor()); @@ -669,7 +668,7 @@ public class ManifestInfo { typeFqcn = mPackage + '.' + typeFqcn; } - IType activityType = javaProject.findType(SdkConstants.CLASS_ACTIVITY); + IType activityType = javaProject.findType(CLASS_ACTIVITY); if (activityType != null) { IMethod method = activityType.getMethod( "setContentView", new String[] {"I"}); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java index cafaf8b..ba7894b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/descriptors/AndroidManifestDescriptors.java @@ -33,7 +33,6 @@ import com.android.ide.eclipse.adt.internal.editors.descriptors.ListAttributeDes import com.android.ide.eclipse.adt.internal.editors.descriptors.ReferenceAttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.TextAttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.XmlnsAttributeDescriptor; -import com.android.utils.XmlUtils; import org.eclipse.core.runtime.IStatus; @@ -233,7 +232,7 @@ public final class AndroidManifestDescriptors implements IDescriptorProvider { insertAttribute(MANIFEST_ELEMENT, PACKAGE_ATTR_DESC); XmlnsAttributeDescriptor xmlns = new XmlnsAttributeDescriptor( - XmlUtils.ANDROID_NS_NAME, XmlUtils.ANDROID_URI); + SdkConstants.ANDROID_NS_NAME, SdkConstants.ANDROID_URI); insertAttribute(MANIFEST_ELEMENT, xmlns); assert sanityCheck(manifestMap, MANIFEST_ELEMENT); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/descriptors/MenuDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/descriptors/MenuDescriptors.java index 4fc5309..b7bab1b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/descriptors/MenuDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/menu/descriptors/MenuDescriptors.java @@ -16,10 +16,10 @@ package com.android.ide.eclipse.adt.internal.editors.menu.descriptors; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.TAG_MENU; -import com.android.SdkConstants; import com.android.ide.common.resources.platform.DeclareStyleableInfo; import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor; @@ -31,14 +31,11 @@ import com.android.ide.eclipse.adt.internal.editors.descriptors.XmlnsAttributeDe import java.util.ArrayList; import java.util.Map; - /** * Complete description of the menu structure. */ public final class MenuDescriptors implements IDescriptorProvider { - public static final String MENU_ROOT_ELEMENT = "menu"; //$NON-NLS-1$ - /** The root element descriptor. */ private ElementDescriptor mDescriptor = null; @@ -74,7 +71,7 @@ public final class MenuDescriptors implements IDescriptorProvider { if (mDescriptor == null) { mDescriptor = createElement(styleMap, - MENU_ROOT_ELEMENT, // xmlName + TAG_MENU, // xmlName "Menu", // uiName, null, // TODO SDK URL null, // extraAttribute @@ -101,7 +98,7 @@ public final class MenuDescriptors implements IDescriptorProvider { false /* mandatory */); ElementDescriptor sub_menu = createElement(styleMap, - MENU_ROOT_ELEMENT, // xmlName + TAG_MENU, // xmlName "Sub-Menu", // uiName, null, // TODO SDK URL null, // extraAttribute @@ -165,7 +162,7 @@ public final class MenuDescriptors implements IDescriptorProvider { if (style != null) { DescriptorsUtils.appendAttributes(descs, null, // elementName - SdkConstants.NS_RESOURCES, + ANDROID_URI, style.getAttributes(), null, // requiredAttributes null); // overrides diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/otherxml/descriptors/OtherXmlDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/otherxml/descriptors/OtherXmlDescriptors.java index 4678936..7f3ed09 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/otherxml/descriptors/OtherXmlDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/otherxml/descriptors/OtherXmlDescriptors.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.otherxml.descriptors; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_NS_NAME; +import static com.android.SdkConstants.ANDROID_URI; import com.android.SdkConstants; import com.android.ide.common.resources.platform.AttributeInfo; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiAttributeNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiAttributeNode.java index 17a28c8..71cb35d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiAttributeNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiAttributeNode.java @@ -16,12 +16,12 @@ package com.android.ide.eclipse.adt.internal.editors.uimodel; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_NAME; -import static com.android.ide.common.layout.LayoutConstants.ATTR_STYLE; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_STYLE; import static com.android.ide.eclipse.adt.internal.editors.color.ColorDescriptors.ATTR_COLOR; import static com.google.common.base.Strings.nullToEmpty; @@ -259,7 +259,7 @@ public abstract class UiAttributeNode implements Comparable<UiAttributeNode> { return 20; } - if (name.startsWith(ATTR_LAYOUT_PREFIX)) { + if (name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { // Width and height are special cased because we (a) want width and height // before the other layout attributes, and (b) we want width to sort before height // even though it comes after it alphabetically. diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiElementNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiElementNode.java index a6f9a02..b521d78 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiElementNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiElementNode.java @@ -16,11 +16,11 @@ package com.android.ide.eclipse.adt.internal.editors.uimodel; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_PKG_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_SUPPORT_PKG_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CLASS; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.ANDROID_PKG_PREFIX; +import static com.android.SdkConstants.ANDROID_SUPPORT_PKG_PREFIX; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; import com.android.SdkConstants; import com.android.annotations.VisibleForTesting; @@ -37,11 +37,9 @@ import com.android.ide.eclipse.adt.internal.editors.descriptors.SeparatorAttribu import com.android.ide.eclipse.adt.internal.editors.descriptors.TextAttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.XmlnsAttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.CustomViewDescriptorService; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; import com.android.ide.eclipse.adt.internal.editors.manifest.descriptors.AndroidManifestDescriptors; import com.android.ide.eclipse.adt.internal.editors.otherxml.descriptors.OtherXmlDescriptors; import com.android.ide.eclipse.adt.internal.editors.uimodel.IUiUpdateListener.UiUpdateState; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs; import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData; import com.android.utils.XmlUtils; @@ -252,7 +250,7 @@ public class UiElementNode implements IPropertySource { attr = _Element_getAttributeNS(elem, SdkConstants.NS_RESOURCES, AndroidManifestDescriptors.ANDROID_LABEL_ATTR); - } else if (mXmlNode.getNodeName().equals(LayoutDescriptors.VIEW_FRAGMENT)) { + } else if (mXmlNode.getNodeName().equals(SdkConstants.VIEW_FRAGMENT)) { attr = attr.substring(attr.lastIndexOf('.') + 1); } if (attr == null || attr.length() == 0) { @@ -263,12 +261,12 @@ public class UiElementNode implements IPropertySource { if (attr == null || attr.length() == 0) { attr = _Element_getAttributeNS(elem, null, // no namespace - ValuesDescriptors.NAME_ATTR); + SdkConstants.ATTR_NAME); } if (attr == null || attr.length() == 0) { attr = _Element_getAttributeNS(elem, SdkConstants.NS_RESOURCES, - LayoutDescriptors.ID_ATTR); + SdkConstants.ATTR_ID); if (attr != null && attr.length() > 0) { for (String prefix : ID_PREFIXES) { @@ -299,7 +297,7 @@ public class UiElementNode implements IPropertySource { // Special case: for <view>, show the class attribute value instead. // This is done here rather than in the descriptor since this depends on // node instance data. - if (LayoutDescriptors.VIEW_VIEWTAG.equals(uiName) && mXmlNode instanceof Element) { + if (SdkConstants.VIEW_TAG.equals(uiName) && mXmlNode instanceof Element) { Element element = (Element) mXmlNode; String cls = element.getAttribute(ATTR_CLASS); if (cls != null) { @@ -1061,7 +1059,7 @@ public class UiElementNode implements IPropertySource { for (AttributeDescriptor attrDesc : getAttributeDescriptors()) { if (attrDesc instanceof XmlnsAttributeDescriptor) { XmlnsAttributeDescriptor desc = (XmlnsAttributeDescriptor) attrDesc; - Attr attr = doc.createAttributeNS(XmlUtils.XMLNS_URI, + Attr attr = doc.createAttributeNS(SdkConstants.XMLNS_URI, desc.getXmlNsName()); attr.setValue(desc.getValue()); attr.setPrefix(desc.getXmlNsPrefix()); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiListAttributeNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiListAttributeNode.java index d8a3e9d..0fd317c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiListAttributeNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiListAttributeNode.java @@ -25,7 +25,6 @@ import com.android.ide.eclipse.adt.internal.editors.descriptors.ListAttributeDes import com.android.ide.eclipse.adt.internal.editors.descriptors.TextAttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.ui.SectionHelper; import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData; -import com.android.utils.XmlUtils; import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.SWT; @@ -141,9 +140,9 @@ public class UiListAttributeNode extends UiAbstractTextAttributeNode { // FrameworkResourceManager expects a specific prefix for the attribute. String nsPrefix = ""; if (SdkConstants.NS_RESOURCES.equals(descriptor.getNamespaceUri())) { - nsPrefix = XmlUtils.ANDROID_NS_NAME + ':'; - } else if (XmlUtils.XMLNS_URI.equals(descriptor.getNamespaceUri())) { - nsPrefix = XmlUtils.XMLNS_COLON; + nsPrefix = SdkConstants.ANDROID_NS_NAME + ':'; + } else if (SdkConstants.XMLNS_URI.equals(descriptor.getNamespaceUri())) { + nsPrefix = SdkConstants.XMLNS_PREFIX; } attr_name = nsPrefix + attr_name; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java index ac713d0..4addbf0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/uimodel/UiResourceAttributeNode.java @@ -16,13 +16,14 @@ package com.android.ide.eclipse.adt.internal.editors.uimodel; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_STYLE; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_THEME_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_THEME_REF; -import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG; +import static com.android.SdkConstants.ANDROID_PKG; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ANDROID_THEME_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_STYLE; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.PREFIX_THEME_REF; import com.android.ide.common.api.IAttributeInfo; import com.android.ide.common.api.IAttributeInfo.Format; @@ -32,7 +33,6 @@ import com.android.ide.eclipse.adt.internal.editors.AndroidXmlEditor; import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.DescriptorsUtils; import com.android.ide.eclipse.adt.internal.editors.descriptors.TextAttributeDescriptor; -import com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors; import com.android.ide.eclipse.adt.internal.editors.ui.SectionHelper; import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager; import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData; @@ -254,7 +254,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { // or does not have the resource type in it. Simply offer the list of potential // resource types. if (prefix != null && prefix.startsWith(PREFIX_THEME_REF)) { - results.add(PREFIX_ANDROID_THEME_REF + ResourceType.ATTR.getName() + '/'); + results.add(ANDROID_THEME_PREFIX + ResourceType.ATTR.getName() + '/'); if (resTypes.contains(ResourceType.ATTR) || resTypes.contains(ResourceType.STYLE)) { results.add(PREFIX_THEME_REF + ResourceType.ATTR.getName() + '/'); @@ -264,7 +264,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { for (ResourceType resType : resTypes) { if (isSystem) { - results.add(PREFIX_ANDROID_RESOURCE_REF + resType.getName() + '/'); + results.add(ANDROID_PREFIX + resType.getName() + '/'); } else { results.add('@' + resType.getName() + '/'); } @@ -278,7 +278,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { // "@an" we offer to complete it. if (prefix == null || ANDROID_PKG.regionMatches(0, prefix, 1, prefix.length() - 1)) { - results.add(PREFIX_ANDROID_RESOURCE_REF); + results.add(ANDROID_PREFIX); } } else if (repository != null) { // We have a style name and a repository. Find all resources that match this @@ -351,7 +351,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { /** Compute a suitable sorting score for the given */ private static final int score(IAttributeInfo attributeInfo, String value) { - if (value.equals(PREFIX_ANDROID_RESOURCE_REF)) { + if (value.equals(ANDROID_PREFIX)) { return -1; } @@ -383,7 +383,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { return -2; } - if (value.startsWith(PREFIX_ANDROID_RESOURCE_REF + type + '/')) { + if (value.startsWith(ANDROID_PREFIX + type + '/')) { return -2; } } @@ -392,7 +392,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { return -2; } - if (value.startsWith(PREFIX_ANDROID_THEME_REF + type + '/')) { + if (value.startsWith(ANDROID_THEME_PREFIX + type + '/')) { return -2; } } @@ -407,7 +407,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { type = "id"; //$NON-NLS-1$ } else if (attribute.equals(ATTR_STYLE)) { type = "style"; //$NON-NLS-1$ - } else if (attribute.equals(LayoutDescriptors.ATTR_LAYOUT)) { + } else if (attribute.equals(ATTR_LAYOUT)) { type = "layout"; //$NON-NLS-1$ } else if (attribute.equals("drawable")) { //$NON-NLS-1$ type = "drawable"; //$NON-NLS-1$ @@ -422,7 +422,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { return -2; } - if (value.startsWith(PREFIX_ANDROID_RESOURCE_REF + type + '/')) { + if (value.startsWith(ANDROID_PREFIX + type + '/')) { return -2; } } @@ -431,7 +431,7 @@ public class UiResourceAttributeNode extends UiTextAttributeNode { return -2; } - if (value.startsWith(PREFIX_ANDROID_THEME_REF + type + '/')) { + if (value.startsWith(ANDROID_THEME_PREFIX + type + '/')) { return -2; } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/ValuesContentAssist.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/ValuesContentAssist.java index 9712876..bd6c079 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/ValuesContentAssist.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/ValuesContentAssist.java @@ -16,15 +16,15 @@ package com.android.ide.eclipse.adt.internal.editors.values; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.ANDROID_NS_NAME_PREFIX; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_TYPE; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_STYLE; import static com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor.ATTRIBUTE_ICON_FILENAME; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.ITEM_TAG; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.NAME_ATTR; -import static com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors.STYLE_ELEMENT; import static com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData.DESCRIPTOR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TYPE; -import static com.android.utils.XmlUtils.ANDROID_NS_NAME_PREFIX; import com.android.annotations.VisibleForTesting; import com.android.ide.eclipse.adt.internal.editors.AndroidContentAssist; @@ -76,7 +76,7 @@ public class ValuesContentAssist extends AndroidContentAssist { super.computeAttributeValues(proposals, offset, parentTagName, attributeName, node, wordPrefix, skipEndTag, replaceLength); - if (parentTagName.equals(ITEM_TAG) && NAME_ATTR.equals(attributeName)) { + if (parentTagName.equals(TAG_ITEM) && ATTR_NAME.equals(attributeName)) { // Special case: the user is code completing inside // <style><item name="^"/></style> @@ -142,9 +142,9 @@ public class ValuesContentAssist extends AndroidContentAssist { super.computeTextValues(proposals, offset, parentNode, currentNode, uiParent, prefix); - if (parentNode.getNodeName().equals(ITEM_TAG) && + if (parentNode.getNodeName().equals(TAG_ITEM) && parentNode.getParentNode() != null && - STYLE_ELEMENT.equals(parentNode.getParentNode().getNodeName())) { + TAG_STYLE.equals(parentNode.getParentNode().getNodeName())) { // Special case: the user is code completing inside // <style><item name="android:foo"/>|</style> @@ -158,7 +158,7 @@ public class ValuesContentAssist extends AndroidContentAssist { if (descriptorProvider != null) { Element element = (Element) parentNode; - String attrName = element.getAttribute(NAME_ATTR); + String attrName = element.getAttribute(ATTR_NAME); int pos = attrName.indexOf(':'); if (pos >= 0) { attrName = attrName.substring(pos + 1); @@ -203,7 +203,7 @@ public class ValuesContentAssist extends AndroidContentAssist { } } - if (parentNode.getNodeName().equals(ITEM_TAG)) { + if (parentNode.getNodeName().equals(TAG_ITEM)) { // Completing text content inside an <item> tag: offer @resource completion. if (prefix.startsWith(PREFIX_RESOURCE_REF) || prefix.trim().length() == 0) { String[] choices = UiResourceAttributeNode.computeResourceStringMatches( @@ -218,7 +218,7 @@ public class ValuesContentAssist extends AndroidContentAssist { String value = typeNode.getNodeValue(); List<String> filtered = new ArrayList<String>(); for (String s : choices) { - if (s.startsWith(PREFIX_ANDROID_RESOURCE_REF) || + if (s.startsWith(ANDROID_PREFIX) || s.startsWith(PREFIX_RESOURCE_REF+ value)) { filtered.add(s); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/descriptors/ValuesDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/descriptors/ValuesDescriptors.java index 8f4d5c8..724e019 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/descriptors/ValuesDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/descriptors/ValuesDescriptors.java @@ -16,6 +16,19 @@ package com.android.ide.eclipse.adt.internal.editors.values.descriptors; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_TYPE; +import static com.android.SdkConstants.TAG_COLOR; +import static com.android.SdkConstants.TAG_DIMEN; +import static com.android.SdkConstants.TAG_DRAWABLE; +import static com.android.SdkConstants.TAG_INTEGER_ARRAY; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_PLURALS; +import static com.android.SdkConstants.TAG_RESOURCES; +import static com.android.SdkConstants.TAG_STRING; +import static com.android.SdkConstants.TAG_STRING_ARRAY; +import static com.android.SdkConstants.TAG_STYLE; + import com.android.ide.common.api.IAttributeInfo.Format; import com.android.ide.common.resources.platform.AttributeInfo; import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescriptor; @@ -35,24 +48,6 @@ import java.util.EnumSet; * Complete description of the structure for resources XML files (under res/values/) */ public final class ValuesDescriptors implements IDescriptorProvider { - - // Public attributes names, attributes descriptors and elements descriptors - - public static final String ROOT_ELEMENT = "resources"; //$NON-NLS-1$ - public static final String STRING_ELEMENT = "string"; //$NON-NLS-1$ - public static final String STYLE_ELEMENT = "style"; //$NON-NLS-1$ - public static final String COLOR_ELEMENT = "color"; //$NON-NLS-1$ - public static final String DIMEN_ELEMENT = "dimen"; //$NON-NLS-1$ - public static final String DRAWABLE_ELEMENT = "drawable"; //$NON-NLS-1$ - public static final String INTEGER_ARRAY_ELEMENT = "integer-array"; //$NON-NLS-1$ - public static final String STRING_ARRAY_ELEMENT = "string-array"; //$NON-NLS-1$ - public static final String PLURALS_ELEMENT = "plurals"; //$NON-NLS-1$ - - public static final String ITEM_TAG = "item"; //$NON-NLS-1$ - public static final String NAME_ATTR = "name"; //$NON-NLS-1$ - public static final String TYPE_ATTR = "type"; //$NON-NLS-1$ - public static final String PARENT_ATTR = "parent"; //$NON-NLS-1$ - private static final ValuesDescriptors sThis = new ValuesDescriptors(); /** The {@link ElementDescriptor} for the root Resources element. */ @@ -85,15 +80,15 @@ public final class ValuesDescriptors implements IDescriptorProvider { // Elements - AttributeInfo nameAttrInfo = new AttributeInfo(NAME_ATTR, Format.STRING_SET); + AttributeInfo nameAttrInfo = new AttributeInfo(ATTR_NAME, Format.STRING_SET); ElementDescriptor color_element = new ElementDescriptor( - COLOR_ELEMENT, + TAG_COLOR, "Color", "A @color@ value specifies an RGB value with an alpha channel, which can be used in various places such as specifying a solid color for a Drawable or the color to use for text. It always begins with a # character and then is followed by the alpha-red-green-blue information in one of the following formats: #RGB, #ARGB, #RRGGBB or #AARRGGBB.", "http://code.google.com/android/reference/available-resources.html#colorvals", //$NON-NLS-1$ new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo), new ColorValueDescriptor( @@ -105,12 +100,12 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor string_element = new ElementDescriptor( - STRING_ELEMENT, + TAG_STRING, "String", "@Strings@, with optional simple formatting, can be stored and retrieved as resources. You can add formatting to your string by using three standard HTML tags: b, i, and u. If you use an apostrophe or a quote in your string, you must either escape it or enclose the whole string in the other kind of enclosing quotes.", "http://code.google.com/android/reference/available-resources.html#stringresources", //$NON-NLS-1$ new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this string."), @@ -122,18 +117,18 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor item_element = new ItemElementDescriptor( - ITEM_TAG, + TAG_ITEM, "Item", null, // TODO find javadoc null, // TODO find link to javadoc new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this resource."), - new ListAttributeDescriptor(TYPE_ATTR, + new ListAttributeDescriptor(ATTR_TYPE, null /* nsUri */, - new AttributeInfo(TYPE_ATTR, + new AttributeInfo(ATTR_TYPE, EnumSet.of(Format.STRING, Format.ENUM) ).setEnumValues(ResourceType.getNames()) ).setTooltip("The mandatory type of this resource."), @@ -144,7 +139,7 @@ public final class ValuesDescriptors implements IDescriptorProvider { ).setFlagValues( new String[] { "boolean", //$NON-NLS-1$ - COLOR_ELEMENT, + TAG_COLOR, "dimension", //$NON-NLS-1$ "float", //$NON-NLS-1$ "fraction", //$NON-NLS-1$ @@ -161,12 +156,12 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor drawable_element = new ElementDescriptor( - DRAWABLE_ELEMENT, + TAG_DRAWABLE, "Drawable", "A @drawable@ defines a rectangle of color. Android accepts color values written in various web-style formats -- a hexadecimal constant in any of the following forms: #RGB, #ARGB, #RRGGBB, #AARRGGBB. Zero in the alpha channel means transparent. The default value is opaque.", "http://code.google.com/android/reference/available-resources.html#colordrawableresources", //$NON-NLS-1$ new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this drawable."), @@ -178,12 +173,12 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor dimen_element = new ElementDescriptor( - DIMEN_ELEMENT, + TAG_DIMEN, "Dimension", "You can create common dimensions to use for various screen elements by defining @dimension@ values in XML. A dimension resource is a number followed by a unit of measurement. Supported units are px (pixels), in (inches), mm (millimeters), pt (points at 72 DPI), dp (density-independent pixels) and sp (scale-independent pixels)", "http://code.google.com/android/reference/available-resources.html#dimension", //$NON-NLS-1$ new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this dimension."), @@ -195,12 +190,12 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor style_element = new ElementDescriptor( - STYLE_ELEMENT, + TAG_STYLE, "Style/Theme", "Both @styles and themes@ are defined in a style block containing one or more string or numerical values (typically color values), or references to other resources (drawables and so on).", "http://code.google.com/android/reference/available-resources.html#stylesandthemes", //$NON-NLS-1$ new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this theme."), @@ -212,12 +207,12 @@ public final class ValuesDescriptors implements IDescriptorProvider { }, new ElementDescriptor[] { new ElementDescriptor( - ITEM_TAG, + TAG_ITEM, "Item", "A value to use in this @theme@. It can be a standard string, a hex color value, or a reference to any other resource type.", "http://code.google.com/android/reference/available-resources.html#stylesandthemes", //$NON-NLS-1$ new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this item."), @@ -231,19 +226,19 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor string_array_element = new ElementDescriptor( - STRING_ARRAY_ELEMENT, + TAG_STRING_ARRAY, "String Array", "An array of strings. Strings are added as underlying item elements to the array.", null, // tooltips new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this string array."), }, new ElementDescriptor[] { new ElementDescriptor( - ITEM_TAG, + TAG_ITEM, "Item", "A string value to use in this string array.", null, // tooltip @@ -258,19 +253,19 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor plurals_element = new ElementDescriptor( - PLURALS_ELEMENT, + TAG_PLURALS, "Quantity Strings (Plurals)", "A quantity string", null, // tooltips new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("A name for the pair of strings. This name will be used as the resource ID."), }, new ElementDescriptor[] { new ElementDescriptor( - ITEM_TAG, + TAG_ITEM, "Item", "A plural or singular string", null, // tooltip @@ -294,19 +289,19 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); ElementDescriptor integer_array_element = new ElementDescriptor( - INTEGER_ARRAY_ELEMENT, + TAG_INTEGER_ARRAY, "Integer Array", "An array of integers. Integers are added as underlying item elements to the array.", null, // tooltips new AttributeDescriptor[] { - new TextAttributeDescriptor(NAME_ATTR, + new TextAttributeDescriptor(ATTR_NAME, null /* nsUri */, nameAttrInfo) .setTooltip("The mandatory name used in referring to this integer array.") }, new ElementDescriptor[] { new ElementDescriptor( - ITEM_TAG, + TAG_ITEM, "Item", "An integer value to use in this integer array.", null, // tooltip @@ -321,7 +316,7 @@ public final class ValuesDescriptors implements IDescriptorProvider { false /* not mandatory */); mResourcesElement = new ElementDescriptor( - ROOT_ELEMENT, + TAG_RESOURCES, "Resources", null, "http://code.google.com/android/reference/available-resources.html", //$NON-NLS-1$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/uimodel/UiItemElementNode.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/uimodel/UiItemElementNode.java index 138605f..88ac3e1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/uimodel/UiItemElementNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/values/uimodel/UiItemElementNode.java @@ -16,10 +16,10 @@ package com.android.ide.eclipse.adt.internal.editors.values.uimodel; +import com.android.SdkConstants; import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ItemElementDescriptor; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -45,8 +45,8 @@ public class UiItemElementNode extends UiElementNode { if (xmlNode != null && xmlNode instanceof Element && xmlNode.hasAttributes()) { Element elem = (Element) xmlNode; - String type = elem.getAttribute(ValuesDescriptors.TYPE_ATTR); - String name = elem.getAttribute(ValuesDescriptors.NAME_ATTR); + String type = elem.getAttribute(SdkConstants.ATTR_TYPE); + String name = elem.getAttribute(SdkConstants.ATTR_NAME); if (type != null && name != null && type.length() > 0 && name.length() > 0) { type = AdtUtils.capitalize(type); return String.format("%1$s (%2$s %3$s)", name, type, getDescriptor().getUiName()); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java index 69f4f55..b494f62 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/InstrumentationRunnerValidator.java @@ -80,7 +80,7 @@ class InstrumentationRunnerValidator { } /** - * Helper method to determine if given manifest has a <code>AndroidConstants.LIBRARY_TEST_RUNNER + * Helper method to determine if given manifest has a <code>SdkConstants.LIBRARY_TEST_RUNNER * </code> library reference * * @param manifestParser the {@link ManifestData} to search diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddPrefixFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddPrefixFix.java index cc8ed75..d8ce657 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddPrefixFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddPrefixFix.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.utils.XmlUtils; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAnnotation.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAnnotation.java index df196de..80dac65 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAnnotation.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAnnotation.java @@ -16,10 +16,10 @@ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.tools.lint.detector.api.LintConstants.FQCN_SUPPRESS_LINT; -import static com.android.tools.lint.detector.api.LintConstants.FQCN_TARGET_API; -import static com.android.tools.lint.detector.api.LintConstants.SUPPRESS_LINT; -import static com.android.tools.lint.detector.api.LintConstants.TARGET_API; +import static com.android.SdkConstants.FQCN_SUPPRESS_LINT; +import static com.android.SdkConstants.FQCN_TARGET_API; +import static com.android.SdkConstants.SUPPRESS_LINT; +import static com.android.SdkConstants.TARGET_API; import static org.eclipse.jdt.core.dom.ArrayInitializer.EXPRESSIONS_PROPERTY; import static org.eclipse.jdt.core.dom.SingleMemberAnnotation.VALUE_PROPERTY; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAttribute.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAttribute.java index e7037ff..23943d5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAttribute.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/AddSuppressAttribute.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_IGNORE; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; +import static com.android.SdkConstants.ATTR_IGNORE; +import static com.android.SdkConstants.DOT_XML; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/ConvertToDpFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/ConvertToDpFix.java index 4a351a0..0ca6aa2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/ConvertToDpFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/ConvertToDpFix.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.common.layout.LayoutConstants.VALUE_N_DP; +import static com.android.SdkConstants.VALUE_N_DP; import com.android.ide.eclipse.adt.AdtPlugin; @@ -109,4 +109,4 @@ final class ConvertToDpFix extends DocumentFix implements IInputValidator { return null; } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java index 16daae3..1937a94 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/EclipseLintClient.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.lint; import static com.android.SdkConstants.FD_NATIVE_LIBS; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_JAR; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_JAR; +import static com.android.SdkConstants.DOT_XML; import static com.android.ide.eclipse.adt.AdtConstants.MARKER_LINT; import static com.android.ide.eclipse.adt.AdtUtils.workspacePathToFile; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LinearLayoutWeightFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LinearLayoutWeightFix.java index dee581f..af3fc74 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LinearLayoutWeightFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LinearLayoutWeightFix.java @@ -15,12 +15,12 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ZERO_DP; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.VALUE_ZERO_DP; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.text.IDocument; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintDeltaProcessor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintDeltaProcessor.java index 6b94232..df8d9af 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintDeltaProcessor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintDeltaProcessor.java @@ -15,9 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_CLASS; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_JAVA; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_JAVA; +import static com.android.SdkConstants.DOT_CLASS; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.EXT_JAVA; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFixGenerator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFixGenerator.java index 97cedc7..47aac0c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFixGenerator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintFixGenerator.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_JAVA; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.DOT_XML; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintJob.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintJob.java index 1d62564..0442f18 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintJob.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintJob.java @@ -15,9 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_CLASS; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_JAVA; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_CLASS; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.DOT_XML; import com.android.SdkConstants; import com.android.annotations.NonNull; @@ -186,4 +186,4 @@ final class LintJob extends Job { IJobManager jobManager = Job.getJobManager(); return jobManager.find(LintJob.FAMILY_RUN_LINT); } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintViewPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintViewPart.java index 188d2cf..90b956e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintViewPart.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/LintViewPart.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_JAVA; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.DOT_XML; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.editors.IconFactory; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/RunLintAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/RunLintAction.java index a0f1262..a0d414e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/RunLintAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/RunLintAction.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_XML; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.AdtUtils; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetAttributeFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetAttributeFix.java index a860c69..4ed5e05 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetAttributeFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetAttributeFix.java @@ -15,17 +15,18 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.common.layout.LayoutConstants.ATTR_CONTENT_DESCRIPTION; -import static com.android.ide.common.layout.LayoutConstants.ATTR_INPUT_TYPE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FALSE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TRANSLATABLE; +import static com.android.SdkConstants.ATTR_BASELINE_ALIGNED; +import static com.android.SdkConstants.ATTR_CONTENT_DESCRIPTION; +import static com.android.SdkConstants.ATTR_INPUT_TYPE; +import static com.android.SdkConstants.ATTR_PERMISSION; +import static com.android.SdkConstants.ATTR_TRANSLATABLE; +import static com.android.SdkConstants.VALUE_FALSE; import com.android.tools.lint.checks.AccessibilityDetector; import com.android.tools.lint.checks.InefficientWeightDetector; import com.android.tools.lint.checks.SecurityDetector; import com.android.tools.lint.checks.TextFieldDetector; import com.android.tools.lint.checks.TranslationDetector; -import com.android.tools.lint.detector.api.LintConstants; import org.eclipse.core.resources.IMarker; @@ -40,9 +41,9 @@ final class SetAttributeFix extends SetPropertyFix { if (mId.equals(AccessibilityDetector.ISSUE.getId())) { return ATTR_CONTENT_DESCRIPTION; } else if (mId.equals(InefficientWeightDetector.BASELINE_WEIGHTS.getId())) { - return LintConstants.ATTR_BASELINE_ALIGNED; + return ATTR_BASELINE_ALIGNED; } else if (mId.equals(SecurityDetector.EXPORTED_SERVICE.getId())) { - return LintConstants.ATTR_PERMISSION; + return ATTR_PERMISSION; } else if (mId.equals(TextFieldDetector.ISSUE.getId())) { return ATTR_INPUT_TYPE; } else if (mId.equals(TranslationDetector.MISSING.getId())) { @@ -117,4 +118,4 @@ final class SetAttributeFix extends SetPropertyFix { return super.getProposal(); } -}
\ No newline at end of file +} diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetPropertyFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetPropertyFix.java index e07ee11..ee049ca 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetPropertyFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetPropertyFix.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.AdtUtils; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetScrollViewSizeFix.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetScrollViewSizeFix.java index 4355950..52860cf 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetScrollViewSizeFix.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/lint/SetScrollViewSizeFix.java @@ -15,11 +15,11 @@ */ package com.android.ide.eclipse.adt.internal.lint; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; -import static com.android.tools.lint.detector.api.LintConstants.HORIZONTAL_SCROLL_VIEW; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.HORIZONTAL_SCROLL_VIEW; +import static com.android.SdkConstants.VALUE_WRAP_CONTENT; import org.eclipse.core.resources.IMarker; import org.eclipse.jface.text.IDocument; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AttributeSortOrder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AttributeSortOrder.java index 5df1a5e..b743014 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AttributeSortOrder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/preferences/AttributeSortOrder.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.preferences; -import static com.android.utils.XmlUtils.XMLNS; +import static com.android.SdkConstants.XMLNS; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiAttributeNode; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java index c448f9b..fb8742d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ExportHelper.java @@ -136,7 +136,7 @@ public final class ExportHelper { // tmp file for the packaged resource file. To not disturb the incremental builders // output, all intermediary files are created in tmp files. - File resourceFile = File.createTempFile(TEMP_PREFIX, AdtConstants.DOT_RES); + File resourceFile = File.createTempFile(TEMP_PREFIX, SdkConstants.DOT_RES); resourceFile.deleteOnExit(); // Make sure the PNG crunch cache is up to date @@ -160,7 +160,7 @@ public final class ExportHelper { // Step 2. Convert the byte code to Dalvik bytecode // tmp file for the packaged resource file. - File dexFile = File.createTempFile(TEMP_PREFIX, AdtConstants.DOT_DEX); + File dexFile = File.createTempFile(TEMP_PREFIX, SdkConstants.DOT_DEX); dexFile.deleteOnExit(); ProjectState state = Sdk.getProjectState(project); @@ -219,7 +219,7 @@ public final class ExportHelper { // create a jar file containing all the project output (as proguard cannot // process folders of .class files). - File inputJar = File.createTempFile(TEMP_PREFIX, AdtConstants.DOT_JAR); + File inputJar = File.createTempFile(TEMP_PREFIX, SdkConstants.DOT_JAR); inputJar.deleteOnExit(); JarOutputStream jos = new JarOutputStream(new FileOutputStream(inputJar)); @@ -237,7 +237,7 @@ public final class ExportHelper { jos.close(); // destination file for proguard - File obfuscatedJar = File.createTempFile(TEMP_PREFIX, AdtConstants.DOT_JAR); + File obfuscatedJar = File.createTempFile(TEMP_PREFIX, SdkConstants.DOT_JAR); obfuscatedJar.deleteOnExit(); // run proguard @@ -327,7 +327,7 @@ public final class ExportHelper { Shell shell = Display.getCurrent().getActiveShell(); // create a default file name for the apk. - String fileName = project.getName() + AdtConstants.DOT_ANDROID_PACKAGE; + String fileName = project.getName() + SdkConstants.DOT_ANDROID_PACKAGE; // Pop up the file save window to get the file location FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java index ff4ac05..aa0e736 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java @@ -207,7 +207,7 @@ public class LibraryClasspathContainerInitializer extends BaseClasspathContainer if (outputFolder != null) { // can happen when closing/deleting a library) IFile jarIFile = outputFolder.getFile(libProject.getName().toLowerCase() + - AdtConstants.DOT_JAR); + SdkConstants.DOT_JAR); // get the source folder for the library project List<IPath> srcs = BaseProjectHelper.getSourceClasspaths(libProject); @@ -383,7 +383,7 @@ public class LibraryClasspathContainerInitializer extends BaseClasspathContainer IResource[] members = libsFolder.members(); for (IResource member : members) { if (member.getType() == IResource.FILE && - AdtConstants.EXT_JAR.equalsIgnoreCase(member.getFileExtension())) { + SdkConstants.EXT_JAR.equalsIgnoreCase(member.getFileExtension())) { jarFiles.add(member.getLocation().toFile()); } } @@ -536,7 +536,7 @@ public class LibraryClasspathContainerInitializer extends BaseClasspathContainer IResource resource = wsRoot.findMember(path); - if (AdtConstants.EXT_JAR.equalsIgnoreCase(path.getFileExtension())) { + if (SdkConstants.EXT_JAR.equalsIgnoreCase(path.getFileExtension())) { // case of a jar file (which could be relative to the workspace or a full path) if (resource != null && resource.exists() && resource.getType() == IResource.FILE) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectHelper.java index 2146b88..cb58b02 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectHelper.java @@ -813,10 +813,10 @@ public final class ProjectHelper { */ public static String getApkFilename(IProject project, String config) { if (config != null) { - return project.getName() + "-" + config + AdtConstants.DOT_ANDROID_PACKAGE; //$NON-NLS-1$ + return project.getName() + "-" + config + SdkConstants.DOT_ANDROID_PACKAGE; //$NON-NLS-1$ } - return project.getName() + AdtConstants.DOT_ANDROID_PACKAGE; + return project.getName() + SdkConstants.DOT_ANDROID_PACKAGE; } /** @@ -872,7 +872,7 @@ public final class ProjectHelper { // get the package path - String packageName = project.getName() + AdtConstants.DOT_ANDROID_PACKAGE; + String packageName = project.getName() + SdkConstants.DOT_ANDROID_PACKAGE; IResource r = outputLocation.findMember(packageName); // check the package is present diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/SupportLibraryHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/SupportLibraryHelper.java index 35bc2a9..e1819b2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/SupportLibraryHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/SupportLibraryHelper.java @@ -16,10 +16,10 @@ package com.android.ide.eclipse.adt.internal.project; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT_V7; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE; -import static com.android.ide.common.layout.LayoutConstants.FQCN_SPACE_V7; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT_V7; +import static com.android.SdkConstants.FQCN_SPACE; +import static com.android.SdkConstants.FQCN_SPACE_V7; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/changes/AndroidLayoutChange.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/changes/AndroidLayoutChange.java index c9d6b34..834a57c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/changes/AndroidLayoutChange.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/changes/AndroidLayoutChange.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.refactoring.changes; -import com.android.ide.common.layout.LayoutConstants; +import com.android.SdkConstants; import com.android.ide.eclipse.adt.internal.refactoring.core.RefactoringUtil; import org.eclipse.core.filebuffers.ITextFileBufferManager; @@ -135,8 +135,8 @@ public class AndroidLayoutChange extends DocumentChange { MultiTextEdit multiEdit = new MultiTextEdit(); for (AndroidLayoutChangeDescription change : mChanges) { if (!change.isStandalone()) { - TextEdit edit = createTextEdit(LayoutConstants.VIEW, - LayoutConstants.ATTR_CLASS, + TextEdit edit = createTextEdit(SdkConstants.VIEW, + SdkConstants.ATTR_CLASS, change.getClassName(), change.getNewName()); if (edit != null) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java index 6a17b1b..52b49a7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidPackageRenameParticipant.java @@ -16,9 +16,7 @@ package com.android.ide.eclipse.adt.internal.refactoring.core; -import com.android.AndroidConstants; import com.android.SdkConstants; -import com.android.ide.common.layout.LayoutConstants; import com.android.ide.common.xml.ManifestData; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper; @@ -298,7 +296,7 @@ public class AndroidPackageRenameParticipant extends AndroidRenameParticipant { IResource resource = layoutMembers[j]; if (resource instanceof IFolder && resource.exists() - && resource.getName().startsWith(AndroidConstants.FD_RES_LAYOUT)) { + && resource.getName().startsWith(SdkConstants.FD_RES_LAYOUT)) { IFolder layoutFolder = (IFolder) resource; IResource[] members = layoutFolder.members(); for (int i = 0; i < members.length; i++) { @@ -355,13 +353,13 @@ public class AndroidPackageRenameParticipant extends AndroidRenameParticipant { if (model != null) { IDOMModel xmlModel = (IDOMModel) model; IDOMDocument xmlDoc = xmlModel.getDocument(); - NodeList nodes = xmlDoc.getElementsByTagName(LayoutConstants.VIEW); + NodeList nodes = xmlDoc.getElementsByTagName(SdkConstants.VIEW); for (int i = 0; i < nodes.getLength(); i++) { Node node = nodes.item(i); NamedNodeMap attributes = node.getAttributes(); if (attributes != null) { Node attributeNode = attributes - .getNamedItem(LayoutConstants.ATTR_CLASS); + .getNamedItem(SdkConstants.ATTR_CLASS); if (attributeNode instanceof Attr) { Attr attribute = (Attr) attributeNode; String value = attribute.getValue(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java index 039f83f..25ca533 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeMoveParticipant.java @@ -16,9 +16,7 @@ package com.android.ide.eclipse.adt.internal.refactoring.core; -import com.android.AndroidConstants; import com.android.SdkConstants; -import com.android.ide.common.layout.LayoutConstants; import com.android.ide.common.xml.ManifestData; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper; @@ -233,7 +231,7 @@ public class AndroidTypeMoveParticipant extends MoveParticipant { private void addLayoutChanges(IProject project, String className) { try { IFolder resFolder = project.getFolder(SdkConstants.FD_RESOURCES); - IFolder layoutFolder = resFolder.getFolder(AndroidConstants.FD_RES_LAYOUT); + IFolder layoutFolder = resFolder.getFolder(SdkConstants.FD_RES_LAYOUT); IResource[] members = layoutFolder.members(); for (int i = 0; i < members.length; i++) { IResource member = members[i]; @@ -281,13 +279,13 @@ public class AndroidTypeMoveParticipant extends MoveParticipant { if (model != null) { IDOMModel xmlModel = (IDOMModel) model; IDOMDocument xmlDoc = xmlModel.getDocument(); - NodeList nodes = xmlDoc.getElementsByTagName(LayoutConstants.VIEW); + NodeList nodes = xmlDoc.getElementsByTagName(SdkConstants.VIEW); for (int i = 0; i < nodes.getLength(); i++) { Node node = nodes.item(i); NamedNodeMap attributes = node.getAttributes(); if (attributes != null) { Node attributeNode = - attributes.getNamedItem(LayoutConstants.ATTR_CLASS); + attributes.getNamedItem(SdkConstants.ATTR_CLASS); if (attributeNode instanceof Attr) { Attr attribute = (Attr) attributeNode; String value = attribute.getValue(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java index d3fa5c4..d62cc23 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactoring/core/AndroidTypeRenameParticipant.java @@ -16,9 +16,7 @@ package com.android.ide.eclipse.adt.internal.refactoring.core; -import com.android.AndroidConstants; import com.android.SdkConstants; -import com.android.ide.common.layout.LayoutConstants; import com.android.ide.common.xml.ManifestData; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper; @@ -194,7 +192,7 @@ public class AndroidTypeRenameParticipant extends AndroidRenameParticipant { private void addLayoutChanges(IProject project, String className) { try { IFolder resFolder = project.getFolder(SdkConstants.FD_RESOURCES); - IFolder layoutFolder = resFolder.getFolder(AndroidConstants.FD_RES_LAYOUT); + IFolder layoutFolder = resFolder.getFolder(SdkConstants.FD_RES_LAYOUT); IResource[] members = layoutFolder.members(); for (int i = 0; i < members.length; i++) { IResource member = members[i]; @@ -243,13 +241,13 @@ public class AndroidTypeRenameParticipant extends AndroidRenameParticipant { IDOMModel xmlModel = (IDOMModel) model; IDOMDocument xmlDoc = xmlModel.getDocument(); NodeList nodes = xmlDoc - .getElementsByTagName(LayoutConstants.VIEW); + .getElementsByTagName(SdkConstants.VIEW); for (int i = 0; i < nodes.getLength(); i++) { Node node = nodes.item(i); NamedNodeMap attributes = node.getAttributes(); if (attributes != null) { Node attributeNode = - attributes.getNamedItem(LayoutConstants.ATTR_CLASS); + attributes.getNamedItem(SdkConstants.ATTR_CLASS); if (attributeNode instanceof Attr) { Attr attribute = (Attr) attributeNode; String value = attribute.getValue(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java index d3304a4..5ac5f5c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringInputPage.java @@ -17,7 +17,6 @@ package com.android.ide.eclipse.adt.internal.refactorings.extractstring; -import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.ide.common.resources.configuration.FolderConfiguration; import com.android.ide.eclipse.adt.AdtConstants; @@ -582,7 +581,7 @@ class ExtractStringInputPage extends UserInputWizardPage { wsFolderPath = wsFolderPath.substring(0, pos); } - String[] folderSegments = wsFolderPath.split(AndroidConstants.RES_QUALIFIER_SEP); + String[] folderSegments = wsFolderPath.split(SdkConstants.RES_QUALIFIER_SEP); if (folderSegments.length > 0) { String folderName = folderSegments[0]; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java index abdbd66..e9d386e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/ExtractStringRefactoring.java @@ -16,10 +16,10 @@ package com.android.ide.eclipse.adt.internal.refactorings.extractstring; -import static com.android.ide.common.layout.LayoutConstants.STRING_PREFIX; -import static com.android.utils.XmlUtils.AMP_ENTITY; -import static com.android.utils.XmlUtils.LT_ENTITY; -import static com.android.utils.XmlUtils.QUOT_ENTITY; +import static com.android.SdkConstants.AMP_ENTITY; +import static com.android.SdkConstants.LT_ENTITY; +import static com.android.SdkConstants.QUOT_ENTITY; +import static com.android.SdkConstants.STRING_PREFIX; import com.android.SdkConstants; import com.android.ide.common.xml.ManifestData; @@ -29,7 +29,6 @@ import com.android.ide.eclipse.adt.internal.editors.descriptors.AttributeDescrip import com.android.ide.eclipse.adt.internal.editors.descriptors.ReferenceAttributeDescriptor; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiAttributeNode; import com.android.ide.eclipse.adt.internal.editors.uimodel.UiElementNode; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper; import com.android.resources.ResourceFolderType; import com.android.resources.ResourceType; @@ -427,7 +426,7 @@ public class ExtractStringRefactoring extends Refactoring { } // Check this a Layout XML file and get the selection and its context. - if (mFile != null && AdtConstants.EXT_XML.equals(mFile.getFileExtension())) { + if (mFile != null && SdkConstants.EXT_XML.equals(mFile.getFileExtension())) { // Currently we only support Android resource XML files, so they must have a path // similar to @@ -1069,7 +1068,7 @@ public class ExtractStringRefactoring extends Refactoring { if (res.exists() && !res.isDerived() && res instanceof IFile) { IFile file = (IFile) res; // Must have an XML extension - if (AdtConstants.EXT_XML.equals(file.getFileExtension())) { + if (SdkConstants.EXT_XML.equals(file.getFileExtension())) { IPath p = file.getFullPath(); // And not be either paths we want to filter out if ((mFilterPath1 != null && mFilterPath1.equals(p)) || @@ -1117,7 +1116,7 @@ public class ExtractStringRefactoring extends Refactoring { SubMonitor monitor) { TextFileChange xmlChange = new TextFileChange(getName(), targetXml); - xmlChange.setTextType(AdtConstants.EXT_XML); + xmlChange.setTextType(SdkConstants.EXT_XML); String error = ""; //$NON-NLS-1$ TextEdit edit = null; @@ -1186,9 +1185,9 @@ public class ExtractStringRefactoring extends Refactoring { IModelManager modelMan = StructuredModelManager.getModelManager(); - final String NODE_RESOURCES = ValuesDescriptors.ROOT_ELEMENT; - final String NODE_STRING = "string"; //$NON-NLS-1$ //TODO find or create constant - final String ATTR_NAME = "name"; //$NON-NLS-1$ //TODO find or create constant + final String NODE_RESOURCES = SdkConstants.TAG_RESOURCES; + final String NODE_STRING = SdkConstants.TAG_STRING; + final String ATTR_NAME = SdkConstants.ATTR_NAME; // Scan the source to find the best insertion point. @@ -1570,7 +1569,7 @@ public class ExtractStringRefactoring extends Refactoring { HashSet<IFile> files = new HashSet<IFile>(); files.add(sourceFile); - if (allConfigurations && AdtConstants.EXT_XML.equals(sourceFile.getFileExtension())) { + if (allConfigurations && SdkConstants.EXT_XML.equals(sourceFile.getFileExtension())) { IPath path = sourceFile.getFullPath(); if (path.segmentCount() == 4 && path.segment(1).equals(SdkConstants.FD_RESOURCES)) { IProject project = sourceFile.getProject(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/XmlStringFileHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/XmlStringFileHelper.java index 9a40464..01e814e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/XmlStringFileHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/extractstring/XmlStringFileHelper.java @@ -16,18 +16,12 @@ package com.android.ide.eclipse.adt.internal.refactorings.extractstring; +import com.android.SdkConstants; import com.android.ide.eclipse.adt.AdtPlugin; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; -import org.eclipse.core.filebuffers.FileBuffers; -import org.eclipse.core.filebuffers.ITextFileBuffer; -import org.eclipse.core.filebuffers.ITextFileBufferManager; -import org.eclipse.core.filebuffers.LocationKind; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jface.text.IDocument; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; @@ -124,15 +118,15 @@ class XmlStringFileHelper { // <string name="ID">something</string> // </resources> - Node root = findChild(doc, null, ValuesDescriptors.ROOT_ELEMENT); + Node root = findChild(doc, null, SdkConstants.TAG_RESOURCES); if (root != null) { for (Node strNode = findChild(root, null, - ValuesDescriptors.STRING_ELEMENT); + SdkConstants.TAG_STRING); strNode != null; strNode = findChild(null, strNode, - ValuesDescriptors.STRING_ELEMENT)) { + SdkConstants.TAG_STRING)) { NamedNodeMap attrs = strNode.getAttributes(); - Node nameAttr = attrs.getNamedItem(ValuesDescriptors.NAME_ATTR); + Node nameAttr = attrs.getNamedItem(SdkConstants.ATTR_NAME); if (nameAttr != null) { String id = nameAttr.getNodeValue(); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoring.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoring.java index 92f6853..7005d82 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoring.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/refactorings/renamepackage/ApplicationPackageNameRefactoring.java @@ -16,9 +16,6 @@ package com.android.ide.eclipse.adt.internal.refactorings.renamepackage; -import static com.android.utils.XmlUtils.ANDROID_URI; -import static com.android.utils.XmlUtils.XMLNS_COLON; - import com.android.SdkConstants; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; @@ -151,7 +148,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { ImportRewrite irw = ImportRewrite.create(cu, true); irw.addImport(mNewPackageName.getFullyQualifiedName() + '.' - + AdtConstants.FN_RESOURCE_BASE); + + SdkConstants.FN_RESOURCE_BASE); try { rewrittenImports.addChild( irw.rewriteImports(null) ); @@ -208,7 +205,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { } TextFileChange xmlChange = new TextFileChange("XML resource file edit", file); - xmlChange.setTextType(AdtConstants.EXT_XML); + xmlChange.setTextType(SdkConstants.EXT_XML); MultiTextEdit multiEdit = new MultiTextEdit(); ArrayList<TextEditGroup> editGroups = new ArrayList<TextEditGroup>(); @@ -241,7 +238,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { // Check this is the attribute and the original string if (lastAttrName != null && - lastAttrName.startsWith(XMLNS_COLON)) { + lastAttrName.startsWith(SdkConstants.XMLNS_PREFIX)) { String lastAttrValue = region.getText(subRegion); if (oldAppNamespaceString.equals(stripQuotes(lastAttrValue))) { @@ -299,7 +296,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { } TextFileChange xmlChange = new TextFileChange("Make Manifest edits", file); - xmlChange.setTextType(AdtConstants.EXT_XML); + xmlChange.setTextType(SdkConstants.EXT_XML); MultiTextEdit multiEdit = new MultiTextEdit(); ArrayList<TextEditGroup> editGroups = new ArrayList<TextEditGroup>(); @@ -336,12 +333,12 @@ class ApplicationPackageNameRefactoring extends Refactoring { String lastAttrValue = region.getText(subRegion); if (lastAttrName != null && - lastAttrName.startsWith(XMLNS_COLON)) { + lastAttrName.startsWith(SdkConstants.XMLNS_PREFIX)) { // Resolves the android namespace prefix for this file - if (ANDROID_URI.equals(stripQuotes(lastAttrValue))) { + if (SdkConstants.ANDROID_URI.equals(stripQuotes(lastAttrValue))) { String android_namespace_prefix = lastAttrName - .substring(XMLNS_COLON.length()); + .substring(SdkConstants.XMLNS_PREFIX.length()); android_name_attribute = android_namespace_prefix + ':' + AndroidManifest.ATTRIBUTE_NAME; } @@ -416,7 +413,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { public boolean visit(IResource resource) throws CoreException { if (resource instanceof IFile) { IFile file = (IFile) resource; - if (AdtConstants.EXT_JAVA.equals(file.getFileExtension())) { + if (SdkConstants.EXT_JAVA.equals(file.getFileExtension())) { ICompilationUnit icu = JavaCore.createCompilationUnitFrom(file); @@ -429,7 +426,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { edit.addChild(text_edit); TextFileChange text_file_change = new TextFileChange(file.getName(), file); - text_file_change.setTextType(AdtConstants.EXT_JAVA); + text_file_change.setTextType(SdkConstants.EXT_JAVA); text_file_change.setEdit(edit); mChanges.add(text_file_change); } @@ -437,7 +434,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { // XXX Partially taken from ExtractStringRefactoring.java // Check this a Layout XML file and get the selection and // its context. - } else if (AdtConstants.EXT_XML.equals(file.getFileExtension())) { + } else if (SdkConstants.EXT_XML.equals(file.getFileExtension())) { if (SdkConstants.FN_ANDROID_MANIFEST_XML.equals(file.getName())) { @@ -509,7 +506,7 @@ class ApplicationPackageNameRefactoring extends Refactoring { QualifiedName qualifiedImportName = (QualifiedName) importName; if (qualifiedImportName.getName().getIdentifier() - .equals(AdtConstants.FN_RESOURCE_BASE)) { + .equals(SdkConstants.FN_RESOURCE_BASE)) { mRewriter.replace(qualifiedImportName.getQualifier(), mNewPackageName, null); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceHelper.java index e3ccc0b..6b09b34 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceHelper.java @@ -16,16 +16,21 @@ package com.android.ide.eclipse.adt.internal.resources; -import static com.android.AndroidConstants.FD_RES_VALUES; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ANDROID_STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_COLOR; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_TYPE; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.EXT_XML; import static com.android.SdkConstants.FD_RESOURCES; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_STYLE; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_STYLE; -import static com.android.ide.eclipse.adt.AdtConstants.ANDROID_PKG; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; +import static com.android.SdkConstants.FD_RES_VALUES; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_RESOURCES; import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP; -import static com.android.utils.XmlUtils.ANDROID_URI; import com.android.ide.common.rendering.api.ResourceValue; import com.android.ide.common.resources.ResourceDeltaKind; @@ -58,7 +63,6 @@ import com.android.ide.eclipse.adt.internal.editors.Hyperlinks; import com.android.ide.eclipse.adt.internal.editors.IconFactory; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.ImageUtils; import com.android.ide.eclipse.adt.internal.editors.layout.refactoring.VisualRefactoring; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; import com.android.ide.eclipse.adt.internal.wizards.newxmlfile.NewXmlFileWizard; import com.android.resources.FolderTypeRelationship; import com.android.resources.ResourceFolderType; @@ -113,9 +117,6 @@ import javax.xml.parsers.DocumentBuilderFactory; @SuppressWarnings("restriction") // XML model public class ResourceHelper { - private static final String TAG_ITEM = "item"; //$NON-NLS-1$ - private static final String ATTR_COLOR = "color"; //$NON-NLS-1$ - private final static Map<Class<?>, Image> sIconMap = new HashMap<Class<?>, Image>( FolderConfiguration.getQualifierCount()); @@ -183,7 +184,7 @@ public class ResourceHelper { * @return a pair of the resource type and the resource name */ public static Pair<ResourceType,String> parseResource(String url) { - if (!url.startsWith("@")) { //$NON-NLS-1$ + if (!url.startsWith(PREFIX_RESOURCE_REF)) { return null; } int typeEnd = url.indexOf('/', 1); @@ -274,7 +275,7 @@ public class ResourceHelper { */ public static boolean canCreateResource(String resource) { // Cannot create framework resources - if (resource.startsWith('@' + ANDROID_PKG + ':')) { + if (resource.startsWith(ANDROID_PREFIX)) { return false; } @@ -411,9 +412,9 @@ public class ResourceHelper { elementImpl.setEmptyTag(true); } } - element.setAttribute(ValuesDescriptors.NAME_ATTR, name); + element.setAttribute(ATTR_NAME, name); if (!tagName.equals(typeName)) { - element.setAttribute(ValuesDescriptors.TYPE_ATTR, typeName); + element.setAttribute(ATTR_TYPE, typeName); } root.insertBefore(element, nextChild); IRegion region = null; @@ -450,7 +451,7 @@ public class ResourceHelper { String prolog = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"; //$NON-NLS-1$ StringBuilder sb = new StringBuilder(prolog); - String root = ValuesDescriptors.ROOT_ELEMENT; + String root = TAG_RESOURCES; sb.append('<').append(root).append('>').append('\n'); sb.append(" "); //$NON-NLS-1$ sb.append('<'); @@ -508,10 +509,10 @@ public class ResourceHelper { * @return the user visible theme name */ public static String styleToTheme(String style) { - if (style.startsWith(PREFIX_STYLE)) { - style = style.substring(PREFIX_STYLE.length()); - } else if (style.startsWith(PREFIX_ANDROID_STYLE)) { - style = style.substring(PREFIX_ANDROID_STYLE.length()); + if (style.startsWith(STYLE_RESOURCE_PREFIX)) { + style = style.substring(STYLE_RESOURCE_PREFIX.length()); + } else if (style.startsWith(ANDROID_STYLE_RESOURCE_PREFIX)) { + style = style.substring(ANDROID_STYLE_RESOURCE_PREFIX.length()); } else if (style.startsWith(PREFIX_RESOURCE_REF)) { // @package:style/foo int index = style.indexOf('/'); @@ -530,9 +531,10 @@ public class ResourceHelper { * to a framework theme */ public static boolean isProjectStyle(String style) { - assert style.startsWith(PREFIX_STYLE) || style.startsWith(PREFIX_ANDROID_STYLE) : style; + assert style.startsWith(STYLE_RESOURCE_PREFIX) + || style.startsWith(ANDROID_STYLE_RESOURCE_PREFIX) : style; - return style.startsWith(PREFIX_STYLE); + return style.startsWith(STYLE_RESOURCE_PREFIX); } /** @@ -577,7 +579,7 @@ public class ResourceHelper { } return null; } - if (value.startsWith("@")) { //$NON-NLS-1$ + if (value.startsWith(PREFIX_RESOURCE_REF)) { boolean isFramework = color.isFramework(); color = resources.findResValue(value, isFramework); if (color != null) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java index be11cf7..5ea1edc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/ResourceNameValidator.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.resources; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_XML; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java index ac70547..6554cc2 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/CompiledResourcesMonitor.java @@ -16,6 +16,7 @@ package com.android.ide.eclipse.adt.internal.resources.manager; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.resources.IntArrayWrapper; @@ -91,7 +92,7 @@ public final class CompiledResourcesMonitor implements IFileListener, IProjectLi IProject project = file.getProject(); - if (file.getName().equals(AdtConstants.FN_COMPILED_RESOURCE_CLASS)) { + if (file.getName().equals(SdkConstants.FN_COMPILED_RESOURCE_CLASS)) { // create the classname String className = getRClassName(project); if (className == null) { @@ -118,7 +119,7 @@ public final class CompiledResourcesMonitor implements IFileListener, IProjectLi */ private boolean packagePathMatches(String path, String packageName) { // First strip the ".class" off the end of the path - String pathWithoutExtension = path.substring(0, path.indexOf(AdtConstants.DOT_CLASS)); + String pathWithoutExtension = path.substring(0, path.indexOf(SdkConstants.DOT_CLASS)); // then split the components of each path by their separators String [] pathArray = pathWithoutExtension.split(Pattern.quote(File.separator)); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java index e118ff7..f993d89 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/resources/manager/ProjectClassLoader.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.resources.manager; -import com.android.ide.eclipse.adt.AdtConstants; +import com.android.SdkConstants; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.build.BuildHelper; import com.android.ide.eclipse.adt.internal.sdk.ProjectState; @@ -304,7 +304,7 @@ public final class ProjectClassLoader extends ClassLoader { IPath path = e.getPath(); // check the name ends with .jar - if (AdtConstants.EXT_JAR.equalsIgnoreCase(path.getFileExtension())) { + if (SdkConstants.EXT_JAR.equalsIgnoreCase(path.getFileExtension())) { boolean local = false; IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path); if (resource != null && resource.exists() && diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java index e2f8a57..161d567 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidJarLoader.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.sdk; -import com.android.ide.eclipse.adt.AdtConstants; +import com.android.SdkConstants; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; @@ -162,7 +162,7 @@ public class AndroidJarLoader extends ClassLoader implements IAndroidClassLoader // get the name of the entry. String entryPath = entry.getName(); - if (!entryPath.endsWith(AdtConstants.DOT_CLASS)) { + if (!entryPath.endsWith(SdkConstants.DOT_CLASS)) { // only accept class files continue; } @@ -227,7 +227,7 @@ public class AndroidJarLoader extends ClassLoader implements IAndroidClassLoader while ((entry = zis.getNextEntry()) != null) { // get the name of the entry and convert to a class binary name String entryPath = entry.getName(); - if (!entryPath.endsWith(AdtConstants.DOT_CLASS)) { + if (!entryPath.endsWith(SdkConstants.DOT_CLASS)) { // only accept class files continue; } @@ -349,7 +349,7 @@ public class AndroidJarLoader extends ClassLoader implements IAndroidClassLoader // The name is a binary name. Something like "android.R", or "android.R$id". // Make a path out of it. - String entryName = className.replaceAll("\\.", "/") + AdtConstants.DOT_CLASS; //$NON-NLS-1$ //$NON-NLS-2$ + String entryName = className.replaceAll("\\.", "/") + SdkConstants.DOT_CLASS; //$NON-NLS-1$ //$NON-NLS-2$ // create streams to read the intermediary archive FileInputStream fis = new FileInputStream(mOsFrameworkLocation); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java index 92f7311..59a1236 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AndroidTargetData.java @@ -66,7 +66,7 @@ public class AndroidTargetData { * mAttributeValues is a map { key => list [ values ] }. * The key for the map is "(element-xml-name,attribute-namespace:attribute-xml-local-name)". * The attribute namespace prefix must be: - * - "android" for AndroidConstants.NS_RESOURCES + * - "android" for SdkConstants.NS_RESOURCES * - "xmlns" for the XMLNS URI. * * This is used for attributes that do not have a unique name, but still need to be populated diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/LayoutParamsParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/LayoutParamsParser.java index 5e38c64..d05c12a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/LayoutParamsParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/LayoutParamsParser.java @@ -262,7 +262,7 @@ public class LayoutParamsParser { IClassDescriptor superClass = groupClass.getSuperclass(); // Assertion: at this point, we should have - // superClass != mTopViewClass || fqcn.equals(AndroidConstants.CLASS_VIEWGROUP); + // superClass != mTopViewClass || fqcn.equals(SdkConstants.CLASS_VIEWGROUP); if (superClass != null && superClass.equals(mTopViewClass) == false) { ExtViewClassInfo superClassInfo = addGroup(superClass); 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 29ad9fa..b1b057b 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 @@ -17,8 +17,8 @@ package com.android.ide.eclipse.adt.internal.sdk; import static com.android.SdkConstants.FD_RES; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_JAR; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.EXT_JAR; import com.android.SdkConstants; import com.android.annotations.NonNull; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java index 5173a996..ce36457 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ConfigurationSelector.java @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.ui; -import com.android.AndroidConstants; +import com.android.SdkConstants; import com.android.ide.common.resources.configuration.CountryCodeQualifier; import com.android.ide.common.resources.configuration.DensityQualifier; import com.android.ide.common.resources.configuration.FolderConfiguration; @@ -525,7 +525,7 @@ public class ConfigurationSelector extends Composite { */ public boolean setConfiguration(String folderName) { // split the name of the folder in segments. - String[] folderSegments = folderName.split(AndroidConstants.RES_QUALIFIER_SEP); + String[] folderSegments = folderName.split(SdkConstants.RES_QUALIFIER_SEP); return setConfiguration(folderSegments); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java index 6be5084..1291af8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceChooser.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.ui; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_ANDROID_RESOURCE_REF; -import static com.android.ide.common.resources.ResourceResolver.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -155,7 +155,7 @@ public class ResourceChooser extends AbstractElementListSelectionDialog implemen PREFIX_RESOURCE_REF + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ mSystemResourcePattern = Pattern.compile( - PREFIX_ANDROID_RESOURCE_REF + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ + ANDROID_PREFIX + mResourceType.getName() + "/(.+)"); //$NON-NLS-1$ setTitle("Resource Chooser"); setMessage(String.format("Choose a %1$s resource", diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java index 746e727..f48423c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourceExplorerView.java @@ -73,7 +73,7 @@ import java.util.Iterator; public class ResourceExplorerView extends ViewPart implements ISelectionListener, IResourceEventListener { - // Note: keep using the obsolete AndroidConstants.EDITORS_NAMESPACE (which used + // Note: keep using the obsolete SdkConstants.EDITORS_NAMESPACE (which used // to be the Editors Plugin ID) to keep existing preferences functional. private final static String PREFS_COLUMN_RES = AdtConstants.EDITORS_NAMESPACE + "ResourceExplorer.Col1"; //$NON-NLS-1$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourcePreviewHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourcePreviewHelper.java index 94bafb5..d97d176 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourcePreviewHelper.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/ui/ResourcePreviewHelper.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.ui; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_9PNG; +import static com.android.SdkConstants.DOT_9PNG; import static com.android.ide.eclipse.adt.AdtUtils.endsWithIgnoreCase; import com.android.ide.common.rendering.api.ResourceValue; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ApplicationInfoPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ApplicationInfoPage.java index 79107d3..c832534 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ApplicationInfoPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/ApplicationInfoPage.java @@ -568,7 +568,7 @@ public class ApplicationInfoPage extends WizardPage implements SelectionListener } else if (osTarget.indexOf('.') == 0) { osTarget = mValues.packageName + osTarget; } - osTarget = osTarget.replace('.', File.separatorChar) + AdtConstants.DOT_JAVA; + osTarget = osTarget.replace('.', File.separatorChar) + SdkConstants.DOT_JAVA; File projectDir = mValues.projectLocation; File[] allDirs = projectDir.listFiles(new FileFilter() { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java index b8f7c50..2f7ad7a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectCreator.java @@ -20,11 +20,9 @@ import static com.android.SdkConstants.FN_PROJECT_PROPERTIES; import static com.android.sdklib.internal.project.ProjectProperties.PROPERTY_LIBRARY; import static org.eclipse.core.resources.IResource.DEPTH_ZERO; -import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.ide.common.layout.LayoutConstants; import com.android.ide.common.xml.ManifestData; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; @@ -147,23 +145,23 @@ public class NewProjectCreator { private static final String ASSETS_DIRECTORY = SdkConstants.FD_ASSETS + AdtConstants.WS_SEP; private static final String DRAWABLE_DIRECTORY = - AndroidConstants.FD_RES_DRAWABLE + AdtConstants.WS_SEP; + SdkConstants.FD_RES_DRAWABLE + AdtConstants.WS_SEP; private static final String DRAWABLE_XHDPI_DIRECTORY = - AndroidConstants.FD_RES_DRAWABLE + '-' + Density.XHIGH.getResourceValue() + + SdkConstants.FD_RES_DRAWABLE + '-' + Density.XHIGH.getResourceValue() + AdtConstants.WS_SEP; private static final String DRAWABLE_HDPI_DIRECTORY = - AndroidConstants.FD_RES_DRAWABLE + '-' + Density.HIGH.getResourceValue() + + SdkConstants.FD_RES_DRAWABLE + '-' + Density.HIGH.getResourceValue() + AdtConstants.WS_SEP; private static final String DRAWABLE_MDPI_DIRECTORY = - AndroidConstants.FD_RES_DRAWABLE + '-' + Density.MEDIUM.getResourceValue() + + SdkConstants.FD_RES_DRAWABLE + '-' + Density.MEDIUM.getResourceValue() + AdtConstants.WS_SEP; private static final String DRAWABLE_LDPI_DIRECTORY = - AndroidConstants.FD_RES_DRAWABLE + '-' + Density.LOW.getResourceValue() + + SdkConstants.FD_RES_DRAWABLE + '-' + Density.LOW.getResourceValue() + AdtConstants.WS_SEP; private static final String LAYOUT_DIRECTORY = - AndroidConstants.FD_RES_LAYOUT + AdtConstants.WS_SEP; + SdkConstants.FD_RES_LAYOUT + AdtConstants.WS_SEP; private static final String VALUES_DIRECTORY = - AndroidConstants.FD_RES_VALUES + AdtConstants.WS_SEP; + SdkConstants.FD_RES_VALUES + AdtConstants.WS_SEP; private static final String GEN_SRC_DIRECTORY = SdkConstants.FD_GEN_SOURCES + AdtConstants.WS_SEP; @@ -195,7 +193,7 @@ public class NewProjectCreator { private static final String STRINGS_FILE = "strings.xml"; //$NON-NLS-1$ - private static final String STRING_RSRC_PREFIX = LayoutConstants.STRING_PREFIX; + private static final String STRING_RSRC_PREFIX = SdkConstants.STRING_PREFIX; private static final String STRING_APP_NAME = "app_name"; //$NON-NLS-1$ private static final String STRING_HELLO_WORLD = "hello"; //$NON-NLS-1$ @@ -1202,7 +1200,7 @@ public class NewProjectCreator { // Resource class if (lastDotIndex > 0) { - resourcePackageClass = packageName + "." + AdtConstants.FN_RESOURCE_BASE; //$NON-NLS-1$ + resourcePackageClass = packageName + '.' + SdkConstants.FN_RESOURCE_BASE; } // Package name @@ -1235,7 +1233,7 @@ public class NewProjectCreator { if (activityName != null) { // create the main activity Java file - String activityJava = activityName + AdtConstants.DOT_JAVA; + String activityJava = activityName + SdkConstants.DOT_JAVA; IFile file = pkgFolder.getFile(activityJava); if (!file.exists()) { copyFile(JAVA_ACTIVITY_TEMPLATE, file, java_activity_parameters, monitor, false); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java index b4ce446..b1a0299 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/AddTranslationDialog.java @@ -15,9 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.wizards.newxmlfile; -import static com.android.AndroidConstants.FD_RES_VALUES; -import static com.android.AndroidConstants.RES_QUALIFIER_SEP; import static com.android.SdkConstants.FD_RES; +import static com.android.SdkConstants.FD_RES_VALUES; +import static com.android.SdkConstants.RES_QUALIFIER_SEP; import com.android.ide.common.rendering.api.ResourceValue; import com.android.ide.common.resources.ResourceItem; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/ChooseConfigurationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/ChooseConfigurationPage.java index 29b524c..aec6b92 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/ChooseConfigurationPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/ChooseConfigurationPage.java @@ -15,7 +15,6 @@ */ package com.android.ide.eclipse.adt.internal.wizards.newxmlfile; -import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.ide.common.resources.configuration.ResourceQualifier; import com.android.ide.eclipse.adt.AdtConstants; @@ -161,7 +160,7 @@ public class ChooseConfigurationPage extends WizardPage { wsFolderPath = wsFolderPath.substring(0, pos); } - String[] folderSegments = wsFolderPath.split(AndroidConstants.RES_QUALIFIER_SEP); + String[] folderSegments = wsFolderPath.split(SdkConstants.RES_QUALIFIER_SEP); if (folderSegments.length > 0) { String folderName = folderSegments[0]; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java index ab76a7b..e2d061b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java @@ -16,13 +16,13 @@ package com.android.ide.eclipse.adt.internal.wizards.newxmlfile; -import static com.android.AndroidConstants.RES_QUALIFIER_SEP; -import static com.android.ide.common.layout.LayoutConstants.HORIZONTAL_SCROLL_VIEW; -import static com.android.ide.common.layout.LayoutConstants.LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.SCROLL_VIEW; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.HORIZONTAL_SCROLL_VIEW; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.RES_QUALIFIER_SEP; +import static com.android.SdkConstants.SCROLL_VIEW; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; import static com.android.ide.eclipse.adt.AdtConstants.WS_SEP_CHAR; import static com.android.ide.eclipse.adt.internal.wizards.newxmlfile.ChooseConfigurationPage.RES_FOLDER_ABS; @@ -37,8 +37,6 @@ import com.android.ide.eclipse.adt.internal.editors.IconFactory; import com.android.ide.eclipse.adt.internal.editors.descriptors.DocumentDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.IDescriptorProvider; -import com.android.ide.eclipse.adt.internal.editors.menu.descriptors.MenuDescriptors; -import com.android.ide.eclipse.adt.internal.editors.values.descriptors.ValuesDescriptors; import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper; import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper.ProjectCombo; import com.android.ide.eclipse.adt.internal.resources.ResourceNameValidator; @@ -313,7 +311,7 @@ class NewXmlFileCreationPage extends WizardPage { new TypeInfo("Values", // UI name "An XML file with simple values: colors, strings, dimensions, etc.", // tooltip ResourceFolderType.VALUES, // folder type - ValuesDescriptors.ROOT_ELEMENT, // root seed + SdkConstants.TAG_RESOURCES, // root seed null, // default root null, // xmlns null, // default attributes @@ -331,7 +329,7 @@ class NewXmlFileCreationPage extends WizardPage { new TypeInfo("Menu", // UI name "An XML file that describes an menu.", // tooltip ResourceFolderType.MENU, // folder type - MenuDescriptors.MENU_ROOT_ELEMENT, // root seed + SdkConstants.TAG_MENU, // root seed null, // default root SdkConstants.NS_RESOURCES, // xmlns null, // default attributes diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileWizard.java index 373bf0c..22e2325 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileWizard.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileWizard.java @@ -16,11 +16,11 @@ package com.android.ide.eclipse.adt.internal.wizards.newxmlfile; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.GRID_LAYOUT; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.GRID_LAYOUT; +import com.android.SdkConstants; import com.android.ide.common.resources.configuration.FolderConfiguration; -import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.editors.AndroidXmlEditor; @@ -389,7 +389,7 @@ public class NewXmlFileWizard extends Wizard implements INewWizard { } else { fileName = name.trim(); if (fileName.length() > 0 && fileName.indexOf('.') == -1) { - fileName = fileName + AdtConstants.DOT_XML; + fileName = fileName + SdkConstants.DOT_XML; } } 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 1c07518..2a6e784 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 @@ -16,7 +16,7 @@ package com.android.ide.eclipse.adt.internal.wizards.templates; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_ID; import static com.android.ide.eclipse.adt.AdtUtils.extractClassName; import static com.android.ide.eclipse.adt.internal.wizards.templates.NewTemplatePage.WIZARD_PAGE_WIDTH; 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 5bb5565..36e09f9 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 @@ -16,14 +16,14 @@ package com.android.ide.eclipse.adt.internal.wizards.templates; import static com.android.SdkConstants.FD_NATIVE_LIBS; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_AIDL; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_FTL; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_JAVA; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_RS; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_SVG; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_TXT; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; -import static com.android.ide.eclipse.adt.AdtConstants.EXT_XML; +import static com.android.SdkConstants.*; +import static com.android.SdkConstants.DOT_FTL; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.DOT_RS; +import static com.android.SdkConstants.DOT_SVG; +import static com.android.SdkConstants.DOT_TXT; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.EXT_XML; import static com.android.ide.eclipse.adt.internal.wizards.templates.InstallDependencyPage.SUPPORT_LIBRARY_NAME; import static com.android.ide.eclipse.adt.internal.wizards.templates.TemplateManager.getTemplateRootFolder; @@ -702,7 +702,7 @@ class TemplateHandler { MultiTextEdit rootEdit = new MultiTextEdit(); rootEdit.addChild(new ReplaceEdit(0, currentXml.length(), contents)); change.setEdit(rootEdit); - change.setTextType(AdtConstants.EXT_XML); + change.setTextType(SdkConstants.EXT_XML); mMergeChanges.add(change); } } diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFixTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFixTest.java index be201f0..cc3504f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFixTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/build/AaptQuickFixTest.java @@ -16,9 +16,9 @@ package com.android.ide.eclipse.adt.internal.build; -import static com.android.AndroidConstants.FD_RES_COLOR; -import static com.android.AndroidConstants.FD_RES_LAYOUT; import static com.android.SdkConstants.FD_RES; +import static com.android.SdkConstants.FD_RES_COLOR; +import static com.android.SdkConstants.FD_RES_LAYOUT; import com.android.ide.eclipse.adt.AdtConstants; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java index 4832682..e2f7049 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssistTest.java @@ -17,11 +17,11 @@ package com.android.ide.eclipse.adt.internal.editors; -import static com.android.AndroidConstants.FD_RES_ANIM; -import static com.android.AndroidConstants.FD_RES_ANIMATOR; -import static com.android.AndroidConstants.FD_RES_COLOR; -import static com.android.AndroidConstants.FD_RES_DRAWABLE; import static com.android.SdkConstants.FD_RES; +import static com.android.SdkConstants.FD_RES_ANIM; +import static com.android.SdkConstants.FD_RES_ANIMATOR; +import static com.android.SdkConstants.FD_RES_COLOR; +import static com.android.SdkConstants.FD_RES_DRAWABLE; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.editors.animator.AnimationContentAssist; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadataTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadataTest.java index 5ef2de6..a75fc96 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadataTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/LayoutMetadataTest.java @@ -15,11 +15,11 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ID_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.TOOLS_PREFIX; +import static com.android.SdkConstants.TOOLS_URI; import com.android.ide.common.layout.BaseLayoutRule; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/AdtProjectTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/AdtProjectTest.java index a118869..3d0c3f5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/AdtProjectTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/AdtProjectTest.java @@ -15,9 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.AndroidConstants.FD_RES_LAYOUT; -import static com.android.AndroidConstants.FD_RES_VALUES; import static com.android.SdkConstants.FD_RES; +import static com.android.SdkConstants.FD_RES_LAYOUT; +import static com.android.SdkConstants.FD_RES_VALUES; import com.android.SdkConstants; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoringTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoringTest.java index baa7265..4c55323 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoringTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeLayoutRefactoringTest.java @@ -15,9 +15,9 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GRID_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.FQCN_RELATIVE_LAYOUT; +import static com.android.SdkConstants.FQCN_GRID_LAYOUT; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; +import static com.android.SdkConstants.FQCN_RELATIVE_LAYOUT; import com.android.ide.eclipse.adt.internal.editors.layout.gle2.CanvasViewInfo; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoringTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoringTest.java index 7ed43e7..582ed0f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoringTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ChangeViewRefactoringTest.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.FQCN_RADIO_BUTTON; +import static com.android.SdkConstants.FQCN_RADIO_BUTTON; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.NullProgressMonitor; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoringTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoringTest.java index 94a0ecc..1667649 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoringTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/ExtractIncludeRefactoringTest.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.DOT_XML; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringAssistantTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringAssistantTest.java index b88a100..48dc6ae 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringAssistantTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringAssistantTest.java @@ -16,8 +16,8 @@ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.AndroidConstants.FD_RES_LAYOUT; import static com.android.SdkConstants.FD_RES; +import static com.android.SdkConstants.FD_RES_LAYOUT; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.editors.AndroidXmlEditor; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringTest.java index ea8427e..86fc8a7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/RefactoringTest.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; -import static com.android.ide.eclipse.adt.AdtConstants.DOT_XML; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.DOT_XML; import com.android.ide.common.rendering.api.ViewInfo; import com.android.ide.eclipse.adt.AdtPlugin; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoringTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoringTest.java index 219dabe..2dc6744 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoringTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/WrapInRefactoringTest.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.refactoring; -import static com.android.ide.common.layout.LayoutConstants.FQCN_GESTURE_OVERLAY_VIEW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; +import static com.android.SdkConstants.FQCN_GESTURE_OVERLAY_VIEW; +import static com.android.SdkConstants.FQCN_LINEAR_LAYOUT; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.NullProgressMonitor; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java index 0e1fd8a..5cb5647 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/tests/functests/layoutRendering/ApiDemosRenderingTest.java @@ -16,7 +16,6 @@ package com.android.ide.eclipse.tests.functests.layoutRendering; -import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.ide.common.rendering.LayoutLibrary; import com.android.ide.common.rendering.api.AdapterBinding; @@ -207,7 +206,7 @@ public class ApiDemosRenderingTest extends SdkTestCase { } // look for the layout folder - File layoutFolder = new File(resFolder, AndroidConstants.FD_RES_LAYOUT); + File layoutFolder = new File(resFolder, SdkConstants.FD_RES_LAYOUT); if (layoutFolder.isDirectory() == false) { fail("Sample project has no layout folder!"); } diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java index 6f55ec3..1a14bdd 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/AbsoluteLayoutRuleTest.java @@ -16,7 +16,7 @@ package com.android.ide.common.layout; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.INode; import com.android.ide.common.api.Point; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutRuleTest.java index 661a804..d176fe7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutRuleTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/BaseLayoutRuleTest.java @@ -16,8 +16,8 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; import com.android.ide.common.api.IDragElement; import com.android.ide.common.api.INode; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java index a1699c9..f006ba9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java @@ -16,8 +16,8 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java index bc655ca..9c4c934 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java @@ -16,13 +16,13 @@ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ORIENTATION; -import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.VALUE_HORIZONTAL; +import static com.android.SdkConstants.VALUE_VERTICAL; import com.android.ide.common.api.DropFeedback; import com.android.ide.common.api.IAttributeInfo.Format; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java index 12a8ca1..f9747f3 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/RelativeLayoutRuleTest.java @@ -16,7 +16,8 @@ package com.android.ide.common.layout; -import static com.android.utils.XmlUtils.ANDROID_URI; + +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.INode; import com.android.ide.common.api.Point; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java index b4aac0f..b96de60 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestDragElement.java @@ -15,8 +15,8 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java index 372e329..f5c9d4d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/TestNode.java @@ -15,9 +15,9 @@ */ package com.android.ide.common.layout; -import static com.android.ide.common.layout.LayoutConstants.ANDROID_WIDGET_PREFIX; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_WIDGET_PREFIX; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ANDROID_URI; import static junit.framework.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/grid/GridModelTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/grid/GridModelTest.java index 03c921b..c4a58c6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/grid/GridModelTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/grid/GridModelTest.java @@ -15,12 +15,12 @@ */ package com.android.ide.common.layout.grid; -import static com.android.ide.common.layout.LayoutConstants.ATTR_COLUMN_COUNT; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_COLUMN_SPAN; -import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ROW; -import static com.android.ide.common.layout.LayoutConstants.FQCN_BUTTON; -import static com.android.utils.XmlUtils.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_COLUMN_COUNT; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.FQCN_BUTTON; import com.android.ide.common.api.INode; import com.android.ide.common.api.Rect; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/relative/DeletionHandlerTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/relative/DeletionHandlerTest.java index f5ec1ba..d629a38 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/relative/DeletionHandlerTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/relative/DeletionHandlerTest.java @@ -15,8 +15,8 @@ */ package com.android.ide.common.layout.relative; -import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ANDROID_URI; import com.android.ide.common.api.INode; import com.android.ide.common.layout.BaseViewRule; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilitiesTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilitiesTest.java index 710725e..6576bea 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilitiesTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/gle2/DomUtilitiesTest.java @@ -15,8 +15,8 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.gle2; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_URI; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.TOOLS_URI; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleterTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleterTest.java index bbe82e3..0014fe5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleterTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/layout/properties/ValueCompleterTest.java @@ -15,7 +15,7 @@ */ package com.android.ide.eclipse.adt.internal.editors.layout.properties; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/manifest/model/UiElementNodeTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/manifest/model/UiElementNodeTest.java index eb4dcb2..d19f933 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/manifest/model/UiElementNodeTest.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/adt/internal/editors/manifest/model/UiElementNodeTest.java @@ -16,8 +16,7 @@ package com.android.ide.eclipse.adt.internal.editors.manifest.model; -import static com.android.utils.XmlUtils.ANDROID_URI; - +import com.android.SdkConstants; import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor; import com.android.ide.eclipse.adt.internal.editors.descriptors.ElementDescriptor.Mandatory; import com.android.ide.eclipse.adt.internal.editors.mock.MockXmlNode; @@ -279,7 +278,7 @@ public class UiElementNodeTest extends TestCase { Element baz = document.createElement("baz"); root.appendChild(baz); - String prefix = XmlUtils.lookupNamespacePrefix(baz, ANDROID_URI); + String prefix = XmlUtils.lookupNamespacePrefix(baz, SdkConstants.ANDROID_URI); assertEquals("android", prefix); } } diff --git a/ide_common/src/com/android/ide/common/resources/FrameworkResources.java b/ide_common/src/com/android/ide/common/resources/FrameworkResources.java index 2115cdc..fbf5926 100755 --- a/ide_common/src/com/android/ide/common/resources/FrameworkResources.java +++ b/ide_common/src/com/android/ide/common/resources/FrameworkResources.java @@ -16,8 +16,8 @@ package com.android.ide.common.resources; -import static com.android.AndroidConstants.FD_RES_VALUES; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.io.IAbstractFile; @@ -103,7 +103,7 @@ public class FrameworkResources extends ResourceRepository { * @param logger a logger to report issues to */ public void loadPublicResources(@NonNull IAbstractFolder resFolder, @Nullable ILogger logger) { - IAbstractFolder valueFolder = resFolder.getFolder(FD_RES_VALUES); + IAbstractFolder valueFolder = resFolder.getFolder(SdkConstants.FD_RES_VALUES); if (valueFolder.exists() == false) { return; } diff --git a/ide_common/src/com/android/ide/common/resources/ResourceRepository.java b/ide_common/src/com/android/ide/common/resources/ResourceRepository.java index 6fb8457..ac0614d 100755 --- a/ide_common/src/com/android/ide/common/resources/ResourceRepository.java +++ b/ide_common/src/com/android/ide/common/resources/ResourceRepository.java @@ -16,7 +16,7 @@ package com.android.ide.common.resources; -import com.android.AndroidConstants; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.ide.common.rendering.api.ResourceValue; @@ -309,7 +309,7 @@ public abstract class ResourceRepository { @Nullable public ResourceFolder processFolder(@NonNull IAbstractFolder folder) { // split the name of the folder in segments. - String[] folderSegments = folder.getName().split(AndroidConstants.RES_QUALIFIER_SEP); + String[] folderSegments = folder.getName().split(SdkConstants.RES_QUALIFIER_SEP); // get the enum for the resource type. ResourceFolderType type = ResourceFolderType.getTypeByName(folderSegments[0]); diff --git a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java b/ide_common/src/com/android/ide/common/resources/ResourceResolver.java index 772d75e..d742c4a 100644 --- a/ide_common/src/com/android/ide/common/resources/ResourceResolver.java +++ b/ide_common/src/com/android/ide/common/resources/ResourceResolver.java @@ -16,6 +16,13 @@ package com.android.ide.common.resources; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ANDROID_THEME_PREFIX; +import static com.android.SdkConstants.PREFIX_ANDROID; +import static com.android.SdkConstants.PREFIX_RESOURCE_REF; +import static com.android.SdkConstants.PREFIX_THEME_REF; +import static com.android.SdkConstants.REFERENCE_STYLE; + import com.android.ide.common.rendering.api.LayoutLog; import com.android.ide.common.rendering.api.RenderResources; import com.android.ide.common.rendering.api.ResourceValue; @@ -28,24 +35,6 @@ import java.util.Map; public class ResourceResolver extends RenderResources { - /** The constant {@code style/} */ - public final static String REFERENCE_STYLE = ResourceType.STYLE.getName() + "/"; - /** The constant {@code @android:} */ - public final static String PREFIX_ANDROID_RESOURCE_REF = "@android:"; - /** The constant {@code @} */ - public final static String PREFIX_RESOURCE_REF = "@"; - /** The constant {@code ?android:} */ - public final static String PREFIX_ANDROID_THEME_REF = "?android:"; - /** The constant {@code ?} */ - public final static String PREFIX_THEME_REF = "?"; - /** The constant {@code android:} */ - public final static String PREFIX_ANDROID = "android:"; - /** The constant {@code @style/} */ - public static final String PREFIX_STYLE = PREFIX_RESOURCE_REF + REFERENCE_STYLE; - /** The constant {@code @android:style/} */ - public static final String PREFIX_ANDROID_STYLE = PREFIX_ANDROID_RESOURCE_REF - + REFERENCE_STYLE; - private final Map<ResourceType, Map<String, ResourceValue>> mProjectResources; private final Map<ResourceType, Map<String, ResourceValue>> mFrameworkResources; @@ -209,9 +198,9 @@ public class ResourceResolver extends RenderResources { boolean frameworkOnly = false; // eliminate the prefix from the string - if (reference.startsWith(PREFIX_ANDROID_THEME_REF)) { + if (reference.startsWith(ANDROID_THEME_PREFIX)) { frameworkOnly = true; - reference = reference.substring(PREFIX_ANDROID_THEME_REF.length()); + reference = reference.substring(ANDROID_THEME_PREFIX.length()); } else { reference = reference.substring(PREFIX_THEME_REF.length()); } @@ -265,10 +254,9 @@ public class ResourceResolver extends RenderResources { } // Eliminate the prefix from the string. - if (reference.startsWith(PREFIX_ANDROID_RESOURCE_REF)) { + if (reference.startsWith(ANDROID_PREFIX)) { frameworkOnly = true; - reference = reference.substring( - PREFIX_ANDROID_RESOURCE_REF.length()); + reference = reference.substring(ANDROID_PREFIX.length()); } else { reference = reference.substring(PREFIX_RESOURCE_REF.length()); } diff --git a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java b/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java index f12ed8f..e2fe767 100644 --- a/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java +++ b/ide_common/src/com/android/ide/common/resources/configuration/FolderConfiguration.java @@ -16,7 +16,7 @@ package com.android.ide.common.resources.configuration; -import com.android.AndroidConstants; +import com.android.SdkConstants; import com.android.resources.Density; import com.android.resources.ResourceFolderType; import com.android.resources.ScreenOrientation; @@ -566,7 +566,7 @@ public final class FolderConfiguration implements Comparable<FolderConfiguration if (qualifier != null) { String segment = qualifier.getFolderSegment(); if (segment != null && segment.length() > 0) { - result.append(AndroidConstants.RES_QUALIFIER_SEP); + result.append(SdkConstants.RES_QUALIFIER_SEP); result.append(segment); } } diff --git a/lint/cli/src/com/android/tools/lint/HtmlReporter.java b/lint/cli/src/com/android/tools/lint/HtmlReporter.java index 8fddece..19f1028 100644 --- a/lint/cli/src/com/android/tools/lint/HtmlReporter.java +++ b/lint/cli/src/com/android/tools/lint/HtmlReporter.java @@ -16,8 +16,8 @@ package com.android.tools.lint; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JPG; -import static com.android.tools.lint.detector.api.LintConstants.DOT_PNG; +import static com.android.SdkConstants.DOT_JPG; +import static com.android.SdkConstants.DOT_PNG; import static com.android.tools.lint.detector.api.LintUtils.endsWith; import com.android.tools.lint.checks.BuiltinIssueRegistry; diff --git a/lint/cli/src/com/android/tools/lint/Main.java b/lint/cli/src/com/android/tools/lint/Main.java index 541ad4e..a33890d 100644 --- a/lint/cli/src/com/android/tools/lint/Main.java +++ b/lint/cli/src/com/android/tools/lint/Main.java @@ -18,7 +18,7 @@ package com.android.tools.lint; import static com.android.tools.lint.client.api.IssueRegistry.LINT_ERROR; import static com.android.tools.lint.client.api.IssueRegistry.PARSER_ERROR; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; +import static com.android.SdkConstants.DOT_XML; import static com.android.tools.lint.detector.api.LintUtils.endsWith; import com.android.annotations.NonNull; diff --git a/lint/cli/src/com/android/tools/lint/Reporter.java b/lint/cli/src/com/android/tools/lint/Reporter.java index 2c86635..fc3aaae 100644 --- a/lint/cli/src/com/android/tools/lint/Reporter.java +++ b/lint/cli/src/com/android/tools/lint/Reporter.java @@ -16,8 +16,8 @@ package com.android.tools.lint; -import static com.android.tools.lint.detector.api.LintConstants.DOT_9PNG; -import static com.android.tools.lint.detector.api.LintConstants.DOT_PNG; +import static com.android.SdkConstants.DOT_9PNG; +import static com.android.SdkConstants.DOT_PNG; import static com.android.tools.lint.detector.api.LintUtils.endsWith; import com.google.common.annotations.Beta; @@ -256,4 +256,4 @@ public abstract class Reporter { } return null; } -}
\ No newline at end of file +} diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultSdkInfo.java b/lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultSdkInfo.java index a32a884..1e53834 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultSdkInfo.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/client/api/DefaultSdkInfo.java @@ -16,48 +16,48 @@ package com.android.tools.lint.client.api; -import static com.android.tools.lint.detector.api.LintConstants.ABSOLUTE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ABS_LIST_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.ABS_SEEK_BAR; -import static com.android.tools.lint.detector.api.LintConstants.ABS_SPINNER; -import static com.android.tools.lint.detector.api.LintConstants.ADAPTER_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.CHECKED_TEXT_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.CHECK_BOX; -import static com.android.tools.lint.detector.api.LintConstants.COMPOUND_BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.EDIT_TEXT; -import static com.android.tools.lint.detector.api.LintConstants.EXPANDABLE_LIST_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.FRAME_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.GALLERY; -import static com.android.tools.lint.detector.api.LintConstants.GRID_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.HORIZONTAL_SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.IMAGE_BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.IMAGE_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.LINEAR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.LIST_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.PROGRESS_BAR; -import static com.android.tools.lint.detector.api.LintConstants.RADIO_BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.RADIO_GROUP; -import static com.android.tools.lint.detector.api.LintConstants.RELATIVE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.SEEK_BAR; -import static com.android.tools.lint.detector.api.LintConstants.SPINNER; -import static com.android.tools.lint.detector.api.LintConstants.SURFACE_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.SWITCH; -import static com.android.tools.lint.detector.api.LintConstants.TABLE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.TABLE_ROW; -import static com.android.tools.lint.detector.api.LintConstants.TAB_HOST; -import static com.android.tools.lint.detector.api.LintConstants.TAB_WIDGET; -import static com.android.tools.lint.detector.api.LintConstants.TEXT_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.TOGGLE_BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.VIEW; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_ANIMATOR; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_GROUP; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_PKG_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_STUB; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_SWITCHER; -import static com.android.tools.lint.detector.api.LintConstants.WEB_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.WIDGET_PKG_PREFIX; +import static com.android.SdkConstants.ABSOLUTE_LAYOUT; +import static com.android.SdkConstants.ABS_LIST_VIEW; +import static com.android.SdkConstants.ABS_SEEK_BAR; +import static com.android.SdkConstants.ABS_SPINNER; +import static com.android.SdkConstants.ADAPTER_VIEW; +import static com.android.SdkConstants.BUTTON; +import static com.android.SdkConstants.CHECKED_TEXT_VIEW; +import static com.android.SdkConstants.CHECK_BOX; +import static com.android.SdkConstants.COMPOUND_BUTTON; +import static com.android.SdkConstants.EDIT_TEXT; +import static com.android.SdkConstants.EXPANDABLE_LIST_VIEW; +import static com.android.SdkConstants.FRAME_LAYOUT; +import static com.android.SdkConstants.GALLERY; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.HORIZONTAL_SCROLL_VIEW; +import static com.android.SdkConstants.IMAGE_BUTTON; +import static com.android.SdkConstants.IMAGE_VIEW; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.LIST_VIEW; +import static com.android.SdkConstants.PROGRESS_BAR; +import static com.android.SdkConstants.RADIO_BUTTON; +import static com.android.SdkConstants.RADIO_GROUP; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.SCROLL_VIEW; +import static com.android.SdkConstants.SEEK_BAR; +import static com.android.SdkConstants.SPINNER; +import static com.android.SdkConstants.SURFACE_VIEW; +import static com.android.SdkConstants.SWITCH; +import static com.android.SdkConstants.TABLE_LAYOUT; +import static com.android.SdkConstants.TABLE_ROW; +import static com.android.SdkConstants.TAB_HOST; +import static com.android.SdkConstants.TAB_WIDGET; +import static com.android.SdkConstants.TEXT_VIEW; +import static com.android.SdkConstants.TOGGLE_BUTTON; +import static com.android.SdkConstants.VIEW; +import static com.android.SdkConstants.VIEW_ANIMATOR; +import static com.android.SdkConstants.VIEW_GROUP; +import static com.android.SdkConstants.VIEW_PKG_PREFIX; +import static com.android.SdkConstants.VIEW_STUB; +import static com.android.SdkConstants.VIEW_SWITCHER; +import static com.android.SdkConstants.WEB_VIEW; +import static com.android.SdkConstants.WIDGET_PKG_PREFIX; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/JavaVisitor.java b/lint/libs/lint_api/src/com/android/tools/lint/client/api/JavaVisitor.java index b9f7ca6..b1d8832 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/client/api/JavaVisitor.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/client/api/JavaVisitor.java @@ -16,8 +16,8 @@ package com.android.tools.lint.client.api; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_PKG; -import static com.android.tools.lint.detector.api.LintConstants.R_CLASS; +import static com.android.SdkConstants.ANDROID_PKG; +import static com.android.SdkConstants.R_CLASS; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Detector; diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintClient.java b/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintClient.java index 363b9cd..c15b284 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintClient.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintClient.java @@ -16,12 +16,13 @@ package com.android.tools.lint.client.api; -import static com.android.tools.lint.detector.api.LintConstants.CLASS_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAR; -import static com.android.tools.lint.detector.api.LintConstants.GEN_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.LIBS_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.SRC_FOLDER; +import static com.android.SdkConstants.CLASS_FOLDER; +import static com.android.SdkConstants.DOT_JAR; +import static com.android.SdkConstants.GEN_FOLDER; +import static com.android.SdkConstants.LIBS_FOLDER; +import static com.android.SdkConstants.SRC_FOLDER; +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; import com.android.sdklib.IAndroidTarget; @@ -29,7 +30,6 @@ import com.android.sdklib.SdkManager; import com.android.tools.lint.detector.api.Context; import com.android.tools.lint.detector.api.Detector; import com.android.tools.lint.detector.api.Issue; -import com.android.tools.lint.detector.api.LintConstants; import com.android.tools.lint.detector.api.LintUtils; import com.android.tools.lint.detector.api.Location; import com.android.tools.lint.detector.api.Project; @@ -586,7 +586,7 @@ public abstract class LintClient { * @return the highest known API level */ public int getHighestKnownApiLevel() { - int max = LintConstants.HIGHEST_KNOWN_API; + int max = SdkConstants.HIGHEST_KNOWN_API; for (IAndroidTarget target : getTargets()) { if (target.isPlatform()) { diff --git a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java b/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java index 068bf2a..a833dae 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/client/api/LintDriver.java @@ -16,18 +16,18 @@ package com.android.tools.lint.client.api; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_MANIFEST_XML; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_IGNORE; -import static com.android.tools.lint.detector.api.LintConstants.DOT_CLASS; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAR; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAVA; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; -import static com.android.tools.lint.detector.api.LintConstants.OLD_PROGUARD_FILE; -import static com.android.tools.lint.detector.api.LintConstants.PROGUARD_FILE; -import static com.android.tools.lint.detector.api.LintConstants.RES_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.SUPPRESS_ALL; -import static com.android.tools.lint.detector.api.LintConstants.SUPPRESS_LINT; -import static com.android.tools.lint.detector.api.LintConstants.TOOLS_URI; +import static com.android.SdkConstants.ANDROID_MANIFEST_XML; +import static com.android.SdkConstants.ATTR_IGNORE; +import static com.android.SdkConstants.DOT_CLASS; +import static com.android.SdkConstants.DOT_JAR; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.FN_PROJECT_PROGUARD_FILE; +import static com.android.SdkConstants.OLD_PROGUARD_FILE; +import static com.android.SdkConstants.RES_FOLDER; +import static com.android.SdkConstants.SUPPRESS_ALL; +import static com.android.SdkConstants.SUPPRESS_LINT; +import static com.android.SdkConstants.TOOLS_URI; import static org.objectweb.asm.Opcodes.ASM4; import com.android.annotations.NonNull; @@ -300,8 +300,6 @@ public class LintDriver { mScope.add(Scope.MANIFEST); } else if (name.endsWith(DOT_XML)) { mScope.add(Scope.RESOURCE_FILE); - } else if (name.equals(PROGUARD_FILE) || name.equals(OLD_PROGUARD_FILE)) { - mScope.add(Scope.PROGUARD_FILE); } else if (name.equals(RES_FOLDER) || file.getParent().equals(RES_FOLDER)) { mScope.add(Scope.ALL_RESOURCE_FILES); @@ -310,7 +308,8 @@ public class LintDriver { mScope.add(Scope.JAVA_FILE); } else if (name.endsWith(DOT_CLASS)) { mScope.add(Scope.CLASS_FILE); - } else if (name.equals(OLD_PROGUARD_FILE) || name.equals(PROGUARD_FILE)) { + } else if (name.equals(OLD_PROGUARD_FILE) + || name.equals(FN_PROJECT_PROGUARD_FILE)) { mScope.add(Scope.PROGUARD_FILE); } } @@ -889,7 +888,7 @@ public class LintDriver { if (file.exists()) { files.add(file); } - file = new File(project.getDir(), PROGUARD_FILE); + file = new File(project.getDir(), FN_PROJECT_PROGUARD_FILE); if (file.exists()) { files.add(file); } diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/ClassContext.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/ClassContext.java index 4c5f298..68c25d9 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/ClassContext.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/ClassContext.java @@ -16,9 +16,9 @@ package com.android.tools.lint.detector.api; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.DOT_CLASS; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAVA; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.DOT_CLASS; +import static com.android.SdkConstants.DOT_JAVA; import static com.android.tools.lint.detector.api.Location.SearchDirection.BACKWARD; import static com.android.tools.lint.detector.api.Location.SearchDirection.EOL_BACKWARD; import static com.android.tools.lint.detector.api.Location.SearchDirection.FORWARD; diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LayoutDetector.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LayoutDetector.java index c61d7c2..b24c1a9 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LayoutDetector.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LayoutDetector.java @@ -16,16 +16,16 @@ package com.android.tools.lint.detector.api; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_WIDTH; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PADDING; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PADDING_BOTTOM; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PADDING_LEFT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PADDING_RIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PADDING_TOP; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_FILL_PARENT; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_PADDING; +import static com.android.SdkConstants.ATTR_PADDING_BOTTOM; +import static com.android.SdkConstants.ATTR_PADDING_LEFT; +import static com.android.SdkConstants.ATTR_PADDING_RIGHT; +import static com.android.SdkConstants.ATTR_PADDING_TOP; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; import com.android.annotations.NonNull; import com.android.resources.ResourceFolderType; diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintConstants.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintConstants.java deleted file mode 100644 index e4975ae..0000000 --- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintConstants.java +++ /dev/null @@ -1,364 +0,0 @@ -/* - * Copyright (C) 2011 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.tools.lint.detector.api; - -import com.google.common.annotations.Beta; - -import java.io.File; - -/** - * Constants used by the various detectors, defined in one place - * <p> - * <b>NOTE: This is not a public or final API; if you rely on this be prepared - * to adjust your code for the next tools release.</b> -*/ -@Beta -@SuppressWarnings("javadoc") // Not documenting each and every obvious constant -public class LintConstants { - /** Namespace prefix used for all resources */ - public static final String URI_PREFIX = - "http://schemas.android.com/apk/res/"; //$NON-NLS-1$ - /** Namespace used in XML files for Android attributes */ - public static final String ANDROID_URI = - "http://schemas.android.com/apk/res/android"; //$NON-NLS-1$ - /** Namespace used in XML files for Android Tooling attributes */ - public static final String TOOLS_URI = - "http://schemas.android.com/tools"; //$NON-NLS-1$ - /** Namespace used for auto-adjusting namespaces */ - public final static String AUTO_URI = - "http://schemas.android.com/apk/res-auto"; //$NON-NLS-1$ - /** Default prefix used for tools attributes */ - public static final String TOOLS_PREFIX = "tools"; //$NON-NLS-1$ - public static final String XMLNS_PREFIX = "xmlns:"; //$NON-NLS-1$ - public static final String R_CLASS = "R"; //$NON-NLS-1$ - public static final String ANDROID_PKG = "android"; //$NON-NLS-1$ - - // Tags: Manifest - public static final String TAG_SERVICE = "service"; //$NON-NLS-1$ - public static final String TAG_USES_PERMISSION = "uses-permission";//$NON-NLS-1$ - public static final String TAG_USES_LIBRARY = "uses-library"; //$NON-NLS-1$ - public static final String TAG_APPLICATION = "application"; //$NON-NLS-1$ - public static final String TAG_INTENT_FILTER = "intent-filter"; //$NON-NLS-1$ - public static final String TAG_USES_SDK = "uses-sdk"; //$NON-NLS-1$ - public static final String TAG_ACTIVITY = "activity"; //$NON-NLS-1$ - public static final String TAG_RECEIVER = "receiver"; //$NON-NLS-1$ - public static final String TAG_PROVIDER = "provider"; //$NON-NLS-1$ - public static final String TAG_GRANT_PERMISSION = "grant-uri-permission"; //$NON-NLS-1$ - public static final String TAG_PATH_PERMISSION = "path-permission"; //$NON-NLS-1$ - - // Tags: Resources - public static final String TAG_RESOURCES = "resources"; //$NON-NLS-1$ - public static final String TAG_STRING = "string"; //$NON-NLS-1$ - public static final String TAG_ARRAY = "array"; //$NON-NLS-1$ - public static final String TAG_STYLE = "style"; //$NON-NLS-1$ - public static final String TAG_ITEM = "item"; //$NON-NLS-1$ - public static final String TAG_STRING_ARRAY = "string-array"; //$NON-NLS-1$ - public static final String TAG_PLURALS = "plurals"; //$NON-NLS-1$ - public static final String TAG_INTEGER_ARRAY = "integer-array"; //$NON-NLS-1$ - - // Tags: Layouts - public static final String VIEW_TAG = "view"; //$NON-NLS-1$ - public static final String INCLUDE = "include"; //$NON-NLS-1$ - public static final String MERGE = "merge"; //$NON-NLS-1$ - public static final String REQUEST_FOCUS = "requestFocus"; //$NON-NLS-1$ - - public static final String VIEW = "View"; //$NON-NLS-1$ - public static final String VIEW_GROUP = "ViewGroup"; //$NON-NLS-1$ - public static final String FRAME_LAYOUT = "FrameLayout"; //$NON-NLS-1$ - public static final String LINEAR_LAYOUT = "LinearLayout"; //$NON-NLS-1$ - public static final String RELATIVE_LAYOUT = "RelativeLayout"; //$NON-NLS-1$ - public static final String GRID_LAYOUT = "GridLayout"; //$NON-NLS-1$ - public static final String SCROLL_VIEW = "ScrollView"; //$NON-NLS-1$ - public static final String BUTTON = "Button"; //$NON-NLS-1$ - public static final String COMPOUND_BUTTON = "CompoundButton"; //$NON-NLS-1$ - public static final String ADAPTER_VIEW = "AdapterView"; //$NON-NLS-1$ - public static final String GALLERY = "Gallery"; //$NON-NLS-1$ - public static final String GRID_VIEW = "GridView"; //$NON-NLS-1$ - public static final String TAB_HOST = "TabHost"; //$NON-NLS-1$ - public static final String RADIO_GROUP = "RadioGroup"; //$NON-NLS-1$ - public static final String RADIO_BUTTON = "RadioButton"; //$NON-NLS-1$ - public static final String SWITCH = "Switch"; //$NON-NLS-1$ - public static final String EDIT_TEXT = "EditText"; //$NON-NLS-1$ - public static final String LIST_VIEW = "ListView"; //$NON-NLS-1$ - public static final String TEXT_VIEW = "TextView"; //$NON-NLS-1$ - public static final String CHECKED_TEXT_VIEW = "CheckedTextView"; //$NON-NLS-1$ - public static final String IMAGE_VIEW = "ImageView"; //$NON-NLS-1$ - public static final String SURFACE_VIEW = "SurfaceView"; //$NON-NLS-1$ - public static final String ABSOLUTE_LAYOUT = "AbsoluteLayout"; //$NON-NLS-1$ - public static final String TABLE_LAYOUT = "TableLayout"; //$NON-NLS-1$ - public static final String TABLE_ROW = "TableRow"; //$NON-NLS-1$ - public static final String TAB_WIDGET = "TabWidget"; //$NON-NLS-1$ - public static final String IMAGE_BUTTON = "ImageButton"; //$NON-NLS-1$ - public static final String SEEK_BAR = "SeekBar"; //$NON-NLS-1$ - public static final String VIEW_STUB = "ViewStub"; //$NON-NLS-1$ - public static final String SPINNER = "Spinner"; //$NON-NLS-1$ - public static final String WEB_VIEW = "WebView"; //$NON-NLS-1$ - public static final String TOGGLE_BUTTON = "ToggleButton"; //$NON-NLS-1$ - public static final String CHECK_BOX = "CheckBox"; //$NON-NLS-1$ - public static final String ABS_LIST_VIEW = "AbsListView"; //$NON-NLS-1$ - public static final String PROGRESS_BAR = "ProgressBar"; //$NON-NLS-1$ - public static final String ABS_SPINNER = "AbsSpinner"; //$NON-NLS-1$ - public static final String ABS_SEEK_BAR = "AbsSeekBar"; //$NON-NLS-1$ - public static final String VIEW_ANIMATOR = "ViewAnimator"; //$NON-NLS-1$ - public static final String VIEW_SWITCHER = "ViewSwitcher"; //$NON-NLS-1$ - public static final String EXPANDABLE_LIST_VIEW = "ExpandableListView"; //$NON-NLS-1$ - public static final String HORIZONTAL_SCROLL_VIEW = "HorizontalScrollView"; //$NON-NLS-1$ - - // Tags: Drawables - public static final String TAG_BITMAP = "bitmap"; //$NON-NLS-1$ - - // Attributes: Manifest - public static final String ATTR_EXPORTED = "exported"; //$NON-NLS-1$ - public static final String ATTR_PERMISSION = "permission"; //$NON-NLS-1$ - public static final String ATTR_MIN_SDK_VERSION = "minSdkVersion"; //$NON-NLS-1$ - public static final String ATTR_TARGET_SDK_VERSION = "targetSdkVersion"; //$NON-NLS-1$ - public static final String ATTR_ICON = "icon"; //$NON-NLS-1$ - public final static String ATTR_PACKAGE = "package"; //$NON-NLS-1$ - public static final String ATTR_THEME = "theme"; //$NON-NLS-1$ - public static final String ATTR_PATH = "path"; //$NON-NLS-1$ - public static final String ATTR_PATH_PREFIX = "pathPrefix"; //$NON-NLS-1$ - public static final String ATTR_PATH_PATTERN = "pathPattern"; //$NON-NLS-1$ - public final static String ATTR_DEBUGGABLE = "debuggable"; //$NON-NLS-1$ - public final static String ATTR_READ_PERMISSION = "readPermission"; //$NON_NLS-1$ - public final static String ATTR_WRITE_PERMISSION = "writePermission"; //$NON_NLS-1$ - - // Attributes: Resources - public static final String ATTR_NAME = "name"; //$NON-NLS-1$ - public static final String ATTR_TYPE = "type"; //$NON-NLS-1$ - public static final String ATTR_PARENT = "parent"; //$NON-NLS-1$ - public static final String ATTR_TRANSLATABLE = "translatable"; //$NON-NLS-1$ - - // Attributes: Layout - public static final String ATTR_LAYOUT_PREFIX = "layout_"; //$NON-NLS-1$ - public static final String ATTR_CLASS = "class"; //$NON-NLS-1$ - public static final String ATTR_STYLE = "style"; //$NON-NLS-1$ - - public static final String ATTR_ID = "id"; //$NON-NLS-1$ - public static final String ATTR_TEXT = "text"; //$NON-NLS-1$ - public static final String ATTR_TEXT_SIZE = "textSize"; //$NON-NLS-1$ - public static final String ATTR_LABEL = "label"; //$NON-NLS-1$ - public static final String ATTR_HINT = "hint"; //$NON-NLS-1$ - public static final String ATTR_PROMPT = "prompt"; //$NON-NLS-1$ - public static final String ATTR_ON_CLICK = "onClick"; //$NON-NLS-1$ - public static final String ATTR_INPUT_TYPE = "inputType"; //$NON-NLS-1$ - public static final String ATTR_INPUT_METHOD = "inputMethod"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_GRAVITY = "layout_gravity"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_WIDTH = "layout_width"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_HEIGHT = "layout_height"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_WEIGHT = "layout_weight"; //$NON-NLS-1$ - public static final String ATTR_PADDING = "padding"; //$NON-NLS-1$ - public static final String ATTR_PADDING_BOTTOM = "paddingBottom"; //$NON-NLS-1$ - public static final String ATTR_PADDING_TOP = "paddingTop"; //$NON-NLS-1$ - public static final String ATTR_PADDING_RIGHT = "paddingRight"; //$NON-NLS-1$ - public static final String ATTR_PADDING_LEFT = "paddingLeft"; //$NON-NLS-1$ - public static final String ATTR_FOREGROUND = "foreground"; //$NON-NLS-1$ - public static final String ATTR_BACKGROUND = "background"; //$NON-NLS-1$ - public static final String ATTR_ORIENTATION = "orientation"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT = "layout"; //$NON-NLS-1$ - public static final String ATTR_ROW_COUNT = "rowCount"; //$NON-NLS-1$ - public static final String ATTR_COLUMN_COUNT = "columnCount"; //$NON-NLS-1$ - public static final String ATTR_BASELINE_ALIGNED = "baselineAligned"; //$NON-NLS-1$ - public static final String ATTR_CONTENT_DESCRIPTION = "contentDescription"; //$NON-NLS-1$ - public static final String ATTR_IME_ACTION_LABEL = "imeActionLabel"; //$NON-NLS-1$ - public static final String ATTR_PRIVATE_IME_OPTIONS = "privateImeOptions"; //$NON-NLS-1$ - public static final String VALUE_NONE = "none"; //$NON-NLS-1$ - public static final String VALUE_NO = "no"; //$NON-NLS-1$ - public static final String ATTR_NUMERIC = "numeric"; //$NON-NLS-1$ - public static final String ATTR_IME_ACTION_ID = "imeActionId"; //$NON-NLS-1$ - public static final String ATTR_IME_OPTIONS = "imeOptions"; //$NON-NLS-1$ - public static final String ATTR_FREEZES_TEXT = "freezesText"; //$NON-NLS-1$ - public static final String ATTR_EDITOR_EXTRAS = "editorExtras"; //$NON-NLS-1$ - public static final String ATTR_EDITABLE = "editable"; //$NON-NLS-1$ - public static final String ATTR_DIGITS = "digits"; //$NON-NLS-1$ - public static final String ATTR_CURSOR_VISIBLE = "cursorVisible"; //$NON-NLS-1$ - public static final String ATTR_CAPITALIZE = "capitalize"; //$NON-NLS-1$ - public static final String ATTR_PHONE_NUMBER = "phoneNumber"; //$NON-NLS-1$ - public static final String ATTR_PASSWORD = "password"; //$NON-NLS-1$ - public static final String ATTR_BUFFER_TYPE = "bufferType"; //$NON-NLS-1$ - public static final String ATTR_AUTO_TEXT = "autoText"; //$NON-NLS-1$ - public static final String ATTR_ENABLED = "enabled"; //$NON-NLS-1$ - public static final String ATTR_SINGLE_LINE = "singleLine"; //$NON-NLS-1$ - public static final String ATTR_SCALE_TYPE = "scaleType"; //$NON-NLS-1$ - public static final String ATTR_IMPORTANT_FOR_ACCESSIBILITY = - "importantForAccessibility"; //$NON-NLS-1$ - - // AbsoluteLayout layout params - public static final String ATTR_LAYOUT_Y = "layout_y"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_X = "layout_x"; //$NON-NLS-1$ - - // GridLayout layout params - public static final String ATTR_LAYOUT_ROW = "layout_row"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ROW_SPAN = "layout_rowSpan";//$NON-NLS-1$ - public static final String ATTR_LAYOUT_COLUMN = "layout_column"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_COLUMN_SPAN = "layout_columnSpan"; //$NON-NLS-1$ - - // TableRow - public static final String ATTR_LAYOUT_SPAN = "layout_span"; //$NON-NLS-1$ - - // RelativeLayout layout params: - public static final String ATTR_LAYOUT_ALIGN_LEFT = "layout_alignLeft"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_RIGHT = "layout_alignRight"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_TOP = "layout_alignTop"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_BOTTOM = "layout_alignBottom"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_TOP = "layout_alignParentTop"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_BOTTOM = "layout_alignParentBottom"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_LEFT = "layout_alignParentLeft";//$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_RIGHT = "layout_alignParentRight"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING = "layout_alignWithParentIfMissing"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_BASELINE = "layout_alignBaseline"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_CENTER_IN_PARENT = "layout_centerInParent"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_CENTER_VERTICAL = "layout_centerVertical"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_CENTER_HORIZONTAL = "layout_centerHorizontal"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_TO_RIGHT_OF = "layout_toRightOf"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_TO_LEFT_OF = "layout_toLeftOf"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_BELOW = "layout_below"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ABOVE = "layout_above"; //$NON-NLS-1$ - - // Margins - public static final String ATTR_LAYOUT_MARGIN = "layout_margin"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_LEFT = "layout_marginLeft"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_RIGHT = "layout_marginRight"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_TOP = "layout_marginTop"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_MARGIN_BOTTOM = "layout_marginBottom"; //$NON-NLS-1$ - - // Attributes: Drawables - public static final String ATTR_TILE_MODE = "tileMode"; //$NON-NLS-1$ - - // Values: Layouts - public static final String VALUE_FILL_PARENT = "fill_parent"; //$NON-NLS-1$ - public static final String VALUE_MATCH_PARENT = "match_parent"; //$NON-NLS-1$ - public static final String VALUE_VERTICAL = "vertical"; //$NON-NLS-1$ - public static final String VALUE_TRUE = "true"; //$NON-NLS-1$ - public static final String VALUE_EDITABLE = "editable"; //$NON-NLS-1$ - - - // Values: Resources - public static final String VALUE_ID = "id"; //$NON-NLS-1$ - - // Values: Drawables - public static final String VALUE_DISABLED = "disabled"; //$NON-NLS-1$ - public static final String VALUE_CLAMP = "clamp"; //$NON-NLS-1$ - - // Menus - public static final String ATTR_SHOW_AS_ACTION = "showAsAction"; //$NON-NLS-1$ - public static final String VALUE_IF_ROOM = "ifRoom"; //$NON-NLS-1$ - public static final String VALUE_ALWAYS = "always"; //$NON-NLS-1$ - - // Units - public static final String UNIT_DP = "dp"; //$NON-NLS-1$ - public static final String UNIT_DIP = "dip"; //$NON-NLS-1$ - public static final String UNIT_SP = "sp"; //$NON-NLS-1$ - public static final String UNIT_PX = "px"; //$NON-NLS-1$ - - // Filenames and folder names - public static final String ANDROID_MANIFEST_XML = "AndroidManifest.xml"; //$NON-NLS-1$ - public static final String OLD_PROGUARD_FILE = "proguard.cfg"; //$NON-NLS-1$ - public static final String PROGUARD_FILE = "proguard-project.txt"; //$NON-NLS-1$ - public static final String CLASS_FOLDER = - "bin" + File.separator + "classes"; //$NON-NLS-1$ //$NON-NLS-2$ - public static final String GEN_FOLDER = "gen"; //$NON-NLS-1$ - public static final String SRC_FOLDER = "src"; //$NON-NLS-1$ - public static final String LIBS_FOLDER = "libs"; //$NON-NLS-1$ - public static final String BIN_FOLDER = "bin"; //$NON-NLS-1$ - - public static final String RES_FOLDER = "res"; //$NON-NLS-1$ - public static final String DOT_XML = ".xml"; //$NON-NLS-1$ - public static final String DOT_GIF = ".gif"; //$NON-NLS-1$ - public static final String DOT_JPG = ".jpg"; //$NON-NLS-1$ - public static final String DOT_PNG = ".png"; //$NON-NLS-1$ - public static final String DOT_9PNG = ".9.png"; //$NON-NLS-1$ - public static final String DOT_JAVA = ".java"; //$NON-NLS-1$ - public static final String DOT_CLASS = ".class"; //$NON-NLS-1$ - public static final String DOT_JAR = ".jar"; //$NON-NLS-1$ - public static final String DRAWABLE_FOLDER = "drawable"; //$NON-NLS-1$ - public static final String DRAWABLE_XHDPI = "drawable-xhdpi"; //$NON-NLS-1$ - public static final String DRAWABLE_HDPI = "drawable-hdpi"; //$NON-NLS-1$ - public static final String DRAWABLE_MDPI = "drawable-mdpi"; //$NON-NLS-1$ - public static final String DRAWABLE_LDPI = "drawable-ldpi"; //$NON-NLS-1$ - - // Resources - public static final String ANDROID_RESOURCE_PREFIX = "@android:"; //$NON-NLS-1$ - public static final String ANDROID_THEME_PREFIX = "?android:"; //$NON-NLS-1$ - public static final String ID_RESOURCE_PREFIX = "@id/"; //$NON-NLS-1$ - public static final String NEW_ID_RESOURCE_PREFIX = "@+id/"; //$NON-NLS-1$ - public static final String DRAWABLE_RESOURCE_PREFIX = "@drawable/"; //$NON-NLS-1$ - public static final String LAYOUT_RESOURCE_PREFIX = "@layout/"; //$NON-NLS-1$ - public static final String STYLE_RESOURCE_PREFIX = "@style/"; //$NON-NLS-1$ - public static final String STRING_RESOURCE_PREFIX = "@string/"; //$NON-NLS-1$ - public static final String RESOURCE_CLZ_ID = "id"; //$NON-NLS-1$ - public static final String RESOURCE_CLZ_COLOR = "color"; //$NON-NLS-1$ - public static final String RESOURCE_CLZ_ARRAY = "array"; //$NON-NLS-1$ - public static final String RESOURCE_CLZ_ATTR = "attr"; //$NON-NLS-1$ - public static final String RESOURCE_CLR_STYLEABLE = "styleable"; //$NON-NLS-1$ - public static final String NULL_RESOURCE = "@null"; //$NON-NLS-1$ - public static final String TRANSPARENT_COLOR = "@android:color/transparent"; //$NON-NLS-1$ - public static final String ANDROID_STYLE_RESOURCE_PREFIX = "@android:style/"; //$NON-NLS-1$ - public static final String ANDROID_STRING_RESOURCE_PREFIX = "@android:string/"; //$NON-NLS-1$ - - // Packages - public static final String ANDROID_PKG_PREFIX = "android."; //$NON-NLS-1$ - public static final String WIDGET_PKG_PREFIX = "android.widget."; //$NON-NLS-1$ - public static final String VIEW_PKG_PREFIX = "android.view."; //$NON-NLS-1$ - - // Project properties - public static final String ANDROID_LIBRARY = "android.library"; //$NON-NLS-1$ - public static final String PROGUARD_CONFIG = "proguard.config"; //$NON-NLS-1$ - public static final String ANDROID_LIBRARY_REFERENCE_FORMAT = "android.library.reference.%1$d";//$NON-NLS-1$ - public static final String PROJECT_PROPERTIES = "project.properties";//$NON-NLS-1$ - - // Java References - public static final String ATTR_REF_PREFIX = "?attr/"; //$NON-NLS-1$ - public static final String R_PREFIX = "R."; //$NON-NLS-1$ - public static final String R_ID_PREFIX = "R.id."; //$NON-NLS-1$ - public static final String R_LAYOUT_PREFIX = "R.layout."; //$NON-NLS-1$ - public static final String R_DRAWABLE_PREFIX = "R.drawable."; //$NON-NLS-1$ - public static final String R_ATTR_PREFIX = "R.attr."; //$NON-NLS-1$ - - // Attributes related to tools - public final static String ATTR_IGNORE = "ignore"; //$NON-NLS-1$ - - // SuppressLint - public static final String SUPPRESS_ALL = "all"; //$NON-NLS-1$ - public static final String SUPPRESS_LINT = "SuppressLint"; //$NON-NLS-1$ - public static final String TARGET_API = "TargetApi"; //$NON-NLS-1$ - public static final String FQCN_SUPPRESS_LINT = "android.annotation." + SUPPRESS_LINT; //$NON-NLS-1$ - public static final String FQCN_TARGET_API = "android.annotation." + TARGET_API; //$NON-NLS-1$ - - // Class Names - public static final String CONSTRUCTOR_NAME = "<init>"; //$NON-NLS-1$ - public static final String FRAGMENT = "android/app/Fragment"; //$NON-NLS-1$ - public static final String FRAGMENT_V4 = "android/support/v4/app/Fragment"; //$NON-NLS-1$ - public static final String ANDROID_APP_ACTIVITY = "android/app/Activity"; //$NON-NLS-1$ - public static final String ANDROID_APP_SERVICE = "android/app/Service"; //$NON-NLS-1$ - public static final String ANDROID_CONTENT_CONTENT_PROVIDER = - "android/content/ContentProvider"; //$NON-NLS-1$ - public static final String ANDROID_CONTENT_BROADCAST_RECEIVER = - "android/content/BroadcastReceiver"; //$NON-NLS-1$ - - // Method Names - public static final String FORMAT_METHOD = "format"; //$NON-NLS-1$ - public static final String GET_STRING_METHOD = "getString"; //$NON-NLS-1$ - - /** - * The highest known API level. Note that the tools may also look at the - * installed platforms to see if they can find more recently released - * platforms, e.g. when the tools have not yet been updated for a new - * release. This number is used as a baseline and any more recent platforms - * found can be used to increase the highest known number. - */ - public static final int HIGHEST_KNOWN_API = 16; -} diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintUtils.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintUtils.java index fe659cd..60c9e97 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintUtils.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/LintUtils.java @@ -16,11 +16,11 @@ package com.android.tools.lint.detector.api; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_MANIFEST_XML; -import static com.android.tools.lint.detector.api.LintConstants.BIN_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; -import static com.android.tools.lint.detector.api.LintConstants.ID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.NEW_ID_RESOURCE_PREFIX; +import static com.android.SdkConstants.ANDROID_MANIFEST_XML; +import static com.android.SdkConstants.BIN_FOLDER; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -218,10 +218,10 @@ public class LintUtils { public static String stripIdPrefix(@Nullable String id) { if (id == null) { return ""; - } else if (id.startsWith(NEW_ID_RESOURCE_PREFIX)) { - return id.substring(NEW_ID_RESOURCE_PREFIX.length()); - } else if (id.startsWith(ID_RESOURCE_PREFIX)) { - return id.substring(ID_RESOURCE_PREFIX.length()); + } else if (id.startsWith(NEW_ID_PREFIX)) { + return id.substring(NEW_ID_PREFIX.length()); + } else if (id.startsWith(ID_PREFIX)) { + return id.substring(ID_PREFIX.length()); } return id; @@ -236,28 +236,28 @@ public class LintUtils { * @return true if the two id references refer to the same id */ public static boolean idReferencesMatch(String id1, String id2) { - if (id1.startsWith(NEW_ID_RESOURCE_PREFIX)) { - if (id2.startsWith(NEW_ID_RESOURCE_PREFIX)) { + if (id1.startsWith(NEW_ID_PREFIX)) { + if (id2.startsWith(NEW_ID_PREFIX)) { return id1.equals(id2); } else { - assert id2.startsWith(ID_RESOURCE_PREFIX); + assert id2.startsWith(ID_PREFIX); return ((id1.length() - id2.length()) - == (NEW_ID_RESOURCE_PREFIX.length() - ID_RESOURCE_PREFIX.length())) - && id1.regionMatches(NEW_ID_RESOURCE_PREFIX.length(), id2, - ID_RESOURCE_PREFIX.length(), - id2.length() - ID_RESOURCE_PREFIX.length()); + == (NEW_ID_PREFIX.length() - ID_PREFIX.length())) + && id1.regionMatches(NEW_ID_PREFIX.length(), id2, + ID_PREFIX.length(), + id2.length() - ID_PREFIX.length()); } } else { - assert id1.startsWith(ID_RESOURCE_PREFIX); - if (id2.startsWith(ID_RESOURCE_PREFIX)) { + assert id1.startsWith(ID_PREFIX); + if (id2.startsWith(ID_PREFIX)) { return id1.equals(id2); } else { - assert id2.startsWith(NEW_ID_RESOURCE_PREFIX); + assert id2.startsWith(NEW_ID_PREFIX); return (id2.length() - id1.length() - == (NEW_ID_RESOURCE_PREFIX.length() - ID_RESOURCE_PREFIX.length())) - && id2.regionMatches(NEW_ID_RESOURCE_PREFIX.length(), id1, - ID_RESOURCE_PREFIX.length(), - id1.length() - ID_RESOURCE_PREFIX.length()); + == (NEW_ID_PREFIX.length() - ID_PREFIX.length())) + && id2.regionMatches(NEW_ID_PREFIX.length(), id1, + ID_PREFIX.length(), + id1.length() - ID_PREFIX.length()); } } } diff --git a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java index acd1d06..b584020 100644 --- a/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java +++ b/lint/libs/lint_api/src/com/android/tools/lint/detector/api/Project.java @@ -16,17 +16,17 @@ package com.android.tools.lint.detector.api; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_LIBRARY; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_LIBRARY_REFERENCE_FORMAT; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_MANIFEST_XML; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_MIN_SDK_VERSION; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PACKAGE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TARGET_SDK_VERSION; -import static com.android.tools.lint.detector.api.LintConstants.PROGUARD_CONFIG; -import static com.android.tools.lint.detector.api.LintConstants.PROJECT_PROPERTIES; -import static com.android.tools.lint.detector.api.LintConstants.TAG_USES_SDK; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_TRUE; +import static com.android.SdkConstants.ANDROID_LIBRARY; +import static com.android.SdkConstants.ANDROID_LIBRARY_REFERENCE_FORMAT; +import static com.android.SdkConstants.ANDROID_MANIFEST_XML; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_MIN_SDK_VERSION; +import static com.android.SdkConstants.ATTR_PACKAGE; +import static com.android.SdkConstants.ATTR_TARGET_SDK_VERSION; +import static com.android.SdkConstants.PROGUARD_CONFIG; +import static com.android.SdkConstants.PROJECT_PROPERTIES; +import static com.android.SdkConstants.TAG_USES_SDK; +import static com.android.SdkConstants.VALUE_TRUE; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AccessibilityDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/AccessibilityDetector.java index af5c805..6162c38 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AccessibilityDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/AccessibilityDetector.java @@ -16,12 +16,12 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CONTENT_DESCRIPTION; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_IMPORTANT_FOR_ACCESSIBILITY; -import static com.android.tools.lint.detector.api.LintConstants.IMAGE_BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.IMAGE_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_NO; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CONTENT_DESCRIPTION; +import static com.android.SdkConstants.ATTR_IMPORTANT_FOR_ACCESSIBILITY; +import static com.android.SdkConstants.IMAGE_BUTTON; +import static com.android.SdkConstants.IMAGE_VIEW; +import static com.android.SdkConstants.VALUE_NO; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AlwaysShowActionDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/AlwaysShowActionDetector.java index 42d48bc..6cdb42f 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AlwaysShowActionDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/AlwaysShowActionDetector.java @@ -16,9 +16,9 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_SHOW_AS_ACTION; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_ALWAYS; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_IF_ROOM; +import static com.android.SdkConstants.ATTR_SHOW_AS_ACTION; +import static com.android.SdkConstants.VALUE_ALWAYS; +import static com.android.SdkConstants.VALUE_IF_ROOM; import com.android.annotations.NonNull; import com.android.resources.ResourceFolderType; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AnnotationDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/AnnotationDetector.java index 0cb145e..7543def 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/AnnotationDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/AnnotationDetector.java @@ -16,8 +16,8 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.FQCN_SUPPRESS_LINT; -import static com.android.tools.lint.detector.api.LintConstants.SUPPRESS_LINT; +import static com.android.SdkConstants.FQCN_SUPPRESS_LINT; +import static com.android.SdkConstants.SUPPRESS_LINT; import com.android.annotations.NonNull; import com.android.tools.lint.client.api.IssueRegistry; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiClass.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiClass.java index a0aa591..b534b2f 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiClass.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiClass.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; import com.android.utils.Pair; import com.google.common.collect.Lists; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java index a434359..083916b 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiDetector.java @@ -16,12 +16,12 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_THEME_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CLASS; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.TARGET_API; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_TAG; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ANDROID_THEME_PREFIX; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.TARGET_API; +import static com.android.SdkConstants.VIEW_TAG; import static com.android.tools.lint.detector.api.LintUtils.getNextInstruction; import static com.android.tools.lint.detector.api.Location.SearchDirection.BACKWARD; import static com.android.tools.lint.detector.api.Location.SearchDirection.FORWARD; @@ -148,8 +148,8 @@ public class ApiDetector extends ResourceXmlDetector implements Detector.ClassSc String value = attribute.getValue(); String prefix = null; - if (value.startsWith(ANDROID_RESOURCE_PREFIX)) { - prefix = ANDROID_RESOURCE_PREFIX; + if (value.startsWith(ANDROID_PREFIX)) { + prefix = ANDROID_PREFIX; } else if (value.startsWith(ANDROID_THEME_PREFIX)) { prefix = ANDROID_THEME_PREFIX; } else { @@ -194,13 +194,13 @@ public class ApiDetector extends ResourceXmlDetector implements Detector.ClassSc Node textNode = childNodes.item(i); if (textNode.getNodeType() == Node.TEXT_NODE) { String text = textNode.getNodeValue(); - if (text.indexOf(ANDROID_RESOURCE_PREFIX) != -1) { + if (text.indexOf(ANDROID_PREFIX) != -1) { text = text.trim(); // Convert @android:type/foo into android/R$type and "foo" - int index = text.indexOf('/', ANDROID_RESOURCE_PREFIX.length()); + int index = text.indexOf('/', ANDROID_PREFIX.length()); if (index != -1) { String owner = "android/R$" //$NON-NLS-1$ - + text.substring(ANDROID_RESOURCE_PREFIX.length(), index); + + text.substring(ANDROID_PREFIX.length(), index); String name = text.substring(index + 1); int api = mApiDatabase.getFieldVersion(owner, name); int minSdk = getMinSdk(context); diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java index 5cf2603..9d661a8 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ApiLookup.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; +import static com.android.SdkConstants.DOT_XML; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ArraySizeDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ArraySizeDetector.java index 3fc95a5..771c247 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ArraySizeDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ArraySizeDetector.java @@ -17,10 +17,10 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ARRAY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_INTEGER_ARRAY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING_ARRAY; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.TAG_ARRAY; +import static com.android.SdkConstants.TAG_INTEGER_ARRAY; +import static com.android.SdkConstants.TAG_STRING_ARRAY; import com.android.annotations.NonNull; import com.android.resources.ResourceFolderType; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ButtonDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ButtonDetector.java index 46fb4bf..4b5bc84 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ButtonDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ButtonDetector.java @@ -16,26 +16,26 @@ package com.android.tools.lint.checks; -import static com.android.AndroidConstants.FD_RES_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_STRING_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ID; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_TO_LEFT_OF; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ORIENTATION; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TEXT; -import static com.android.tools.lint.detector.api.LintConstants.BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.LINEAR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.RELATIVE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.STRING_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TABLE_ROW; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_TRUE; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_VERTICAL; - +import static com.android.SdkConstants.ANDROID_STRING_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.ATTR_TEXT; +import static com.android.SdkConstants.BUTTON; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.STRING_PREFIX; +import static com.android.SdkConstants.TABLE_ROW; +import static com.android.SdkConstants.TAG_STRING; +import static com.android.SdkConstants.VALUE_TRUE; +import static com.android.SdkConstants.VALUE_VERTICAL; + +import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.resources.ResourceFolderType; import com.android.tools.lint.detector.api.Category; @@ -85,10 +85,10 @@ public class ButtonDetector extends ResourceXmlDetector { /** Layout text attribute reference to {@code @android:string/ok} */ private static final String ANDROID_OK_RESOURCE = - ANDROID_STRING_RESOURCE_PREFIX + "ok"; //$NON-NLS-1$ + ANDROID_STRING_PREFIX + "ok"; //$NON-NLS-1$ /** Layout text attribute reference to {@code @android:string/cancel} */ private static final String ANDROID_CANCEL_RESOURCE = - ANDROID_STRING_RESOURCE_PREFIX + "cancel"; //$NON-NLS-1$ + ANDROID_STRING_PREFIX + "cancel"; //$NON-NLS-1$ /** The main issue discovered by this detector */ public static final Issue ORDER = Issue.create( @@ -288,8 +288,8 @@ public class ButtonDetector extends ResourceXmlDetector { if (context.getDriver().getPhase() == 2) { if (mApplicableResources.contains(text)) { String key = text; - if (key.startsWith(STRING_RESOURCE_PREFIX)) { - key = key.substring(STRING_RESOURCE_PREFIX.length()); + if (key.startsWith(STRING_PREFIX)) { + key = key.substring(STRING_PREFIX.length()); } String label = mKeyToLabel.get(key); boolean isCancel = CANCEL_LABEL.equalsIgnoreCase(label); @@ -370,7 +370,7 @@ public class ButtonDetector extends ResourceXmlDetector { mApplicableResources = new HashSet<String>(); } - mApplicableResources.add(STRING_RESOURCE_PREFIX + name); + mApplicableResources.add(STRING_PREFIX + name); // ALSO record all the other string resources in this file to pick up other // labels. If you define "OK" in one resource file and "Cancel" in another @@ -431,7 +431,7 @@ public class ButtonDetector extends ResourceXmlDetector { if (resFolders != null) { for (File folder : resFolders) { String folderName = folder.getName(); - if (folderName.startsWith(FD_RES_LAYOUT) + if (folderName.startsWith(SdkConstants.FD_RES_LAYOUT) && folderName.contains("-v14")) { //$NON-NLS-1$ File layout = new File(folder, fileName); if (layout.exists()) { @@ -549,15 +549,15 @@ public class ButtonDetector extends ResourceXmlDetector { private String getLabel(String key) { String label = null; - if (key.startsWith(ANDROID_STRING_RESOURCE_PREFIX)) { + if (key.startsWith(ANDROID_STRING_PREFIX)) { if (key.equals(ANDROID_OK_RESOURCE)) { label = OK_LABEL; } else if (key.equals(ANDROID_CANCEL_RESOURCE)) { label = CANCEL_LABEL; } } else if (mKeyToLabel != null) { - if (key.startsWith(STRING_RESOURCE_PREFIX)) { - label = mKeyToLabel.get(key.substring(STRING_RESOURCE_PREFIX.length())); + if (key.startsWith(STRING_PREFIX)) { + label = mKeyToLabel.get(key.substring(STRING_PREFIX.length())); } } @@ -679,4 +679,4 @@ public class ButtonDetector extends ResourceXmlDetector { } return false; } -}
\ No newline at end of file +} diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ChildCountDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ChildCountDetector.java index 2f4503b..d4aa1f0 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ChildCountDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ChildCountDetector.java @@ -16,11 +16,11 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.GRID_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.HORIZONTAL_SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.LIST_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.REQUEST_FOCUS; -import static com.android.tools.lint.detector.api.LintConstants.SCROLL_VIEW; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.HORIZONTAL_SCROLL_VIEW; +import static com.android.SdkConstants.LIST_VIEW; +import static com.android.SdkConstants.REQUEST_FOCUS; +import static com.android.SdkConstants.SCROLL_VIEW; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ColorUsageDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ColorUsageDetector.java index 2c7a520..c659ab1 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ColorUsageDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ColorUsageDetector.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.RESOURCE_CLZ_COLOR; +import static com.android.SdkConstants.RESOURCE_CLZ_COLOR; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DeprecationDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DeprecationDetector.java index 952224c..00953d8 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DeprecationDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DeprecationDetector.java @@ -16,17 +16,17 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ABSOLUTE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_AUTO_TEXT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CAPITALIZE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_EDITABLE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ENABLED; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_INPUT_METHOD; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NUMERIC; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PASSWORD; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PHONE_NUMBER; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_SINGLE_LINE; +import static com.android.SdkConstants.ABSOLUTE_LAYOUT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_AUTO_TEXT; +import static com.android.SdkConstants.ATTR_CAPITALIZE; +import static com.android.SdkConstants.ATTR_EDITABLE; +import static com.android.SdkConstants.ATTR_ENABLED; +import static com.android.SdkConstants.ATTR_INPUT_METHOD; +import static com.android.SdkConstants.ATTR_NUMERIC; +import static com.android.SdkConstants.ATTR_PASSWORD; +import static com.android.SdkConstants.ATTR_PHONE_NUMBER; +import static com.android.SdkConstants.ATTR_SINGLE_LINE; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DetectMissingPrefix.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DetectMissingPrefix.java index 8a9c0a9..e6234f3 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DetectMissingPrefix.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DetectMissingPrefix.java @@ -16,12 +16,12 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_PKG_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CLASS; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_STYLE; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_TAG; -import static com.android.tools.lint.detector.api.LintConstants.XMLNS_PREFIX; +import static com.android.SdkConstants.ANDROID_PKG_PREFIX; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_STYLE; +import static com.android.SdkConstants.VIEW_TAG; +import static com.android.SdkConstants.XMLNS_PREFIX; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java index f27005c..720845d 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/DuplicateIdDetector.java @@ -16,13 +16,13 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ID; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; -import static com.android.tools.lint.detector.api.LintConstants.INCLUDE; -import static com.android.tools.lint.detector.api.LintConstants.LAYOUT_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.NEW_ID_RESOURCE_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.VIEW_INCLUDE; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; import com.android.annotations.NonNull; import com.android.resources.ResourceFolderType; @@ -120,7 +120,7 @@ public class DuplicateIdDetector extends LayoutDetector { @Override public Collection<String> getApplicableElements() { - return Collections.singletonList(INCLUDE); + return Collections.singletonList(VIEW_INCLUDE); } @Override @@ -259,9 +259,9 @@ public class DuplicateIdDetector extends LayoutDetector { context.report(WITHIN_LAYOUT, attribute, location, String.format("Duplicate id %1$s, already defined earlier in this layout", id), null); - } else if (id.startsWith(NEW_ID_RESOURCE_PREFIX)) { + } else if (id.startsWith(NEW_ID_PREFIX)) { // Skip id's on include tags - if (attribute.getOwnerElement().getTagName().equals(INCLUDE)) { + if (attribute.getOwnerElement().getTagName().equals(VIEW_INCLUDE)) { return; } diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/FragmentDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/FragmentDetector.java index 06162c4..954872d 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/FragmentDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/FragmentDetector.java @@ -16,9 +16,9 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.FRAGMENT; -import static com.android.tools.lint.detector.api.LintConstants.FRAGMENT_V4; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.FRAGMENT; +import static com.android.SdkConstants.FRAGMENT_V4; import com.android.annotations.NonNull; import com.android.tools.lint.client.api.LintDriver; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/GridLayoutDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/GridLayoutDetector.java index f32905a..34cc089 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/GridLayoutDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/GridLayoutDetector.java @@ -16,11 +16,11 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_COLUMN_COUNT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_COLUMN; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ROW; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ROW_COUNT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_COLUMN_COUNT; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_ROW_COUNT; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedDebugModeDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedDebugModeDetector.java index b684e6f..3bd913c 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedDebugModeDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedDebugModeDetector.java @@ -16,9 +16,9 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_MANIFEST_XML; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_DEBUGGABLE; +import static com.android.SdkConstants.ANDROID_MANIFEST_XML; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_DEBUGGABLE; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedValuesDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedValuesDetector.java index 3665303..b7f60df 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedValuesDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/HardcodedValuesDetector.java @@ -16,12 +16,12 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CONTENT_DESCRIPTION; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_HINT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LABEL; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PROMPT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TEXT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_CONTENT_DESCRIPTION; +import static com.android.SdkConstants.ATTR_HINT; +import static com.android.SdkConstants.ATTR_LABEL; +import static com.android.SdkConstants.ATTR_PROMPT; +import static com.android.SdkConstants.ATTR_TEXT; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/IconDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/IconDetector.java index 9dd42b9..e149cc0 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/IconDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/IconDetector.java @@ -16,22 +16,22 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_MANIFEST_XML; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ICON; -import static com.android.tools.lint.detector.api.LintConstants.DOT_9PNG; -import static com.android.tools.lint.detector.api.LintConstants.DOT_GIF; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JPG; -import static com.android.tools.lint.detector.api.LintConstants.DOT_PNG; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; -import static com.android.tools.lint.detector.api.LintConstants.DRAWABLE_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.DRAWABLE_HDPI; -import static com.android.tools.lint.detector.api.LintConstants.DRAWABLE_LDPI; -import static com.android.tools.lint.detector.api.LintConstants.DRAWABLE_MDPI; -import static com.android.tools.lint.detector.api.LintConstants.DRAWABLE_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.DRAWABLE_XHDPI; -import static com.android.tools.lint.detector.api.LintConstants.RES_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_APPLICATION; +import static com.android.SdkConstants.ANDROID_MANIFEST_XML; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ICON; +import static com.android.SdkConstants.DOT_9PNG; +import static com.android.SdkConstants.DOT_GIF; +import static com.android.SdkConstants.DOT_JPG; +import static com.android.SdkConstants.DOT_PNG; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.DRAWABLE_FOLDER; +import static com.android.SdkConstants.DRAWABLE_HDPI; +import static com.android.SdkConstants.DRAWABLE_LDPI; +import static com.android.SdkConstants.DRAWABLE_MDPI; +import static com.android.SdkConstants.DRAWABLE_PREFIX; +import static com.android.SdkConstants.DRAWABLE_XHDPI; +import static com.android.SdkConstants.RES_FOLDER; +import static com.android.SdkConstants.TAG_APPLICATION; import static com.android.tools.lint.detector.api.LintUtils.endsWith; import com.android.annotations.NonNull; @@ -1221,8 +1221,8 @@ public class IconDetector extends Detector implements Detector.XmlScanner { public void visitElement(@NonNull XmlContext context, @NonNull Element element) { assert element.getTagName().equals(TAG_APPLICATION); mApplicationIcon = element.getAttributeNS(ANDROID_URI, ATTR_ICON); - if (mApplicationIcon.startsWith(DRAWABLE_RESOURCE_PREFIX)) { - mApplicationIcon = mApplicationIcon.substring(DRAWABLE_RESOURCE_PREFIX.length()); + if (mApplicationIcon.startsWith(DRAWABLE_PREFIX)) { + mApplicationIcon = mApplicationIcon.substring(DRAWABLE_PREFIX.length()); } } } diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/InefficientWeightDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/InefficientWeightDetector.java index c00b57e..98d1301 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/InefficientWeightDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/InefficientWeightDetector.java @@ -16,14 +16,14 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_BASELINE_ALIGNED; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_WEIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_WIDTH; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ORIENTATION; -import static com.android.tools.lint.detector.api.LintConstants.LINEAR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_VERTICAL; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_BASELINE_ALIGNED; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_ORIENTATION; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.VALUE_VERTICAL; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/LocaleDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/LocaleDetector.java index 29b7b48..43e9ea0 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/LocaleDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/LocaleDetector.java @@ -16,8 +16,8 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.FORMAT_METHOD; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.FORMAT_METHOD; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ManifestOrderDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ManifestOrderDetector.java index 3d71a85..237d8a0 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ManifestOrderDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ManifestOrderDetector.java @@ -16,20 +16,20 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_MANIFEST_XML; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_MIN_SDK_VERSION; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PACKAGE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TARGET_SDK_VERSION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ACTIVITY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_APPLICATION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_PROVIDER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_RECEIVER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_SERVICE; -import static com.android.tools.lint.detector.api.LintConstants.TAG_USES_LIBRARY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_USES_PERMISSION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_USES_SDK; +import static com.android.SdkConstants.ANDROID_MANIFEST_XML; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_MIN_SDK_VERSION; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_PACKAGE; +import static com.android.SdkConstants.ATTR_TARGET_SDK_VERSION; +import static com.android.SdkConstants.TAG_ACTIVITY; +import static com.android.SdkConstants.TAG_APPLICATION; +import static com.android.SdkConstants.TAG_PROVIDER; +import static com.android.SdkConstants.TAG_RECEIVER; +import static com.android.SdkConstants.TAG_SERVICE; +import static com.android.SdkConstants.TAG_USES_LIBRARY; +import static com.android.SdkConstants.TAG_USES_PERMISSION; +import static com.android.SdkConstants.TAG_USES_SDK; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java index 5b3fe99..8769893 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/MergeRootFrameLayoutDetector.java @@ -16,16 +16,16 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_BACKGROUND; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_FOREGROUND; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAVA; -import static com.android.tools.lint.detector.api.LintConstants.FRAME_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.INCLUDE; -import static com.android.tools.lint.detector.api.LintConstants.LAYOUT_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.R_LAYOUT_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_BACKGROUND; +import static com.android.SdkConstants.ATTR_FOREGROUND; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.FRAME_LAYOUT; +import static com.android.SdkConstants.VIEW_INCLUDE; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.R_LAYOUT_RESOURCE_PREFIX; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -143,13 +143,13 @@ public class MergeRootFrameLayoutDetector extends LayoutDetector implements Dete @Override public Collection<String> getApplicableElements() { - return Arrays.asList(INCLUDE, FRAME_LAYOUT); + return Arrays.asList(VIEW_INCLUDE, FRAME_LAYOUT); } @Override public void visitElement(@NonNull XmlContext context, @NonNull Element element) { String tag = element.getTagName(); - if (tag.equals(INCLUDE)) { + if (tag.equals(VIEW_INCLUDE)) { String layout = element.getAttribute(ATTR_LAYOUT); // NOTE: Not in android: namespace if (layout.startsWith(LAYOUT_RESOURCE_PREFIX)) { // Ignore @android:layout/ layouts layout = layout.substring(LAYOUT_RESOURCE_PREFIX.length()); @@ -199,8 +199,8 @@ public class MergeRootFrameLayoutDetector extends LayoutDetector implements Dete Expression argument = argumentList.first(); if (argument instanceof Select) { String expression = argument.toString(); - if (expression.startsWith(R_LAYOUT_PREFIX)) { - whiteListLayout(expression.substring(R_LAYOUT_PREFIX.length())); + if (expression.startsWith(R_LAYOUT_RESOURCE_PREFIX)) { + whiteListLayout(expression.substring(R_LAYOUT_RESOURCE_PREFIX.length())); } } } diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java index 8c80b68..dac3b82 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/MissingClassDetector.java @@ -16,16 +16,16 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_PKG_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PACKAGE; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ACTIVITY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_APPLICATION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_PROVIDER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_RECEIVER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_SERVICE; +import static com.android.SdkConstants.ANDROID_PKG_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_PACKAGE; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.TAG_ACTIVITY; +import static com.android.SdkConstants.TAG_APPLICATION; +import static com.android.SdkConstants.TAG_PROVIDER; +import static com.android.SdkConstants.TAG_RECEIVER; +import static com.android.SdkConstants.TAG_SERVICE; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/NamespaceDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/NamespaceDetector.java index e760a9c..a4fc2f6 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/NamespaceDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/NamespaceDetector.java @@ -16,11 +16,11 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_PKG_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.AUTO_URI; -import static com.android.tools.lint.detector.api.LintConstants.URI_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.XMLNS_PREFIX; +import static com.android.SdkConstants.ANDROID_PKG_PREFIX; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.AUTO_URI; +import static com.android.SdkConstants.URI_PREFIX; +import static com.android.SdkConstants.XMLNS_PREFIX; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java index 3f0fef3..f32b1f4 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/NestedScrollingWidgetDetector.java @@ -16,11 +16,11 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.GALLERY; -import static com.android.tools.lint.detector.api.LintConstants.GRID_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.HORIZONTAL_SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.LIST_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.SCROLL_VIEW; +import static com.android.SdkConstants.GALLERY; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.HORIZONTAL_SCROLL_VIEW; +import static com.android.SdkConstants.LIST_VIEW; +import static com.android.SdkConstants.SCROLL_VIEW; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java index c0fc698..08d53a3 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ObsoleteLayoutParamsDetector.java @@ -16,52 +16,52 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ABSOLUTE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ABOVE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_BASELINE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_BOTTOM; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_LEFT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_RIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_TOP; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_BELOW; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_CENTER_IN_PARENT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_CENTER_VERTICAL; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_COLUMN; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_COLUMN_SPAN; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_GRAVITY; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_MARGIN; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_MARGIN_BOTTOM; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_MARGIN_LEFT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_MARGIN_RIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_MARGIN_TOP; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ROW; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_ROW_SPAN; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_SPAN; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_TO_LEFT_OF; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_WEIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_WIDTH; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_X; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_Y; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; -import static com.android.tools.lint.detector.api.LintConstants.GRID_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.INCLUDE; -import static com.android.tools.lint.detector.api.LintConstants.LAYOUT_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.LINEAR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.MERGE; -import static com.android.tools.lint.detector.api.LintConstants.RELATIVE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.TABLE_ROW; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_TAG; +import static com.android.SdkConstants.ABSOLUTE_LAYOUT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT; +import static com.android.SdkConstants.ATTR_LAYOUT_ABOVE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BASELINE; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; +import static com.android.SdkConstants.ATTR_LAYOUT_BELOW; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_IN_PARENT; +import static com.android.SdkConstants.ATTR_LAYOUT_CENTER_VERTICAL; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN; +import static com.android.SdkConstants.ATTR_LAYOUT_COLUMN_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_GRAVITY; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_BOTTOM; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_LEFT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_RIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_MARGIN_TOP; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW; +import static com.android.SdkConstants.ATTR_LAYOUT_ROW_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_SPAN; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_LEFT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_TO_RIGHT_OF; +import static com.android.SdkConstants.ATTR_LAYOUT_WEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.ATTR_LAYOUT_X; +import static com.android.SdkConstants.ATTR_LAYOUT_Y; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.VIEW_INCLUDE; +import static com.android.SdkConstants.LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.VIEW_MERGE; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.TABLE_ROW; +import static com.android.SdkConstants.VIEW_TAG; import com.android.annotations.NonNull; import com.android.tools.lint.client.api.IDomParser; @@ -225,7 +225,7 @@ public class ObsoleteLayoutParamsDetector extends LayoutDetector { @Override public Collection<String> getApplicableElements() { - return Collections.singletonList(INCLUDE); + return Collections.singletonList(VIEW_INCLUDE); } @Override @@ -236,7 +236,7 @@ public class ObsoleteLayoutParamsDetector extends LayoutDetector { @Override public void visitAttribute(@NonNull XmlContext context, @NonNull Attr attribute) { String name = attribute.getLocalName(); - if (name != null && name.startsWith(ATTR_LAYOUT_PREFIX) + if (name != null && name.startsWith(ATTR_LAYOUT_RESOURCE_PREFIX) && ANDROID_URI.equals(attribute.getNamespaceURI())) { if (VALID.contains(name)) { return; @@ -263,7 +263,7 @@ public class ObsoleteLayoutParamsDetector extends LayoutDetector { } String parentTag = ((Element) layoutNode).getTagName(); - if (parentTag.equals(MERGE)) { + if (parentTag.equals(VIEW_MERGE)) { // This is a merge which means we need to check the including contexts, // wherever they are. This has to be done after all the files have been // scanned since we are not processing the files in any particular order. @@ -305,7 +305,7 @@ public class ObsoleteLayoutParamsDetector extends LayoutDetector { Node parent = element.getParentNode(); if (parent.getNodeType() == Node.ELEMENT_NODE) { String tag = parent.getNodeName(); - if (tag.indexOf('.') == -1 && !tag.equals(MERGE)) { + if (tag.indexOf('.') == -1 && !tag.equals(VIEW_MERGE)) { if (mIncludes == null) { mIncludes = new HashMap<String, List<Pair<File, String>>>(); } diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/OnClickDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/OnClickDetector.java index 4283b7b..04fdd9d 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/OnClickDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/OnClickDetector.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ON_CLICK; +import static com.android.SdkConstants.ATTR_ON_CLICK; import com.android.annotations.NonNull; import com.android.tools.lint.client.api.LintDriver; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/OverdrawDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/OverdrawDetector.java index 0e39aff..2c3999d 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/OverdrawDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/OverdrawDetector.java @@ -16,23 +16,23 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_BACKGROUND; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PARENT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_THEME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TILE_MODE; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAVA; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; -import static com.android.tools.lint.detector.api.LintConstants.DRAWABLE_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.NULL_RESOURCE; -import static com.android.tools.lint.detector.api.LintConstants.STYLE_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ACTIVITY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_APPLICATION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_BITMAP; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STYLE; -import static com.android.tools.lint.detector.api.LintConstants.TRANSPARENT_COLOR; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_DISABLED; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_BACKGROUND; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_PARENT; +import static com.android.SdkConstants.ATTR_THEME; +import static com.android.SdkConstants.ATTR_TILE_MODE; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.DRAWABLE_PREFIX; +import static com.android.SdkConstants.NULL_RESOURCE; +import static com.android.SdkConstants.STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.TAG_ACTIVITY; +import static com.android.SdkConstants.TAG_APPLICATION; +import static com.android.SdkConstants.TAG_BITMAP; +import static com.android.SdkConstants.TAG_STYLE; +import static com.android.SdkConstants.TRANSPARENT_COLOR; +import static com.android.SdkConstants.VALUE_DISABLED; import static com.android.tools.lint.detector.api.LintUtils.endsWith; import com.android.annotations.NonNull; @@ -360,7 +360,7 @@ public class OverdrawDetector extends LayoutDetector implements Detector.JavaSca if (endsWith(resource, DOT_XML)) { resource = resource.substring(0, resource.length() - DOT_XML.length()); } - return DRAWABLE_RESOURCE_PREFIX + resource; + return DRAWABLE_PREFIX + resource; } private void scanBitmap(Context context, Element element) { diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ProguardDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ProguardDetector.java index 29db23f..5e57849 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ProguardDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ProguardDetector.java @@ -16,8 +16,8 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.PROGUARD_CONFIG; -import static com.android.tools.lint.detector.api.LintConstants.PROJECT_PROPERTIES; +import static com.android.SdkConstants.PROGUARD_CONFIG; +import static com.android.SdkConstants.PROJECT_PROPERTIES; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/PxUsageDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/PxUsageDetector.java index c7d688f..ef2768d 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/PxUsageDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/PxUsageDetector.java @@ -16,13 +16,13 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TEXT_SIZE; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ITEM; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STYLE; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_DIP; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_DP; -import static com.android.tools.lint.detector.api.LintConstants.UNIT_PX; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_TEXT_SIZE; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_STYLE; +import static com.android.SdkConstants.UNIT_DIP; +import static com.android.SdkConstants.UNIT_DP; +import static com.android.SdkConstants.UNIT_PX; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/RegistrationDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/RegistrationDetector.java index 5f4aff4..e87505e 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/RegistrationDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/RegistrationDetector.java @@ -16,17 +16,17 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_APP_ACTIVITY; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_APP_SERVICE; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_CONTENT_BROADCAST_RECEIVER; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_CONTENT_CONTENT_PROVIDER; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PACKAGE; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ACTIVITY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_PROVIDER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_RECEIVER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_SERVICE; +import static com.android.SdkConstants.ANDROID_APP_ACTIVITY; +import static com.android.SdkConstants.ANDROID_APP_SERVICE; +import static com.android.SdkConstants.ANDROID_CONTENT_BROADCAST_RECEIVER; +import static com.android.SdkConstants.ANDROID_CONTENT_CONTENT_PROVIDER; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_PACKAGE; +import static com.android.SdkConstants.TAG_ACTIVITY; +import static com.android.SdkConstants.TAG_PROVIDER; +import static com.android.SdkConstants.TAG_RECEIVER; +import static com.android.SdkConstants.TAG_SERVICE; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ScrollViewChildDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ScrollViewChildDetector.java index e7796ea..c4db539 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ScrollViewChildDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ScrollViewChildDetector.java @@ -16,13 +16,13 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_HEIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_WIDTH; -import static com.android.tools.lint.detector.api.LintConstants.HORIZONTAL_SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_FILL_PARENT; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_MATCH_PARENT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_LAYOUT_HEIGHT; +import static com.android.SdkConstants.ATTR_LAYOUT_WIDTH; +import static com.android.SdkConstants.HORIZONTAL_SCROLL_VIEW; +import static com.android.SdkConstants.SCROLL_VIEW; +import static com.android.SdkConstants.VALUE_FILL_PARENT; +import static com.android.SdkConstants.VALUE_MATCH_PARENT; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java index 8c79a2c..8c3bc84 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/SecurityDetector.java @@ -16,24 +16,24 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_MANIFEST_XML; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_EXPORTED; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PATH; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PATH_PATTERN; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PATH_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PERMISSION; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_READ_PERMISSION; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_WRITE_PERMISSION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ACTIVITY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_APPLICATION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_GRANT_PERMISSION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_INTENT_FILTER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_PATH_PERMISSION; -import static com.android.tools.lint.detector.api.LintConstants.TAG_PROVIDER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_RECEIVER; -import static com.android.tools.lint.detector.api.LintConstants.TAG_SERVICE; +import static com.android.SdkConstants.ANDROID_MANIFEST_XML; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_EXPORTED; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_PATH; +import static com.android.SdkConstants.ATTR_PATH_PATTERN; +import static com.android.SdkConstants.ATTR_PATH_PREFIX; +import static com.android.SdkConstants.ATTR_PERMISSION; +import static com.android.SdkConstants.ATTR_READ_PERMISSION; +import static com.android.SdkConstants.ATTR_WRITE_PERMISSION; +import static com.android.SdkConstants.TAG_ACTIVITY; +import static com.android.SdkConstants.TAG_APPLICATION; +import static com.android.SdkConstants.TAG_GRANT_PERMISSION; +import static com.android.SdkConstants.TAG_INTENT_FILTER; +import static com.android.SdkConstants.TAG_PATH_PERMISSION; +import static com.android.SdkConstants.TAG_PROVIDER; +import static com.android.SdkConstants.TAG_RECEIVER; +import static com.android.SdkConstants.TAG_SERVICE; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java index c08b0c6..6161e04 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StateListDetector.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; +import static com.android.SdkConstants.ANDROID_URI; import com.android.annotations.NonNull; import com.android.resources.ResourceFolderType; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StringFormatDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StringFormatDetector.java index ae1bf52..f6f0f7e 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StringFormatDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StringFormatDetector.java @@ -16,11 +16,11 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAVA; -import static com.android.tools.lint.detector.api.LintConstants.FORMAT_METHOD; -import static com.android.tools.lint.detector.api.LintConstants.GET_STRING_METHOD; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.FORMAT_METHOD; +import static com.android.SdkConstants.GET_STRING_METHOD; +import static com.android.SdkConstants.TAG_STRING; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StyleCycleDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StyleCycleDetector.java index 82001d0..61290e1 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/StyleCycleDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/StyleCycleDetector.java @@ -16,10 +16,10 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PARENT; -import static com.android.tools.lint.detector.api.LintConstants.STYLE_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STYLE; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_PARENT; +import static com.android.SdkConstants.STYLE_RESOURCE_PREFIX; +import static com.android.SdkConstants.TAG_STYLE; import com.android.annotations.NonNull; import com.android.resources.ResourceFolderType; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextFieldDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextFieldDetector.java index 518bf2e..74efb32 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextFieldDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextFieldDetector.java @@ -16,11 +16,11 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_HINT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_INPUT_METHOD; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_INPUT_TYPE; -import static com.android.tools.lint.detector.api.LintConstants.EDIT_TEXT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_HINT; +import static com.android.SdkConstants.ATTR_INPUT_METHOD; +import static com.android.SdkConstants.ATTR_INPUT_TYPE; +import static com.android.SdkConstants.EDIT_TEXT; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextViewDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextViewDetector.java index db9155a..1714198 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextViewDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TextViewDetector.java @@ -16,33 +16,33 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_AUTO_TEXT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_BUFFER_TYPE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CAPITALIZE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CURSOR_VISIBLE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_DIGITS; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_EDITABLE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_EDITOR_EXTRAS; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_IME_ACTION_ID; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_IME_ACTION_LABEL; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_IME_OPTIONS; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_INPUT_METHOD; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_INPUT_TYPE; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NUMERIC; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PASSWORD; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PHONE_NUMBER; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_PRIVATE_IME_OPTIONS; -import static com.android.tools.lint.detector.api.LintConstants.BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.CHECKED_TEXT_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.CHECK_BOX; -import static com.android.tools.lint.detector.api.LintConstants.RADIO_BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.SWITCH; -import static com.android.tools.lint.detector.api.LintConstants.TEXT_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.TOGGLE_BUTTON; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_EDITABLE; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_NONE; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_TRUE; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_AUTO_TEXT; +import static com.android.SdkConstants.ATTR_BUFFER_TYPE; +import static com.android.SdkConstants.ATTR_CAPITALIZE; +import static com.android.SdkConstants.ATTR_CURSOR_VISIBLE; +import static com.android.SdkConstants.ATTR_DIGITS; +import static com.android.SdkConstants.ATTR_EDITABLE; +import static com.android.SdkConstants.ATTR_EDITOR_EXTRAS; +import static com.android.SdkConstants.ATTR_IME_ACTION_ID; +import static com.android.SdkConstants.ATTR_IME_ACTION_LABEL; +import static com.android.SdkConstants.ATTR_IME_OPTIONS; +import static com.android.SdkConstants.ATTR_INPUT_METHOD; +import static com.android.SdkConstants.ATTR_INPUT_TYPE; +import static com.android.SdkConstants.ATTR_NUMERIC; +import static com.android.SdkConstants.ATTR_PASSWORD; +import static com.android.SdkConstants.ATTR_PHONE_NUMBER; +import static com.android.SdkConstants.ATTR_PRIVATE_IME_OPTIONS; +import static com.android.SdkConstants.BUTTON; +import static com.android.SdkConstants.CHECKED_TEXT_VIEW; +import static com.android.SdkConstants.CHECK_BOX; +import static com.android.SdkConstants.RADIO_BUTTON; +import static com.android.SdkConstants.SWITCH; +import static com.android.SdkConstants.TEXT_VIEW; +import static com.android.SdkConstants.TOGGLE_BUTTON; +import static com.android.SdkConstants.VALUE_EDITABLE; +import static com.android.SdkConstants.VALUE_NONE; +import static com.android.SdkConstants.VALUE_TRUE; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java index 02fe6ae..7c409fc 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TranslationDetector.java @@ -16,13 +16,13 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TRANSLATABLE; -import static com.android.tools.lint.detector.api.LintConstants.STRING_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ITEM; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING_ARRAY; +import static com.android.SdkConstants.ANDROID_PREFIX; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_TRANSLATABLE; +import static com.android.SdkConstants.STRING_PREFIX; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_STRING; +import static com.android.SdkConstants.TAG_STRING_ARRAY; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; @@ -533,8 +533,8 @@ public class TranslationDetector extends ResourceXmlDetector { Node valueNode = itemChildren.item(j); if (valueNode.getNodeType() == Node.TEXT_NODE) { String value = valueNode.getNodeValue().trim(); - if (!value.startsWith(ANDROID_RESOURCE_PREFIX) - && !value.startsWith(STRING_RESOURCE_PREFIX)) { + if (!value.startsWith(ANDROID_PREFIX) + && !value.startsWith(STRING_PREFIX)) { return false; } } diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoDetector.java index 0eb9866..6f85505 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoDetector.java @@ -17,7 +17,7 @@ package com.android.tools.lint.checks; import static com.android.tools.lint.checks.TypoLookup.isLetter; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING; +import static com.android.SdkConstants.TAG_STRING; import static com.google.common.base.Objects.equal; import com.android.annotations.NonNull; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoLookup.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoLookup.java index 4a4591d..2dcd6c3 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoLookup.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypoLookup.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; +import static com.android.SdkConstants.DOT_XML; import static com.android.tools.lint.detector.api.LintUtils.assertionsEnabled; import com.android.annotations.NonNull; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypographyDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypographyDetector.java index 5ddc75b..66d6889 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypographyDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/TypographyDetector.java @@ -16,8 +16,8 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING_ARRAY; +import static com.android.SdkConstants.TAG_STRING; +import static com.android.SdkConstants.TAG_STRING_ARRAY; import com.android.annotations.NonNull; import com.android.annotations.VisibleForTesting; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UnusedResourceDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/UnusedResourceDetector.java index 3217a09..1b4163e 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UnusedResourceDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/UnusedResourceDetector.java @@ -16,27 +16,27 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_REF_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.DOT_GIF; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JPG; -import static com.android.tools.lint.detector.api.LintConstants.DOT_PNG; -import static com.android.tools.lint.detector.api.LintConstants.DOT_XML; -import static com.android.tools.lint.detector.api.LintConstants.RESOURCE_CLR_STYLEABLE; -import static com.android.tools.lint.detector.api.LintConstants.RESOURCE_CLZ_ARRAY; -import static com.android.tools.lint.detector.api.LintConstants.RESOURCE_CLZ_ID; -import static com.android.tools.lint.detector.api.LintConstants.RES_FOLDER; -import static com.android.tools.lint.detector.api.LintConstants.R_ATTR_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.R_CLASS; -import static com.android.tools.lint.detector.api.LintConstants.R_ID_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.R_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ARRAY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ITEM; -import static com.android.tools.lint.detector.api.LintConstants.TAG_PLURALS; -import static com.android.tools.lint.detector.api.LintConstants.TAG_RESOURCES; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STRING_ARRAY; -import static com.android.tools.lint.detector.api.LintConstants.TAG_STYLE; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_REF_PREFIX; +import static com.android.SdkConstants.DOT_GIF; +import static com.android.SdkConstants.DOT_JPG; +import static com.android.SdkConstants.DOT_PNG; +import static com.android.SdkConstants.DOT_XML; +import static com.android.SdkConstants.RESOURCE_CLR_STYLEABLE; +import static com.android.SdkConstants.RESOURCE_CLZ_ARRAY; +import static com.android.SdkConstants.RESOURCE_CLZ_ID; +import static com.android.SdkConstants.RES_FOLDER; +import static com.android.SdkConstants.R_ATTR_PREFIX; +import static com.android.SdkConstants.R_CLASS; +import static com.android.SdkConstants.R_ID_PREFIX; +import static com.android.SdkConstants.R_PREFIX; +import static com.android.SdkConstants.TAG_ARRAY; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.TAG_PLURALS; +import static com.android.SdkConstants.TAG_RESOURCES; +import static com.android.SdkConstants.TAG_STRING_ARRAY; +import static com.android.SdkConstants.TAG_STYLE; import static com.android.tools.lint.detector.api.LintUtils.endsWith; import com.android.annotations.NonNull; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UseCompoundDrawableDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/UseCompoundDrawableDetector.java index e2923b0..289806f 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UseCompoundDrawableDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/UseCompoundDrawableDetector.java @@ -16,13 +16,13 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_BACKGROUND; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_WEIGHT; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_SCALE_TYPE; -import static com.android.tools.lint.detector.api.LintConstants.IMAGE_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.LINEAR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.TEXT_VIEW; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_BACKGROUND; +import static com.android.SdkConstants.ATTR_LAYOUT_WEIGHT; +import static com.android.SdkConstants.ATTR_SCALE_TYPE; +import static com.android.SdkConstants.IMAGE_VIEW; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.TEXT_VIEW; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UselessViewDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/UselessViewDetector.java index b913588..c75cb93 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/UselessViewDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/UselessViewDetector.java @@ -16,22 +16,22 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ABSOLUTE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_BACKGROUND; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ID; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_STYLE; -import static com.android.tools.lint.detector.api.LintConstants.FRAME_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.GRID_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.GRID_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.HORIZONTAL_SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.LINEAR_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.MERGE; -import static com.android.tools.lint.detector.api.LintConstants.RADIO_GROUP; -import static com.android.tools.lint.detector.api.LintConstants.RELATIVE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.SCROLL_VIEW; -import static com.android.tools.lint.detector.api.LintConstants.TABLE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.TABLE_ROW; +import static com.android.SdkConstants.ABSOLUTE_LAYOUT; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_BACKGROUND; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_STYLE; +import static com.android.SdkConstants.FRAME_LAYOUT; +import static com.android.SdkConstants.GRID_LAYOUT; +import static com.android.SdkConstants.GRID_VIEW; +import static com.android.SdkConstants.HORIZONTAL_SCROLL_VIEW; +import static com.android.SdkConstants.LINEAR_LAYOUT; +import static com.android.SdkConstants.VIEW_MERGE; +import static com.android.SdkConstants.RADIO_GROUP; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.SCROLL_VIEW; +import static com.android.SdkConstants.TABLE_LAYOUT; +import static com.android.SdkConstants.TABLE_ROW; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; @@ -158,7 +158,7 @@ public class UselessViewDetector extends LayoutDetector { Element parent = (Element) parentNode; String parentTag = parent.getTagName(); if (parentTag.equals(SCROLL_VIEW) || parentTag.equals(HORIZONTAL_SCROLL_VIEW) || - parentTag.equals(MERGE)) { + parentTag.equals(VIEW_MERGE)) { // Can't remove if the parent is a scroll view or a merge return; } diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewConstructorDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewConstructorDetector.java index a532ced..1c276ed 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewConstructorDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewConstructorDetector.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.CONSTRUCTOR_NAME; +import static com.android.SdkConstants.CONSTRUCTOR_NAME; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTypeDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTypeDetector.java index 30def17..61498f4 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTypeDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/ViewTypeDetector.java @@ -16,12 +16,12 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_CLASS; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ID; -import static com.android.tools.lint.detector.api.LintConstants.DOT_JAVA; -import static com.android.tools.lint.detector.api.LintConstants.ID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.NEW_ID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.VIEW_TAG; +import static com.android.SdkConstants.ATTR_CLASS; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.DOT_JAVA; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.VIEW_TAG; import com.android.annotations.NonNull; import com.android.annotations.Nullable; @@ -106,10 +106,10 @@ public class ViewTypeDetector extends ResourceXmlDetector implements Detector.Ja String view = attribute.getOwnerElement().getTagName(); String value = attribute.getValue(); String id = null; - if (value.startsWith(ID_RESOURCE_PREFIX)) { - id = value.substring(ID_RESOURCE_PREFIX.length()); - } else if (value.startsWith(NEW_ID_RESOURCE_PREFIX)) { - id = value.substring(NEW_ID_RESOURCE_PREFIX.length()); + if (value.startsWith(ID_PREFIX)) { + id = value.substring(ID_PREFIX.length()); + } else if (value.startsWith(NEW_ID_PREFIX)) { + id = value.substring(NEW_ID_PREFIX.length()); } // else: could be @android id if (id != null) { diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WakelockDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WakelockDetector.java index 066575a..ccf8d73 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WakelockDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WakelockDetector.java @@ -15,7 +15,7 @@ */ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_APP_ACTIVITY; +import static com.android.SdkConstants.ANDROID_APP_ACTIVITY; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java index 8003843..3f8afb6 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongIdDetector.java @@ -16,16 +16,16 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.ANDROID_URI; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_ID; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_LAYOUT_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_NAME; -import static com.android.tools.lint.detector.api.LintConstants.ATTR_TYPE; -import static com.android.tools.lint.detector.api.LintConstants.ID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.NEW_ID_RESOURCE_PREFIX; -import static com.android.tools.lint.detector.api.LintConstants.RELATIVE_LAYOUT; -import static com.android.tools.lint.detector.api.LintConstants.TAG_ITEM; -import static com.android.tools.lint.detector.api.LintConstants.VALUE_ID; +import static com.android.SdkConstants.ANDROID_URI; +import static com.android.SdkConstants.ATTR_ID; +import static com.android.SdkConstants.ATTR_LAYOUT_RESOURCE_PREFIX; +import static com.android.SdkConstants.ATTR_NAME; +import static com.android.SdkConstants.ATTR_TYPE; +import static com.android.SdkConstants.ID_PREFIX; +import static com.android.SdkConstants.NEW_ID_PREFIX; +import static com.android.SdkConstants.RELATIVE_LAYOUT; +import static com.android.SdkConstants.TAG_ITEM; +import static com.android.SdkConstants.VALUE_ID; import static com.android.tools.lint.detector.api.LintUtils.stripIdPrefix; import com.android.annotations.NonNull; @@ -168,10 +168,10 @@ public class WrongIdDetector extends LayoutDetector { for (int i = 0, n = attributes.getLength(); i < n; i++) { Attr attr = (Attr) attributes.item(i); String value = attr.getValue(); - if ((value.startsWith(NEW_ID_RESOURCE_PREFIX) || - value.startsWith(ID_RESOURCE_PREFIX)) + if ((value.startsWith(NEW_ID_PREFIX) || + value.startsWith(ID_PREFIX)) && ANDROID_URI.equals(attr.getNamespaceURI()) - && attr.getLocalName().startsWith(ATTR_LAYOUT_PREFIX)) { + && attr.getLocalName().startsWith(ATTR_LAYOUT_RESOURCE_PREFIX)) { if (!idDefined(mFileIds, value)) { // Stash a reference to this id and location such that // we can check after the *whole* layout has been processed, @@ -273,7 +273,7 @@ public class WrongIdDetector extends LayoutDetector { if (mDeclaredIds == null) { mDeclaredIds = Sets.newHashSet(); } - mDeclaredIds.add(ID_RESOURCE_PREFIX + name); + mDeclaredIds.add(ID_PREFIX + name); } } } @@ -293,12 +293,12 @@ public class WrongIdDetector extends LayoutDetector { } boolean definedLocally = ids.contains(id); if (!definedLocally) { - if (id.startsWith(NEW_ID_RESOURCE_PREFIX)) { - definedLocally = ids.contains(ID_RESOURCE_PREFIX + - id.substring(NEW_ID_RESOURCE_PREFIX.length())); - } else if (id.startsWith(ID_RESOURCE_PREFIX)) { - definedLocally = ids.contains(NEW_ID_RESOURCE_PREFIX + - id.substring(ID_RESOURCE_PREFIX.length())); + if (id.startsWith(NEW_ID_PREFIX)) { + definedLocally = ids.contains(ID_PREFIX + + id.substring(NEW_ID_PREFIX.length())); + } else if (id.startsWith(ID_PREFIX)) { + definedLocally = ids.contains(NEW_ID_PREFIX + + id.substring(ID_PREFIX.length())); } } diff --git a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongLocationDetector.java b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongLocationDetector.java index 39ffe1f..09011cc 100644 --- a/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongLocationDetector.java +++ b/lint/libs/lint_checks/src/com/android/tools/lint/checks/WrongLocationDetector.java @@ -16,7 +16,7 @@ package com.android.tools.lint.checks; -import static com.android.tools.lint.detector.api.LintConstants.TAG_RESOURCES; +import static com.android.SdkConstants.TAG_RESOURCES; import com.android.annotations.NonNull; import com.android.tools.lint.detector.api.Category; diff --git a/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/IssueTest.java b/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/IssueTest.java index 740e921..eba5fd3 100644 --- a/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/IssueTest.java +++ b/lint/libs/lint_checks/tests/src/com/android/tools/lint/detector/api/IssueTest.java @@ -16,7 +16,7 @@ package com.android.tools.lint.detector.api; import static com.android.tools.lint.detector.api.Issue.convertMarkup; -import static com.android.tools.lint.detector.api.LintConstants.AUTO_URI; +import static com.android.SdkConstants.AUTO_URI; import junit.framework.TestCase; @SuppressWarnings("javadoc") diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java index 8bc5d91..fee9472 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java @@ -16,7 +16,6 @@ package com.android.sdklib.internal.project; -import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.io.FileWrapper; import com.android.io.FolderWrapper; @@ -338,11 +337,11 @@ public class ProjectCreator { if (isTestProject == false) { /* Make res files only for non test projects */ - File valueFolder = createDirs(resourceFolder, AndroidConstants.FD_RES_VALUES); + File valueFolder = createDirs(resourceFolder, SdkConstants.FD_RES_VALUES); installTargetTemplate("strings.template", new File(valueFolder, "strings.xml"), keywords, target); - File layoutFolder = createDirs(resourceFolder, AndroidConstants.FD_RES_LAYOUT); + File layoutFolder = createDirs(resourceFolder, SdkConstants.FD_RES_LAYOUT); installTargetTemplate("layout.template", new File(layoutFolder, "main.xml"), keywords, target); |