diff options
4 files changed, 42 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index c7b0b35e27d4..ddfd5f10cc4a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2958,4 +2958,7 @@ <!-- The OEM specified sensor string type for the gesture to launch camera app, this value must match the value of config_cameraLiftTriggerSensorType in OEM's HAL --> <string translatable="false" name="config_cameraLiftTriggerSensorStringType"></string> + + <!-- Default number of days to retain for the automatic storage manager. --> + <integer translatable="false" name="config_storageManagerDaystoRetainDefault">90</integer> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index aa586b737006..245ba5cff9c1 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -3040,4 +3040,6 @@ <java-symbol type="integer" name="config_inCallNotificationVolumeRelative" /> <java-symbol type="bool" name="config_dozeAlwaysOnDisplayAvailable" /> + + <java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" /> </resources> diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 3135f1db957d..b21f2fa860b1 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -21,6 +21,7 @@ import android.net.NetworkBadging; import android.os.BatteryManager; import android.os.UserManager; import android.print.PrintManager; +import android.provider.Settings; import android.view.View; import com.android.internal.util.UserIcons; @@ -313,4 +314,20 @@ public class Utils { "No badge resource found for badge value: " + badge); } } + + public static int getDefaultStorageManagerDaysToRetain(Resources resources) { + int defaultDays = Settings.Secure.AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_DEFAULT; + try { + defaultDays = + resources.getInteger( + com.android + .internal + .R + .integer + .config_storageManagerDaystoRetainDefault); + } catch (Resources.NotFoundException e) { + // We are likely in a test environment. + } + return defaultDays; + } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java index e42c35bc8d8b..0164f80e68f8 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java @@ -21,6 +21,12 @@ import org.robolectric.annotation.Config; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import android.content.res.Resources; + @RunWith(SettingLibRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class UtilsTest { @@ -54,4 +60,18 @@ public class UtilsTest { assertThat(percentage).isEqualTo(expectedPercentages[i]); } } + + @Test + public void testStorageManagerDaysToRetainUsesResources() { + Resources resources = mock(Resources.class); + when(resources.getInteger( + eq( + com.android + .internal + .R + .integer + .config_storageManagerDaystoRetainDefault))) + .thenReturn(60); + assertThat(Utils.getDefaultStorageManagerDaysToRetain(resources)).isEqualTo(60); + } } |