commit 400e69ed65879bc9d57a94c434ee82045abbbc1c
author Evan Rosky <erosky@google.com> Thu Nov 09 19:27:04 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Nov 10 19:45:14 2017 +0000
tree fa198ab35c9fa5ef96977a6feb09bc8059c62664
parent c2572b2d9345e8216c2ff7c268d0b0ec5f208608

Revert "Test initial focus behavior"

This reverts commit 3ddbd06f88653089694dca05c673227b6f5b9204.

Reason for revert: Pushback from bundled apps

Bug: 68841055
Bug: 34520588
Change-Id: I4d4acfcf1c4714b2e8244228dbbe52dea52a6f53
(cherry picked from commit 3ae8059ea47c78869bc8aa1d0a8a4a7b726bf019)

tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java

diff --git a/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java b/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java
index 93444a8..ae780fb 100644
--- a/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java
+++ b/tests/tests/view/src/android/view/cts/View_FocusHandlingTest.java
@@ -151,7 +151,7 @@
         v2.setVisibility(View.VISIBLE);
         v3.setVisibility(View.VISIBLE);
         v4.setVisibility(View.VISIBLE);
-        assertFalse(v1.isFocused());
+        assertEquals(true, v1.isFocused());
         assertFalse(v2.isFocused());
         assertFalse(v3.isFocused());
         assertFalse(v4.isFocused());
@@ -273,6 +273,10 @@
         assertFalse(v3.isFocused());
         assertFalse(v4.isFocused());
         assertFalse(parent.hasFocusable());
+
+        // a view enabled while nothing has focus should get focus.
+        for (View v : new View[]{v1, v2, v3, v4}) v.setEnabled(true);
+        assertEquals(true, v1.isFocused());
     }
 
     @UiThreadTest
@@ -392,29 +396,6 @@
         return new View[]{initial, first};
     }
 
-    @Test
-    public void testNoInitialFocus() throws Throwable {
-        Activity activity = mActivityRule.getActivity();
-        View[] result = getInitialAndFirstFocus(R.layout.focus_handling_focusables);
-        assertNull(result[0]);
-        assertSame(result[1], activity.findViewById(R.id.focusable1));
-    }
-
-    @Test
-    public void testDefaultFocus() throws Throwable {
-        Activity activity = mActivityRule.getActivity();
-        View[] result = getInitialAndFirstFocus(R.layout.focus_handling_default_focus);
-        assertNull(result[0]);
-        assertSame(result[1], activity.findViewById(R.id.focusable2));
-    }
-
-    @Test
-    public void testInitialFocus() throws Throwable {
-        Activity activity = mActivityRule.getActivity();
-        View[] result = getInitialAndFirstFocus(R.layout.focus_handling_initial_focus);
-        assertSame(result[0], activity.findViewById(R.id.focusable3));
-    }
-
     @UiThreadTest
     @Test
     public void testFocusAfterDescendantsTransfer() throws Throwable {