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

am c5aa905a: Merge "IllegalStateException fixed in print service settings"

Browse Source 
* commit 'c5aa905a31e48fdeb52a8591ebb018ff161d57ad':
  IllegalStateException fixed in print service settings
This commit is contained in:
Fabrice Di Meglio
2014-11-25 23:23:16 +00:00
committed by Android Git Automerger
parent 9fc6bf3f37 c5aa905a31
commit d5a4dae8d8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
private boolean mServiceEnabled; private boolean mServiceEnabled;
private SearchView mSearchView;
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@@ -148,6 +150,9 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
@Override @Override
public void onPause() { public void onPause() {
mSettingsContentObserver.unregister(getContentResolver()); mSettingsContentObserver.unregister(getContentResolver());
if (mSearchView != null) {
mSearchView.setOnQueryTextListener(null);
}
super.onPause(); super.onPause();
} }
@@ -408,8 +413,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
MenuItem searchItem = menu.findItem(R.id.print_menu_item_search); MenuItem searchItem = menu.findItem(R.id.print_menu_item_search);
if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) { if (mServiceEnabled && mPrintersAdapter.getUnfilteredCount() > 0) {
SearchView searchView = (SearchView) searchItem.getActionView(); mSearchView = (SearchView) searchItem.getActionView();
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override @Override
public boolean onQueryTextSubmit(String query) { public boolean onQueryTextSubmit(String query) {
return true; return true;
@@ -421,7 +426,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
return true; return true;
} }
}); });
searchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { mSearchView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
@Override @Override
public void onViewAttachedToWindow(View view) { public void onViewAttachedToWindow(View view) {
if (AccessibilityManager.getInstance(getActivity()).isEnabled()) { if (AccessibilityManager.getInstance(getActivity()).isEnabled()) {