26501: Handle padding between image and text

The visual refactoring for converting a LinearLayout with a <TextView>
and an <ImageView> adjacent into a single <TextView> using a compound
drawable, needed to properly handle spacing between the two
widgets. This changeset updates it to convert margins between the
views into a single drawablePadding attribute.

Change-Id: Idb077e3324c279d41fdc0baa68008fe862d8181a

1 files changed, 1 insertions, 32 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java
index 638a384..cfccb70 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LinearLayoutRuleTest.java
@@ -16,13 +16,13 @@
 
 package com.android.ide.common.layout;
 
-import static com.android.util.XmlUtils.ANDROID_URI;
 import static com.android.ide.common.layout.LayoutConstants.ATTR_ID;
 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.ATTR_ORIENTATION;
 import static com.android.ide.common.layout.LayoutConstants.VALUE_HORIZONTAL;
 import static com.android.ide.common.layout.LayoutConstants.VALUE_VERTICAL;
+import static com.android.util.XmlUtils.ANDROID_URI;
 
 import com.android.ide.common.api.DropFeedback;
 import com.android.ide.common.api.IAttributeInfo.Format;
@@ -39,7 +39,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 /** Test the {@link LinearLayoutRule} */
 public class LinearLayoutRuleTest extends LayoutTestBase {
@@ -461,36 +460,6 @@ public class LinearLayoutRuleTest extends LayoutTestBase {
                 "useStyle(DROP_PREVIEW), drawRect(0,381,100,461)");
     }
 
-    public void testFormatFloatValue() throws Exception {
-        assertEquals("1", LinearLayoutRule.formatFloatAttribute(1.0f));
-        assertEquals("2", LinearLayoutRule.formatFloatAttribute(2.0f));
-        assertEquals("1.50", LinearLayoutRule.formatFloatAttribute(1.5f));
-        assertEquals("1.50", LinearLayoutRule.formatFloatAttribute(1.50f));
-        assertEquals("1.51", LinearLayoutRule.formatFloatAttribute(1.51f));
-        assertEquals("1.51", LinearLayoutRule.formatFloatAttribute(1.514542f));
-        assertEquals("1.52", LinearLayoutRule.formatFloatAttribute(1.516542f));
-        assertEquals("-1.51", LinearLayoutRule.formatFloatAttribute(-1.51f));
-        assertEquals("-1", LinearLayoutRule.formatFloatAttribute(-1f));
-    }
-
-    public void testFormatFloatValueLocale() throws Exception {
-        // Ensure that the layout float values aren't affected by
-        // locale settings, like using commas instead of of periods
-        Locale originalDefaultLocale = Locale.getDefault();
-
-        try {
-            Locale.setDefault(Locale.FRENCH);
-
-            // Ensure that this is a locale which uses a comma instead of a period:
-            assertEquals("5,24", String.format("%.2f", 5.236f));
-
-            // Ensure that the formatFloatAttribute is immune
-            assertEquals("1.50", LinearLayoutRule.formatFloatAttribute(1.5f));
-        } finally {
-            Locale.setDefault(originalDefaultLocale);
-        }
-    }
-
     // Left to test:
     // Check inserting at last pos with multiple children
     // Check inserting with no bounds rectangle for dragged element