diff options
| author | Tor Norbye <tnorbye@google.com> | 2011-11-01 11:58:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-01 11:58:29 -0700 |
| commit | 433078ca950bddbec764071346e70ead5cfc3119 (patch) | |
| tree | a5fe6b583fd45ece1479b7e44eee0e1bd0948b0b | |
| parent | 42ce623240baf0aa2d1483bb25e08a9d80ec70a9 (diff) | |
| parent | dc379c29c3a1c9d41c372d2b2d8536d3fc7b2a2f (diff) | |
| download | sdk-433078ca950bddbec764071346e70ead5cfc3119.zip sdk-433078ca950bddbec764071346e70ead5cfc3119.tar.gz sdk-433078ca950bddbec764071346e70ead5cfc3119.tar.bz2 | |
Merge "Fix issue 21348: Don't set android: namespace on fragment class"
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java index abf47b8..4ba6990 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java @@ -17,6 +17,7 @@ package com.android.ide.common.layout; import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI; +import static com.android.ide.common.layout.LayoutConstants.ATTR_CLASS; import static com.android.ide.common.layout.LayoutConstants.ATTR_HINT; import static com.android.ide.common.layout.LayoutConstants.ATTR_ID; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; @@ -30,6 +31,7 @@ import static com.android.ide.common.layout.LayoutConstants.NEW_ID_PREFIX; import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; import static com.android.ide.common.layout.LayoutConstants.VALUE_MATCH_PARENT; import static com.android.ide.common.layout.LayoutConstants.VALUE_WRAP_CONTENT; +import static com.android.ide.eclipse.adt.internal.editors.layout.descriptors.LayoutDescriptors.VIEW_FRAGMENT; import com.android.ide.common.api.DropFeedback; import com.android.ide.common.api.IAttributeInfo; @@ -243,6 +245,10 @@ public class BaseViewRule implements IViewRule { if (isStyle) { uri = null; } + } else if (actionId.equals(ATTR_CLASS) && selectedNodes.size() >= 1 && + VIEW_FRAGMENT.equals(selectedNodes.get(0).getFqcn())) { + v = mRulesEngine.displayFragmentSourceInput(); + uri = null; } else { v = inputAttributeValue(firstNode, actionId); } |