diff options
| author | Tor Norbye <tnorbye@google.com> | 2010-12-09 15:35:21 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-12-09 15:35:21 -0800 |
| commit | b1be6238d45ee57214c25e0d80a03cf73161e6f8 (patch) | |
| tree | 106d2922fdded6e293f23f4d293512e54f370088 /eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java | |
| parent | eadfb94154126f670fa0ada62d36fec5f6188bd9 (diff) | |
| parent | fe3eebe57ba2925642cc1b257cb03ba617d298af (diff) | |
| download | sdk-b1be6238d45ee57214c25e0d80a03cf73161e6f8.zip sdk-b1be6238d45ee57214c25e0d80a03cf73161e6f8.tar.gz sdk-b1be6238d45ee57214c25e0d80a03cf73161e6f8.tar.bz2 | |
Merge "Issue 13051: Use match_parent or fill_parent based on API level"
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java index 822c1cb..e3c349a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/ScrollViewRule.java @@ -20,7 +20,6 @@ import static com.android.ide.common.layout.LayoutConstants.ANDROID_URI; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_HEIGHT; import static com.android.ide.common.layout.LayoutConstants.ATTR_LAYOUT_WIDTH; import static com.android.ide.common.layout.LayoutConstants.FQCN_LINEAR_LAYOUT; -import static com.android.ide.common.layout.LayoutConstants.VALUE_FILL_PARENT; import com.android.ide.common.api.INode; import com.android.ide.common.api.IViewRule; @@ -36,8 +35,9 @@ public class ScrollViewRule extends FrameLayoutRule { super.onChildInserted(child, parent, insertType); // The child of the ScrollView should fill in both directions - child.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, VALUE_FILL_PARENT); - child.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, VALUE_FILL_PARENT); + String fillParent = getFillParentValueName(); + child.setAttribute(ANDROID_URI, ATTR_LAYOUT_WIDTH, fillParent); + child.setAttribute(ANDROID_URI, ATTR_LAYOUT_HEIGHT, fillParent); } @Override |