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 /lint/libs/lint_checks/src/com | |
| 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
Diffstat (limited to 'lint/libs/lint_checks/src/com')
50 files changed, 431 insertions, 431 deletions
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; |