commit 74adc05436908125a9ead1da7be8ed0bda0d1df6
author Brian Muramatsu <btmura@google.com> Mon Aug 22 15:57:07 2011 -0700
committer Brian Muramatsu <btmura@google.com> Mon Aug 22 17:07:05 2011 -0700
tree fd98ff3a0e9113bfc8532e2a98c7bfeb88bda5ab
parent 7913616f4a8d5dde262b55763951750f65b5b6a8

Fix for TabHost_TabSpecTest

Bug 5198068

New design only shows the icon when no TextView label
is present.

Change-Id: Ie70a9690e985443b64281a8db673d6155dedecea

tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java b/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java
index 78a52ef..6a6b5b9 100644
--- a/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TabHost_TabSpecTest.java
@@ -100,7 +100,7 @@
 
         // normal value
         Drawable d = new ColorDrawable(Color.GRAY);
-        tabSpec.setIndicator(TAG_TAB2, d);
+        tabSpec.setIndicator("", d);
         tabSpec.setContent(new MockTabContentFactoryText());
         mTabHost.addTab(tabSpec);
         mTabHost.setCurrentTab(1);
@@ -109,7 +109,7 @@
         int idIcon = com.android.internal.R.id.icon;
         TextView tvTitle = (TextView) currentTabView.findViewById(idTitle);
         ImageView ivIcon = ((ImageView) currentTabView.findViewById(idIcon));
-        assertEquals(TAG_TAB2, tvTitle.getText().toString());
+        assertEquals("", tvTitle.getText().toString());
         assertSame(d, ivIcon.getDrawable());
 
         // exceptional
@@ -134,6 +134,17 @@
         ivIcon = ((ImageView) currentTabView.findViewById(idIcon));
         assertEquals("", tvTitle.getText().toString());
         assertNull(ivIcon.getDrawable());
+
+        tabSpec = mTabHost.newTabSpec("tab 5");
+        tabSpec.setIndicator("half cube", d);
+        tabSpec.setContent(new MockTabContentFactoryList());
+        mTabHost.addTab(tabSpec);
+        mTabHost.setCurrentTab(4);
+        currentTabView = mTabHost.getCurrentTabView();
+        tvTitle = (TextView) currentTabView.findViewById(idTitle);
+        ivIcon = ((ImageView) currentTabView.findViewById(idIcon));
+        assertEquals("half cube", tvTitle.getText().toString());
+        assertNull(ivIcon.getDrawable());
     }
 
     @TestTargetNew(