Merge "Restore state when activity is destroyed" (826ee4d3) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+27 −12

Original line number	Diff line number	Diff line
		@@ -154,6 +154,13 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		mSwitchBarController = new DevelopmentSwitchBarController(
		this /* DevelopmentSettings */, mSwitchBar, mIsAvailable, getLifecycle());
		mSwitchBar.show();

		// Restore UI state based on whether developer options is enabled
		if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext())) {
		enableDeveloperOptions();
		} else {
		disableDeveloperOptions();
		}
		}

		@Override
		@@ -197,17 +204,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		if (isChecked) {
		EnableDevelopmentSettingWarningDialog.show(this /* host */);
		} else {
		DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false);
		final SystemPropPoker poker = SystemPropPoker.getInstance();
		poker.blockPokes();
		for (AbstractPreferenceController controller : mPreferenceControllers) {
		if (controller instanceof DeveloperOptionsPreferenceController) {
		((DeveloperOptionsPreferenceController) controller)
		.onDeveloperOptionsDisabled();
		}
		}
		poker.unblockPokes();
		poker.poke();
		disableDeveloperOptions();
		}
		}
		}
		@@ -318,7 +315,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		getActivity().unregisterReceiver(mBluetoothA2dpReceiver);
		}

		void onEnableDevelopmentOptionsConfirmed() {
		private void enableDeveloperOptions() {
		DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), true);
		for (AbstractPreferenceController controller : mPreferenceControllers) {
		if (controller instanceof DeveloperOptionsPreferenceController) {
		@@ -327,6 +324,24 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		}
		}

		private void disableDeveloperOptions() {
		DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false);
		final SystemPropPoker poker = SystemPropPoker.getInstance();
		poker.blockPokes();
		for (AbstractPreferenceController controller : mPreferenceControllers) {
		if (controller instanceof DeveloperOptionsPreferenceController) {
		((DeveloperOptionsPreferenceController) controller)
		.onDeveloperOptionsDisabled();
		}
		}
		poker.unblockPokes();
		poker.poke();
		}

		void onEnableDevelopmentOptionsConfirmed() {
		enableDeveloperOptions();
		}

		void onEnableDevelopmentOptionsRejected() {
		// Reset the toggle
		mSwitchBar.setChecked(false);