1 files changed, 15 insertions, 5 deletions
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
index d3142f1..98c28f6 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/SystemBarHelperTest.java
@@ -16,6 +16,8 @@
 
 package com.android.setupwizardlib.test;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 
 import android.annotation.SuppressLint;
@@ -194,11 +196,15 @@ public class SystemBarHelperTest {
     @UiThreadTest
     @Test
     public void testSetBackButtonVisibleTrue() {
-        final Window window = createWindowWithSystemUiVisibility(0x456);
+        final Window window = createWindowWithSystemUiVisibility(STATUS_BAR_DISABLE_BACK | 0x456);
         SystemBarHelper.setBackButtonVisible(window, true);
         if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
-            assertEquals("View visibility should be 0x456", 0x456,
-                    window.getAttributes().systemUiVisibility);
+            assertThat(window.getAttributes().systemUiVisibility)
+                    .named("window sysUiVisibility")
+                    .isEqualTo(0x456);
+            assertThat(window.getDecorView().getSystemUiVisibility())
+                    .named("decor view sysUiVisibility")
+                    .isEqualTo(0x456);
         }
     }
 
@@ -208,8 +214,12 @@ public class SystemBarHelperTest {
         final Window window = createWindowWithSystemUiVisibility(0x456);
         SystemBarHelper.setBackButtonVisible(window, false);
         if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
-            assertEquals("STATUS_BAR_DISABLE_BACK should be added to systemUiVisibility",
-                    0x456 | STATUS_BAR_DISABLE_BACK, window.getAttributes().systemUiVisibility);
+            assertThat(window.getAttributes().systemUiVisibility)
+                    .named("window sysUiVisibility")
+                    .isEqualTo(0x456 | STATUS_BAR_DISABLE_BACK);
+            assertThat(window.getDecorView().getSystemUiVisibility())
+                    .named("decor view sysUiVisibility")
+                    .isEqualTo(0x456 | STATUS_BAR_DISABLE_BACK);
         }
     }