Merge "Centralize the automatic storage manager on check." (49c8080a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.text.format.Formatter;

		import com.android.settings.R;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.Utils;
		import com.android.settingslib.core.AbstractPreferenceController;

		/**
		@@ -57,7 +58,7 @@ public class AutomaticStorageManagerDescriptionPreferenceController
		cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED, 0);
		long lastRunMillis =
		Settings.Secure.getLong(cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN, 0);
		if (freedBytes == 0 \|\| lastRunMillis == 0 \|\| !isStorageManagerEnabled(cr)) {
		if (freedBytes == 0 \|\| lastRunMillis == 0 \|\| !Utils.isStorageManagerEnabled(context)) {
		preference.setSummary(R.string.automatic_storage_manager_text);
		} else {
		preference.setSummary(
		@@ -68,9 +69,4 @@ public class AutomaticStorageManagerDescriptionPreferenceController
		context, lastRunMillis, DateUtils.FORMAT_SHOW_DATE)));
		}
		}

		private boolean isStorageManagerEnabled(ContentResolver cr) {
		return Settings.Secure.getInt(cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0)
		!= 0;
		}
		}

+2 −8

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment
		@Override
		public void onResume() {
		super.onResume();
		mDaysToRetain.setEnabled(isStorageManagerEnabled());
		mDaysToRetain.setEnabled(Utils.isStorageManagerEnabled(getContext()));
		}

		@Override
		@@ -153,12 +153,6 @@ public class AutomaticStorageManagerSettings extends DashboardFragment
		return indices.length - 1;
		}

		private boolean isStorageManagerEnabled() {
		return Settings.Secure.getInt(
		getContentResolver(), Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0)
		!= 0;
		}

		private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		controllers.add(new AutomaticStorageManagerDescriptionPreferenceController(context));

+2 −7

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.util.Preconditions;
		import com.android.settings.widget.SwitchBar;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.Utils;

		/** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */
		public class AutomaticStorageManagerSwitchBarController
		@@ -56,13 +57,7 @@ public class AutomaticStorageManagerSwitchBarController
		}

		private void initializeCheckedStatus() {
		boolean isStorageManagerChecked =
		Settings.Secure.getInt(
		mContext.getContentResolver(),
		Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
		0)
		!= 0;
		mSwitchBar.setChecked(isStorageManagerChecked);
		mSwitchBar.setChecked(Utils.isStorageManagerEnabled(mContext));
		mSwitchBar.addOnSwitchChangeListener(this);
		}

+7 −7

Original line number	Diff line number	Diff line
		@@ -23,12 +23,14 @@ import android.os.SystemProperties;
		import android.provider.Settings;
		import android.support.annotation.VisibleForTesting;
		import android.support.v7.preference.PreferenceScreen;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.deletionhelper.ActivationWarningFragment;
		import com.android.settings.widget.MasterSwitchController;
		import com.android.settings.widget.MasterSwitchPreference;
		import com.android.settings.widget.SwitchWidgetController;
		import com.android.settingslib.Utils;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		@@ -74,9 +76,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
		if (!isAvailable()) {
		return;
		}
		boolean isStorageManagerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;
		mSwitch.setChecked(isStorageManagerEnabled);
		mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));

		if (mSwitch != null) {
		mSwitchController = new MasterSwitchController(mSwitch);