Fix bug #5382767 android.view.cts.ViewTest#testInitializeScrollbarsAndFadingEdge fails on IRK89 mysid-userdebug

- CTS tests broken when disabling ICS fadding edges
see: https://android-git.corp.google.com/g/#/c/134291/

Change-Id: I3851a3053cda33bfee8f83957babc1633faa9a27
diff --git a/tests/res/layout/view_layout.xml b/tests/res/layout/view_layout.xml
index 3cc1d64..4443ba8 100644
--- a/tests/res/layout/view_layout.xml
+++ b/tests/res/layout/view_layout.xml
@@ -36,6 +36,14 @@
         android:fadingEdge="horizontal|vertical"
         android:fadingEdgeLength="20px"/>
 
+    <android.view.cts.MockView
+        android:id="@+id/scroll_view_2"
+        android:layout_width="100px"
+        android:layout_height="200px"
+        android:scrollbars="horizontal|vertical"
+        android:requiresFadingEdge="horizontal|vertical"
+        android:fadingEdgeLength="20px"/>
+
     <View
         android:id="@+id/fit_windows"
         android:fitsSystemWindows="true"
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index 72a6f0d..be60976 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -4204,6 +4204,13 @@
     })
     public void testInitializeScrollbarsAndFadingEdge() {
         MockView view = (MockView) mActivity.findViewById(R.id.scroll_view);
+
+        assertTrue(view.isHorizontalScrollBarEnabled());
+        assertTrue(view.isVerticalScrollBarEnabled());
+        assertFalse(view.isHorizontalFadingEdgeEnabled());
+        assertFalse(view.isVerticalFadingEdgeEnabled());
+
+        view = (MockView) mActivity.findViewById(R.id.scroll_view_2);
         final int fadingEdgeLength = 20;
 
         assertTrue(view.isHorizontalScrollBarEnabled());