Merge "Added accessibility tutorial-specific class name for instructions."
diff --git a/res/layout-sw600dp/accessibility_tutorial_container.xml b/res/layout-sw600dp/accessibility_tutorial_container.xml
index d649354..f5da706 100644
--- a/res/layout-sw600dp/accessibility_tutorial_container.xml
+++ b/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"
diff --git a/res/layout/accessibility_tutorial_container.xml b/res/layout/accessibility_tutorial_container.xml
index 4ee72f5..6566cff 100644
--- a/res/layout/accessibility_tutorial_container.xml
+++ b/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"
diff --git a/src/com/android/settings/AccessibilityTutorialActivity.java b/src/com/android/settings/AccessibilityTutorialActivity.java
index da8350c..5039970 100644
--- a/src/com/android/settings/AccessibilityTutorialActivity.java
+++ b/src/com/android/settings/AccessibilityTutorialActivity.java
@@ -27,6 +27,7 @@
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 @@
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);
+ }
+ }
}