Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4fa807 authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Centralize the automatic storage manager on check. 

Bug: 70893105
Test: Existing tests pass.
Change-Id: I83fa0e1033eb530a02eca230d0dd79495cbcbc9d
parent 956dd945

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

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




import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.Utils;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.AbstractPreferenceController;





/**

/**
@@ -57,7 +58,7 @@ public class AutomaticStorageManagerDescriptionPreferenceController 
                        cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED, 0);

                        cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_BYTES_CLEARED, 0);

        long lastRunMillis =

        long lastRunMillis =

                Settings.Secure.getLong(cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_LAST_RUN, 0);

                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);

            preference.setSummary(R.string.automatic_storage_manager_text);

        } else {

        } else {

            preference.setSummary(

            preference.setSummary(
@@ -68,9 +69,4 @@ public class AutomaticStorageManagerDescriptionPreferenceController 
                                    context, lastRunMillis, DateUtils.FORMAT_SHOW_DATE)));

                                    context, lastRunMillis, DateUtils.FORMAT_SHOW_DATE)));

        }

        }

    }

    }



    private boolean isStorageManagerEnabled(ContentResolver cr) {

        return Settings.Secure.getInt(cr, Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0)

                != 0;

    }

}
 
}

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

+2 −8
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment 
    @Override

    @Override

    public void onResume() {

    public void onResume() {

        super.onResume();

        super.onResume();

        mDaysToRetain.setEnabled(isStorageManagerEnabled());

        mDaysToRetain.setEnabled(Utils.isStorageManagerEnabled(getContext()));

    }

    }





    @Override

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

        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) {

    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(new AutomaticStorageManagerDescriptionPreferenceController(context));

        controllers.add(new AutomaticStorageManagerDescriptionPreferenceController(context));

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

+2 −7
Original line number Original line 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.internal.util.Preconditions;

import com.android.settings.widget.SwitchBar;

import com.android.settings.widget.SwitchBar;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

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}. */

/** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */

public class AutomaticStorageManagerSwitchBarController

public class AutomaticStorageManagerSwitchBarController
@@ -56,13 +57,7 @@ public class AutomaticStorageManagerSwitchBarController 
    }

    }





    private void initializeCheckedStatus() {

    private void initializeCheckedStatus() {

        boolean isStorageManagerChecked =

        mSwitchBar.setChecked(Utils.isStorageManagerEnabled(mContext));

                Settings.Secure.getInt(

                                mContext.getContentResolver(),

                                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,

                                0)

                        != 0;

        mSwitchBar.setChecked(isStorageManagerChecked);

        mSwitchBar.addOnSwitchChangeListener(this);

        mSwitchBar.addOnSwitchChangeListener(this);

    }

    }

src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -23,12 +23,14 @@ import android.os.SystemProperties; 
import android.provider.Settings;

import android.provider.Settings;

import android.support.annotation.VisibleForTesting;

import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.PreferenceScreen;

import android.support.v7.preference.PreferenceScreen;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.deletionhelper.ActivationWarningFragment;

import com.android.settings.deletionhelper.ActivationWarningFragment;

import com.android.settings.widget.MasterSwitchController;

import com.android.settings.widget.MasterSwitchController;

import com.android.settings.widget.MasterSwitchPreference;

import com.android.settings.widget.MasterSwitchPreference;

import com.android.settings.widget.SwitchWidgetController;

import com.android.settings.widget.SwitchWidgetController;

import com.android.settingslib.Utils;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -74,9 +76,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends 
        if (!isAvailable()) {

        if (!isAvailable()) {

            return;

            return;

        }

        }

        boolean isStorageManagerEnabled = Settings.Secure.getInt(mContext.getContentResolver(),

        mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));

                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED, 0) != 0;

        mSwitch.setChecked(isStorageManagerEnabled);





        if (mSwitch != null) {

        if (mSwitch != null) {

            mSwitchController = new MasterSwitchController(mSwitch);

            mSwitchController = new MasterSwitchController(mSwitch);