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

Merge "Revert "Expand all preferences when launch from search.""

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-13 20:40:55 +00:00
committed by Android (Google) Code Review
parent 2ed7c17d41 9ce35ad023
commit 8ab5410801
2 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -150,8 +150,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
}
// Prepare help url and enable menu if necessary
final Bundle arguments = getArguments();
final int helpResource;
Bundle arguments = getArguments();
int helpResource;
if (arguments != null && arguments.containsKey(HELP_URI_RESOURCE_KEY)) {
helpResource = arguments.getInt(HELP_URI_RESOURCE_KEY);
} else {
@@ -160,14 +160,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
if (helpResource != 0) {
mHelpUri = getResources().getString(helpResource);
}
// Check if we should keep the preferences expanded.
if (arguments != null) {
mPreferenceKey = arguments.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
if (!TextUtils.isEmpty(mPreferenceKey)) {
getPreferenceScreen().setInitialExpandedChildrenCount(Integer.MAX_VALUE);
}
}
}
@Override
@@ -232,7 +224,9 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
public void onResume() {
super.onResume();
if (mPreferenceKey != null) {
final Bundle args = getArguments();
if (args != null) {
mPreferenceKey = args.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
highlightPreferenceIfNeeded();
}
}