PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d9649d4e: am 31962228: Merge "Fix a crash in the print service settigns." into klp-dev

Browse Source 
* commit 'd9649d4e150130eef78a04c684007fe729f3206a':
  Fix a crash in the print service settigns.
This commit is contained in:
Svetoslav
2013-10-08 14:35:18 -07:00
committed by Android Git Automerger
parent 7e776ad76c d9649d4e15
commit 372cd6ab86
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/print/PrintServiceSettingsFragment.java
View File

@@ -53,6 +53,7 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -425,14 +426,20 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@Override @Override
public void onViewAttachedToWindow(View view) { public void onViewAttachedToWindow(View view) {
if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {
view.announceForAccessibility(getString( view.announceForAccessibility(getString(
R.string.print_search_box_shown_utterance)); R.string.print_search_box_shown_utterance));
} }
}
@Override @Override
public void onViewDetachedFromWindow(View view) { public void onViewDetachedFromWindow(View view) {
Activity activity = getActivity();
if (activity != null && !activity.isFinishing()
&& AccessibilityManager.getInstance(activity).isEnabled()) {
view.announceForAccessibility(getString( view.announceForAccessibility(getString(
R.string.print_search_box_hidden_utterance)); R.string.print_search_box_hidden_utterance));
} }
}
}); });
} else { } else {
menu.removeItem(R.id.print_menu_item_search); menu.removeItem(R.id.print_menu_item_search);