summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorJoe Onorato <joeo@google.com>2011-04-12 11:53:13 -0700
committerJoe Onorato <joeo@google.com>2011-05-04 14:08:11 -0700
commitc6cc0f8c19d9eccf408a443fa2bf668af261dcd0 (patch)
tree7d1aeea43ab965be44af5cf5e4f5c15546a1a757 /core/tests
parent325039ec5ca9edd5fa0b518bb831ae4e2aedfb5d (diff)
downloadframeworks_base-c6cc0f8c19d9eccf408a443fa2bf668af261dcd0.zip
frameworks_base-c6cc0f8c19d9eccf408a443fa2bf668af261dcd0.tar.gz
frameworks_base-c6cc0f8c19d9eccf408a443fa2bf668af261dcd0.tar.bz2
Rename ViewRoot to ViewAncestor.
ViewRoot is about to be a new public class for poking at ViewAncestor. Change-Id: Ie95d707c6d8bbb48f78d093d7b2667851812a7d5
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/coretests/src/android/widget/focus/RequestFocusTest.java2
-rw-r--r--core/tests/coretests/src/android/widget/listview/ListViewHeight.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java b/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java
index 477831e..909a8c9 100644
--- a/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java
+++ b/core/tests/coretests/src/android/widget/focus/RequestFocusTest.java
@@ -90,7 +90,7 @@ public class RequestFocusTest extends ActivityInstrumentationTestCase<RequestFoc
fail("requestFocus from wrong thread should raise exception.");
} catch (AndroidRuntimeException e) {
// Expected. The actual exception is not public, so we can't catch it.
- assertEquals("android.view.ViewRoot$CalledFromWrongThreadException",
+ assertEquals("android.view.ViewAncestor$CalledFromWrongThreadException",
e.getClass().getName());
}
}
diff --git a/core/tests/coretests/src/android/widget/listview/ListViewHeight.java b/core/tests/coretests/src/android/widget/listview/ListViewHeight.java
index 64f280a..5cf3ff6 100644
--- a/core/tests/coretests/src/android/widget/listview/ListViewHeight.java
+++ b/core/tests/coretests/src/android/widget/listview/ListViewHeight.java
@@ -88,7 +88,7 @@ public class ListViewHeight extends Activity {
// Clicking this button will remove the list adapter and hide the outer enclosing view.
// We have to climb all the way to the top because the bug (not checking visibility)
- // only occurs at the very outer loop of ViewRoot.performTraversals and in the case of
+ // only occurs at the very outer loop of ViewAncestor.performTraversals and in the case of
// an Activity, this means you have to crawl all the way out to the root view.
// In the search manager, it's sufficient to simply show/hide the outer search manager
// view to trigger the same bug.