Merge "Typo in ViewRootImpl"

Gilles Debunne · Android (Google) Code Review · commit 972b7d2c3bbb · 2011-10-20T15:35:20.000-07:00
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
@@ -287,7 +287,7 @@ class ResizedInfo {
 
     final AccessibilityManager mAccessibilityManager;
 
-    AccessibilityInteractionController mAccessibilityInteractionContrtoller;
+    AccessibilityInteractionController mAccessibilityInteractionController;
 
     AccessibilityInteractionConnectionManager mAccessibilityInteractionConnectionManager;
 
@@ -3526,10 +3526,10 @@ public AccessibilityInteractionController getAccessibilityInteractionController(
             throw new IllegalStateException("getAccessibilityInteractionController"
                     + " called when there is no mView");
         }
-        if (mAccessibilityInteractionContrtoller == null) {
-            mAccessibilityInteractionContrtoller = new AccessibilityInteractionController();
+        if (mAccessibilityInteractionController == null) {
+            mAccessibilityInteractionController = new AccessibilityInteractionController();
         }
-        return mAccessibilityInteractionContrtoller;
+        return mAccessibilityInteractionController;
     }
 
     private int relayoutWindow(WindowManager.LayoutParams params, int viewVisibility,

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ class ResizedInfo {`
`287`	`287`
`288`	`288`	`final AccessibilityManager mAccessibilityManager;`
`289`	`289`
`290`		`- AccessibilityInteractionController mAccessibilityInteractionContrtoller;`
	`290`	`+ AccessibilityInteractionController mAccessibilityInteractionController;`
`291`	`291`
`292`	`292`	`AccessibilityInteractionConnectionManager mAccessibilityInteractionConnectionManager;`
`293`	`293`
`@@ -3526,10 +3526,10 @@ public AccessibilityInteractionController getAccessibilityInteractionController(`
`3526`	`3526`	`throw new IllegalStateException("getAccessibilityInteractionController"`
`3527`	`3527`	`+ " called when there is no mView");`
`3528`	`3528`	`}`
`3529`		`- if (mAccessibilityInteractionContrtoller == null) {`
`3530`		`- mAccessibilityInteractionContrtoller = new AccessibilityInteractionController();`
	`3529`	`+ if (mAccessibilityInteractionController == null) {`
	`3530`	`+ mAccessibilityInteractionController = new AccessibilityInteractionController();`
`3531`	`3531`	`}`
`3532`		`- return mAccessibilityInteractionContrtoller;`
	`3532`	`+ return mAccessibilityInteractionController;`
`3533`	`3533`	`}`
`3534`	`3534`
`3535`	`3535`	`private int relayoutWindow(WindowManager.LayoutParams params, int viewVisibility,`