From 9faec5600b48161adbd211ab47a9d91db0f0b4b1 Mon Sep 17 00:00:00 2001
From: Noah Wang <nfw@google.com>
Date: Sat, 9 Apr 2016 23:24:47 -0700
Subject: [PATCH] Fix content description and accessibility focus on
 PreviewSeekBarPreferenceFragment. Bug: 27911511

Change-Id: I45673e582a29028cb0598669b0fa1a48c071181d
---
 res/layout/preview_seek_bar_view_pager.xml        | 2 +-
 res/layout/screen_zoom_preview_1.xml              | 6 +++---
 src/com/android/settings/PreviewPagerAdapter.java | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/res/layout/preview_seek_bar_view_pager.xml b/res/layout/preview_seek_bar_view_pager.xml
index 66b492c7fe7..e24b674e4f8 100644
--- a/res/layout/preview_seek_bar_view_pager.xml
+++ b/res/layout/preview_seek_bar_view_pager.xml
@@ -39,6 +39,6 @@
         android:text="@string/screen_zoom_preview_title"
         android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"
         android:textColor="@color/seek_bar_preference_preview_text"
-        android:accessibilityTraversalBefore="@id/preview_pager"/>
+        android:importantForAccessibility="no" />
 </LinearLayout>
 
diff --git a/res/layout/screen_zoom_preview_1.xml b/res/layout/screen_zoom_preview_1.xml
index 42800916d89..b7d2d1533db 100644
--- a/res/layout/screen_zoom_preview_1.xml
+++ b/res/layout/screen_zoom_preview_1.xml
@@ -17,7 +17,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true" >
+    android:fillViewport="true"
+    android:importantForAccessibility="noHideDescendants">
 
     <view class="com.android.settings.TouchBlockingFrameLayout"
         android:id="@+id/frame"
@@ -31,8 +32,7 @@
             android:paddingTop="@dimen/conversation_message_list_padding"
             android:paddingStart="@dimen/conversation_message_list_padding"
             android:paddingEnd="@dimen/conversation_message_list_padding"
-            android:orientation="vertical"
-            android:importantForAccessibility="noHideDescendants">
+            android:orientation="vertical">
 
             <com.android.settings.display.ConversationMessageView
                 android:layout_width="match_parent"
diff --git a/src/com/android/settings/PreviewPagerAdapter.java b/src/com/android/settings/PreviewPagerAdapter.java
index 485ac8f7ada..6425661c27c 100644
--- a/src/com/android/settings/PreviewPagerAdapter.java
+++ b/src/com/android/settings/PreviewPagerAdapter.java
@@ -54,9 +54,6 @@ public class PreviewPagerAdapter extends PagerAdapter {
             mPreviewFrames[i].setLayoutParams(new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT,
                     LinearLayout.LayoutParams.MATCH_PARENT));
-            mPreviewFrames[i].setContentDescription(
-                    context.getString(R.string.preview_page_indicator_content_description, i + 1,
-                            previewSampleResIds.length));
 
             for (Configuration configuration : configurations) {
                 // Create a new configuration for the specified value. It won't