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

Use the config default days to retain.

Browse Source 
This avoids using the static value to determine the default number of
days to retain.

Bug: 38499322
Test: SettingsLib robotests
Change-Id: Ia0f569407a5a2a85a173e90c22f6b413776564db
This commit is contained in:
Daniel Nishi
2017-05-23 15:59:32 -07:00
parent b287dc93d5
commit 9b868d95ea
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
View File

@@ -33,6 +33,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
/** /**
@@ -74,9 +75,11 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
mDaysToRetain.setOnPreferenceChangeListener(this); mDaysToRetain.setOnPreferenceChangeListener(this);
ContentResolver cr = getContentResolver(); ContentResolver cr = getContentResolver();
int photosDaysToRetain = Settings.Secure.getInt(cr, int photosDaysToRetain =
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN, Settings.Secure.getInt(
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT); cr,
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
Utils.getDefaultStorageManagerDaysToRetain(getResources()));
String[] stringValues = String[] stringValues =
getResources().getStringArray(R.array.automatic_storage_management_days_values); getResources().getStringArray(R.array.automatic_storage_management_days_values);
mDaysToRetain.setValue(stringValues[daysValueToIndex(photosDaysToRetain, stringValues)]); mDaysToRetain.setValue(stringValues[daysValueToIndex(photosDaysToRetain, stringValues)]);
@@ -164,4 +167,5 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
} }
return indices.length - 1; return indices.length - 1;
} }
} }