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

resolve merge conflicts of a4e3842 to master

Browse Source 
Change-Id: Ia52171f3cfa0bcb73c6a4d23122ef8ad9025e807
This commit is contained in:
Daniel Nishi
2016-09-28 13:20:27 -07:00
parent 176478c282 a4e3842b1e
commit a2e0824b26
3 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,9 +17,11 @@
package com.android.settings.deletionhelper;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemProperties;
import android.os.storage.StorageManager;
import android.provider.Settings;
import android.support.v14.preference.SwitchPreference;
@@ -47,6 +49,8 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
private static final String KEY_STORAGE_MANAGER_SWITCH = "storage_manager_active";
private static final String KEY_DOWNLOADS_BACKUP_SWITCH = "downloads_backup_active";
private static final String KEY_DOWNLOADS_DAYS = "downloads_days";
private static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY =
"ro.storage_manager.enabled";
private DropDownPreference mDaysToRetain;
private DropDownPreference mDownloadsDaysToRetain;
@@ -138,6 +142,10 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
Settings.Secure.putInt(getContentResolver(),
Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
storageManagerChecked ? 1 : 0);
// Only show a warning if enabling.
if (storageManagerChecked) {
maybeShowWarning();
}
break;
case KEY_DOWNLOADS_BACKUP_SWITCH:
boolean downloadsBackupChecked = (boolean) newValue;
@@ -186,4 +194,15 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
}
return indices.length - 1;
}
private void maybeShowWarning() {
// If the storage manager is on by default, we can use the normal message.
boolean warningUnneeded = SystemProperties.getBoolean(
STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false);
if (warningUnneeded) {
return;
}
ActivationWarningFragment fragment = ActivationWarningFragment.newInstance();
fragment.show(getFragmentManager(), ActivationWarningFragment.TAG);
}
}