diff options
author | Tor Norbye <tnorbye@google.com> | 2011-06-02 10:47:16 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-06-02 10:47:16 -0700 |
commit | deb260db08cc7e31d26fe543146b264fae714db8 (patch) | |
tree | 2c65b31e2605af4bd55cdb0ebe2e3515c58ea241 | |
parent | ff80c46a46aa72e96fd7c0f52e9f7713d1d9460e (diff) | |
parent | 69b0020ec932209343fb4b3e422fe8daf77232df (diff) | |
download | sdk-deb260db08cc7e31d26fe543146b264fae714db8.zip sdk-deb260db08cc7e31d26fe543146b264fae714db8.tar.gz sdk-deb260db08cc7e31d26fe543146b264fae714db8.tar.bz2 |
Merge "Simple code cleanup"
2 files changed, 26 insertions, 59 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java index ae82559..3f48847 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LayoutConstants.java @@ -77,26 +77,22 @@ public class LayoutConstants { public static final String ATTR_LAYOUT_MARGIN_TOP = "layout_marginTop"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_MARGIN_BOTTOM = "layout_marginBottom"; //$NON-NLS-1$ + // RelativeLayout layout params: public static final String ATTR_LAYOUT_ALIGN_LEFT = "layout_alignLeft"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_ALIGN_RIGHT = "layout_alignRight"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_ALIGN_TOP = "layout_alignTop"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_ALIGN_BOTTOM = "layout_alignBottom"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_PARENT_TOP = "layout_alignParentTop"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_ALIGN_PARENT_BOTTOM = "layout_alignParentBottom"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_ALIGN_PARENT_LEFT = "layout_alignParentLeft";//$NON-NLS-1$ public static final String ATTR_LAYOUT_ALIGN_PARENT_RIGHT = "layout_alignParentRight"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING = "layout_alignWithParentMissing"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_ALIGN_BASELINE = "layout_alignBaseline"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_CENTER_IN_PARENT = "layout_centerInParent"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_CENTER_VERTICAL = "layout_centerVertical"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_CENTER_HORIZONTAL = "layout_centerHorizontal"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_TO_RIGHT_OF = "layout_toRightOf"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_TO_LEFT_OF = "layout_toLeftOf"; //$NON-NLS-1$ - public static final String ATTR_LAYOUT_BELOW = "layout_below"; //$NON-NLS-1$ public static final String ATTR_LAYOUT_ABOVE = "layout_above"; //$NON-NLS-1$ @@ -110,25 +106,6 @@ public class LayoutConstants { public static final String VALUE_FALSE= "false"; //$NON-NLS-1$ public static final String VALUE_N_DP = "%ddp"; //$NON-NLS-1$ - public static final String VALUE_CENTER_VERTICAL = "centerVertical"; //$NON-NLS-1$ - public static final String VALUE_CENTER_IN_PARENT = "centerInParent"; //$NON-NLS-1$ - public static final String VALUE_CENTER_HORIZONTAL = "centerHorizontal"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_PARENT_RIGHT = "alignParentRight"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_PARENT_LEFT = "alignParentLeft"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_PARENT_BOTTOM = "alignParentBottom"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_PARENT_TOP = "alignParentTop"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_RIGHT = "alignRight"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_LEFT = "alignLeft"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_BOTTOM = "alignBottom"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_TOP = "alignTop"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_BASELINE = "alignBaseline"; //$NON-NLS-1$ - public static final String VAUE_TO_RIGHT_OF = "toRightOf"; //$NON-NLS-1$ - public static final String VALUE_TO_LEFT_OF = "toLeftOf"; //$NON-NLS-1$ - public static final String VALUE_BELOW = "below"; //$NON-NLS-1$ - public static final String VALUE_ABOVE = "above"; //$NON-NLS-1$ - public static final String VALUE_ALIGN_WITH_PARENT_MISSING = - "alignWithParentMissing"; //$NON-NLS-1$ - // Gravity values. These have the GRAVITY_ prefix in front of value because we already // have VALUE_CENTER_HORIZONTAL defined for layouts, and its definition conflicts // (centerHorizontal versus center_horizontal) diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java index 17f0f8b..5b3334e 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/RelativeLayoutRule.java @@ -28,6 +28,7 @@ import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PA import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_PARENT_TOP; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_RIGHT; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_TOP; +import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_BELOW; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_HORIZONTAL; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_IN_PARENT; @@ -35,24 +36,7 @@ import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_CENTER_V import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_PREFIX; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_LEFT_OF; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_TO_RIGHT_OF; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ABOVE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_BASELINE; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_LEFT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_PARENT_BOTTOM; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_PARENT_LEFT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_PARENT_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_PARENT_TOP; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_RIGHT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_TOP; -import static com.android.ide.common.layout.LayoutConstants.VALUE_ALIGN_WITH_PARENT_MISSING; -import static com.android.ide.common.layout.LayoutConstants.VALUE_BELOW; -import static com.android.ide.common.layout.LayoutConstants.VALUE_CENTER_HORIZONTAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_CENTER_IN_PARENT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_CENTER_VERTICAL; -import static com.android.ide.common.layout.LayoutConstants.VALUE_TO_LEFT_OF; import static com.android.ide.common.layout.LayoutConstants.VALUE_TRUE; -import static com.android.ide.common.layout.LayoutConstants.VAUE_TO_RIGHT_OF; import com.android.ide.common.api.DropFeedback; import com.android.ide.common.api.IDragElement; @@ -105,30 +89,36 @@ public class RelativeLayoutRule extends BaseLayoutRule { @Override public List<String> getSelectionHint(INode parentNode, INode childNode) { List<String> infos = new ArrayList<String>(18); - addAttr(VALUE_ABOVE, childNode, infos); - addAttr(VALUE_BELOW, childNode, infos); - addAttr(VALUE_TO_LEFT_OF, childNode, infos); - addAttr(VAUE_TO_RIGHT_OF, childNode, infos); - addAttr(VALUE_ALIGN_BASELINE, childNode, infos); - addAttr(VALUE_ALIGN_TOP, childNode, infos); - addAttr(VALUE_ALIGN_BOTTOM, childNode, infos); - addAttr(VALUE_ALIGN_LEFT, childNode, infos); - addAttr(VALUE_ALIGN_RIGHT, childNode, infos); - addAttr(VALUE_ALIGN_PARENT_TOP, childNode, infos); - addAttr(VALUE_ALIGN_PARENT_BOTTOM, childNode, infos); - addAttr(VALUE_ALIGN_PARENT_LEFT, childNode, infos); - addAttr(VALUE_ALIGN_PARENT_RIGHT, childNode, infos); - addAttr(VALUE_ALIGN_WITH_PARENT_MISSING, childNode, infos); - addAttr(VALUE_CENTER_HORIZONTAL, childNode, infos); - addAttr(VALUE_CENTER_IN_PARENT, childNode, infos); - addAttr(VALUE_CENTER_VERTICAL, childNode, infos); + addAttr(ATTR_LAYOUT_ABOVE, childNode, infos); + addAttr(ATTR_LAYOUT_BELOW, childNode, infos); + addAttr(ATTR_LAYOUT_TO_LEFT_OF, childNode, infos); + addAttr(ATTR_LAYOUT_TO_RIGHT_OF, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_BASELINE, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_TOP, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_BOTTOM, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_LEFT, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_RIGHT, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_PARENT_TOP, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_PARENT_BOTTOM, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_PARENT_LEFT, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_PARENT_RIGHT, childNode, infos); + addAttr(ATTR_LAYOUT_ALIGN_WITH_PARENT_MISSING, childNode, infos); + addAttr(ATTR_LAYOUT_CENTER_HORIZONTAL, childNode, infos); + addAttr(ATTR_LAYOUT_CENTER_IN_PARENT, childNode, infos); + addAttr(ATTR_LAYOUT_CENTER_VERTICAL, childNode, infos); return infos; } private void addAttr(String propertyName, INode childNode, List<String> infos) { - String a = childNode.getStringAttr(ANDROID_URI, ATTR_LAYOUT_PREFIX + propertyName); + String a = childNode.getStringAttr(ANDROID_URI, propertyName); if (a != null && a.length() > 0) { + // Display the layout parameters without the leading layout_ prefix + // and id references without the @+id/ prefix + if (propertyName.startsWith(ATTR_LAYOUT_PREFIX)) { + propertyName = propertyName.substring(ATTR_LAYOUT_PREFIX.length()); + } + a = stripIdPrefix(a); String s = propertyName + ": " + a; infos.add(s); } |