commit 5fa865bb56374eda8fb2aac34d0f02107ddb3bc2
author Vinod Krishnan <vinodkrishnan@google.com> Wed May 21 10:28:20 2014 -0700
committer Vinod Krishnan <vinodkrishnan@google.com> Wed May 21 10:30:25 2014 -0700
tree 861930d14c37c3872881c6dbe21353cb43e99103
parent 54302b4ee0e0b78a1f9f9ccf1cc2e50d4ffb60fc

DeviceDefault Theme CTS Watch tests

Bug: 15091518
Change-Id: If860c62e09e4ced9f310fc0f363708f263c8556b

tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java

diff --git a/tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java b/tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java
index 086dce1..77de0b4 100644
--- a/tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java
+++ b/tests/tests/theme/src/android/theme/cts/DeviceDefaultTest.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -85,7 +86,7 @@
     }
 
     public void testGetActionBar_DeviceDefault_Light_DialogWhenLarge() {
-        assertActionBarWhenLarge(android.R.style.Theme_Holo_Light_DialogWhenLarge);
+        assertActionBarWhenLarge(android.R.style.Theme_DeviceDefault_Light_DialogWhenLarge);
     }
 
     public void testGetActionBar_DeviceDefault_Light_DialogWhenLarge_NoActionBar() {
@@ -122,6 +123,10 @@
 
     private void assertGetActionBar(int themeId, boolean actionBar) {
         Activity activity = startActivity(themeId);
+        if (activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+            assertNull(activity.getActionBar());
+            return;
+        }
         if (actionBar) {
             assertNotNull(activity.getActionBar());
         } else {