Hide icon view if icon is null

To remove the extra margin when the icon is not used.

Test: ./gradlew connectedAndroidTest
Bug: 68826871
Change-Id: Ic23307a28b2829fdbe029c61f912f04bab90ca13

1 files changed, 11 insertions, 0 deletions

diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
index a1f2b54..0391392 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/template/IconMixinTest.java
@@ -31,6 +31,7 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Xml;
+import android.view.View;
 import android.widget.ImageView;
 
 import com.android.setupwizardlib.TemplateLayout;
@@ -74,6 +75,15 @@ public class IconMixinTest {
         mixin.setIcon(drawable);
 
         assertSame(drawable, mIconView.getDrawable());
+        assertEquals(View.VISIBLE, mIconView.getVisibility());
+    }
+
+    @Test
+    public void setIcon_shouldSetVisibilityToGone_whenIconIsNull() {
+        IconMixin mixin = new IconMixin(mTemplateLayout, null, 0);
+        mixin.setIcon(null);
+
+        assertEquals(View.GONE, mIconView.getVisibility());
     }
 
     @Test
@@ -101,5 +111,6 @@ public class IconMixinTest {
                 .getDrawable(android.R.drawable.ic_menu_add);
         final BitmapDrawable actual = (BitmapDrawable) mIconView.getDrawable();
         assertEquals(expected.getBitmap(), actual.getBitmap());
+        assertEquals(View.VISIBLE, mIconView.getVisibility());
     }
 }