diff options
2 files changed, 2 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java index 3cb8ee0..787eda5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/grid/GridModel.java @@ -467,7 +467,7 @@ public class GridModel { } if (declaredRow < row) { // Must jump to the next column to accommodate the new column - assert nextColumn > row; + assert nextColumn > column; column = nextColumn; } row = declaredRow; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java index 49a4b01..15f4379 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java @@ -743,6 +743,7 @@ public class RulesEngine { ClassLoader classLoader; if (realFqcn.startsWith("android.") || //$NON-NLS-1$ realFqcn.equals(VIEW_MERGE) || + realFqcn.endsWith(".GridLayout") || //$NON-NLS-1$ // Temporary special case // FIXME: Remove this special case as soon as we pull // the MapViewRule out of this code base and bundle it // with the add ons @@ -763,7 +764,6 @@ public class RulesEngine { } ruleClassName = packageName + "." + //$NON-NLS-1$ baseName + "Rule"; //$NON-NLS-1$ - } else { // Initialize the user-classpath for 3rd party IViewRules, if necessary if (mUserClassLoader == null) { |