aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Check for developer option on resuming settings activity." into sc-dev

Browse Source
This commit is contained in:
Jonathan Miranda
2021-02-26 19:06:32 +00:00
committed by Android (Google) Code Review
parent 1bfd24e13f 45cb6a8739
commit e1d06c5ccd
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/launcher3/settings/SettingsActivity.java
View File

@@ -129,6 +129,7 @@ public class SettingsActivity extends FragmentActivity
private String mHighLightKey;
private boolean mPreferenceHighlighted = false;
private NotificationDotsPreference mNotificationSettingsChangedListener;
private Preference mDeveloperOptionPref;
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -202,18 +203,37 @@ public class SettingsActivity extends FragmentActivity
return FeatureFlags.showFlagTogglerUi(getContext());
case DEVELOPER_OPTIONS_KEY:
// Show if plugins are enabled or flag UI is enabled.
return FeatureFlags.showFlagTogglerUi(getContext()) ||
PluginManagerWrapper.hasPlugins(getContext());
mDeveloperOptionPref = preference;
return updateDeveloperOption();
}
return true;
}
/**
* Show if plugins are enabled or flag UI is enabled.
* @return True if we should show the preference option.
*/
private boolean updateDeveloperOption() {
boolean showPreference = FeatureFlags.showFlagTogglerUi(getContext())
|| PluginManagerWrapper.hasPlugins(getContext());
if (mDeveloperOptionPref != null) {
mDeveloperOptionPref.setEnabled(showPreference);
if (showPreference) {
getPreferenceScreen().addPreference(mDeveloperOptionPref);
} else {
getPreferenceScreen().removePreference(mDeveloperOptionPref);
}
}
return showPreference;
}
@Override
public void onResume() {
super.onResume();
updateDeveloperOption();
if (isAdded() && !mPreferenceHighlighted) {
PreferenceHighlighter highlighter = createHighlighter();
if (highlighter != null) {