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 /sdkmanager | |
| 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 'sdkmanager')
| -rw-r--r-- | sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java | 5 |
1 files changed, 2 insertions, 3 deletions
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); |