| commit | 89a68fdd1c0da56b5f1770f42a12713bf06fe994 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Thu Jun 07 15:52:41 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 07 15:52:41 2012 -0700 |
| tree | 4234f5a2ec8028a2208ebb157efba5d37b76101b | |
| parent | 436bb545ac93eabd994a4fbe814191585c3cc410 [diff] | |
| parent | 3b5d4ff2109de298c1eeba89cc8ff59951bdb0d0 [diff] |
Merge "Fixing a regression in the CTS tests due to a framework change." into jb-dev
diff --git a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java index 73883e2..5cac9f9 100644 --- a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java +++ b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
@@ -30,7 +30,7 @@ public class AccessibilityNodeInfoTest extends AndroidTestCase { /** The number of properties of the {@link AccessibilityNodeInfo} class. */ - private static final int NON_STATIC_FIELD_COUNT = 17; + private static final int NON_STATIC_FIELD_COUNT = 19; @SmallTest public void testMarshaling() throws Exception {
diff --git a/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml b/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml index bccb563..26f60bf 100644 --- a/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml +++ b/tests/tests/accessibilityservice/res/layout/accessibility_view_tree_reporting_test.xml
@@ -20,6 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" + android:importantForAccessibility="no" android:contentDescription="@string/firstLinearLayout" > <TextView @@ -48,6 +49,7 @@ android:id="@+id/secondFrameLayout" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:importantForAccessibility="no" android:contentDescription="@string/secondFrameLayout" > <LinearLayout