Merge "Added accessibility tutorial-specific class name for instructions."

res/layout-sw600dp/accessibility_tutorial_container.xml

@@ -57,7 +57,8 @@
         <View
             style="@style/AccessibilityTutorialDivider" />
 
-        <TextView
+        <view
+            class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
             android:id="@+id/instructions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

res/layout/accessibility_tutorial_container.xml

@@ -47,7 +47,8 @@
             android:focusable="false"
             android:clickable="false" />
 
-        <TextView
+        <view
+            class="com.android.settings.AccessibilityTutorialActivity$TutorialTextView"
             android:id="@+id/instructions"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"

src/com/android/settings/AccessibilityTutorialActivity.java

@@ -27,6 +27,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.Settings;
+import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -661,4 +662,13 @@ public class AccessibilityTutorialActivity extends Activity {
             mFinish.setVisibility(visible ? VISIBLE : GONE);
         }
     }
+
+    /**
+     * Provides a tutorial-specific class name for fired accessibility events.
+     */
+    public static class TutorialTextView extends TextView {
+        public TutorialTextView(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+    }
 }