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

Merge "Fix bug #13794200 Settings crash when screen is locked and Power Usage... ...Settings is launched with an Intent"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-04-03 23:45:54 +00:00
committed by Android (Google) Code Review
parent d2693a82ad d6985df419
commit 04a09d519e
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/SettingsActivity.java
View File

@@ -185,6 +185,8 @@ public class SettingsActivity extends Activity
private static final String EXTRA_UI_OPTIONS = "settings:ui_options";
private static final String EMPTY_QUERY = "";
private static boolean sShowNoHomeNotice = false;
private String mFragmentClass;
@@ -577,8 +579,17 @@ public class SettingsActivity extends Activity
}
}
}
outState.putBoolean(SAVE_KEY_SEARCH_MENU_EXPANDED, mSearchMenuItem.isActionViewExpanded());
outState.putString(SAVE_KEY_SEARCH_QUERY, mSearchView.getQuery().toString());
// The option menus are created if the ActionBar is visible and they are also created
// asynchronously. If you launch Settings with an Intent action like
// android.intent.action.POWER_USAGE_SUMMARY and at the same time your device is locked
// thru a LockScreen, onCreateOptionsMenu() is not yet called and references to the search
// menu item and search view are null.
boolean isExpanded = (mSearchMenuItem != null) && mSearchMenuItem.isActionViewExpanded();
outState.putBoolean(SAVE_KEY_SEARCH_MENU_EXPANDED, isExpanded);
String query = (mSearchView != null) ? mSearchView.getQuery().toString() : EMPTY_QUERY;
outState.putString(SAVE_KEY_SEARCH_QUERY, query);
}
@Override