diff options
| author | Xavier Ducrohet <xav@google.com> | 2010-02-24 10:54:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-24 10:54:00 -0800 |
| commit | be896a9b2e8dfb3bac6b270ff6e2388d1cb53d25 (patch) | |
| tree | f941b551c0357aa6a5c7f88be5a498171684d133 /tools | |
| parent | b9e5cc3c3a6f1d6421a7c4b2c0aa63beebfd1ebc (diff) | |
| parent | bc3323bea64bbeab0edd0df5e344d844a8d89509 (diff) | |
| download | frameworks_base-be896a9b2e8dfb3bac6b270ff6e2388d1cb53d25.zip frameworks_base-be896a9b2e8dfb3bac6b270ff6e2388d1cb53d25.tar.gz frameworks_base-be896a9b2e8dfb3bac6b270ff6e2388d1cb53d25.tar.bz2 | |
Merge "Fix the layoutlib to still support fill_parent."
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java | 2 | ||||
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java index 73a3986..744bfbe 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeContext.java @@ -927,6 +927,7 @@ public final class BridgeContext extends Context { return null; } + @Override public File getExternalCacheDir() { // TODO Auto-generated method stub return null; @@ -964,6 +965,7 @@ public final class BridgeContext extends Context { return null; } + @Override public File getExternalFilesDir(String type) { // TODO Auto-generated method stub return null; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java index efd222e..6a98780 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java @@ -392,7 +392,8 @@ public final class BridgeTypedArray extends TypedArray { if (s == null) { return defValue; - } else if (s.equals(BridgeConstants.MATCH_PARENT)) { + } else if (s.equals(BridgeConstants.MATCH_PARENT) || + s.equals(BridgeConstants.FILL_PARENT)) { return LayoutParams.MATCH_PARENT; } else if (s.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; @@ -460,7 +461,8 @@ public final class BridgeTypedArray extends TypedArray { if (s == null) { return defValue; - } else if (s.equals(BridgeConstants.MATCH_PARENT)) { + } else if (s.equals(BridgeConstants.MATCH_PARENT) || + s.equals(BridgeConstants.FILL_PARENT)) { return LayoutParams.MATCH_PARENT; } else if (s.equals(BridgeConstants.WRAP_CONTENT)) { return LayoutParams.WRAP_CONTENT; |