resolved conflicts for merge of 372cd6ab to master

Change-Id: I9232fbe01926436e8ad5c6c7e63ce95fbe842ccb

1 files changed, 19 insertions, 0 deletions

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 242d00d..5b9182b 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -53,6 +53,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityManager;
 import android.widget.BaseAdapter;
 import android.widget.CompoundButton;
 import android.widget.Filter;
@@ -425,6 +426,24 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
                     return true;
                 }
             });
+            searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View view) {
+                    if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
+                        view.announceForAccessibility(getString(
+                                R.string.print_search_box_shown_utterance));
+                    }
+                }
+                @Override
+                public void onViewDetachedFromWindow(View view) {
+                    Activity activity = getActivity();
+                    if (activity != null && !activity.isFinishing()
+                            && AccessibilityManager.getInstance(activity).isEnabled()) {
+                        view.announceForAccessibility(getString(
+                                R.string.print_search_box_hidden_utterance));
+                    }
+                }
+            });
         } else {
             menu.removeItem(R.id.print_menu_item_search);
         }