diff options
author | Daniel Nishi <dhnishi@google.com> | 2016-05-16 12:19:58 -0700 |
---|---|---|
committer | Daniel Nishi <dhnishi@google.com> | 2016-05-18 09:25:38 -0700 |
commit | 0216e9dc2e10e8622faceec7740e83b0c10797f9 (patch) | |
tree | 2d3e9994a9958b8e939df26390c3f9fc7dc70c40 /src/com/android/settings/deviceinfo/PrivateVolumeSettings.java | |
parent | 1ca6867e3541d30fc1dd8a51a856e49dda675bdb (diff) | |
download | packages_apps_Settings-0216e9dc2e10e8622faceec7740e83b0c10797f9.tar.gz packages_apps_Settings-0216e9dc2e10e8622faceec7740e83b0c10797f9.tar.bz2 packages_apps_Settings-0216e9dc2e10e8622faceec7740e83b0c10797f9.zip |
Add an upsell dialog to activate the storage manager.
After a manual clear, the user will be prompted to turn
on the storage manager, if it is turned off. The prompt
will only show up after certain defined delay times and
stop showing up entirely if denied enough times.
Currently, the dialog does not actually turn on the storage
manager because the storage manager is not yet landed.
Bug: 28801159
Change-Id: I3c221786d08a7102b3b5357416ab12692d1894cf
Diffstat (limited to 'src/com/android/settings/deviceinfo/PrivateVolumeSettings.java')
-rw-r--r-- | src/com/android/settings/deviceinfo/PrivateVolumeSettings.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index d5cc27636a..7c427bd180 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -60,6 +60,7 @@ import com.android.settings.Utils; import com.android.settings.applications.ManageApplications; import com.android.settings.deletionhelper.DeletionHelperFragment; import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; +import com.android.settings.deletionhelper.StorageManagerUpsellDialog; import com.android.settings.deviceinfo.StorageSettings.MountTask; import com.android.settingslib.deviceinfo.StorageMeasurement; import com.android.settingslib.deviceinfo.StorageMeasurement.MeasurementDetails; @@ -100,6 +101,9 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { R.string.storage_detail_other }; + private static final int DELETION_HELPER_SETTINGS = 1; + private static final int DELETION_HELPER_CLEAR = 1; + private StorageManager mStorageManager; private UserManager mUserManager; @@ -418,7 +422,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { return true; case R.id.storage_free: startFragment(this, DeletionHelperFragment.class.getCanonicalName(), - R.string.deletion_helper_title, 0, args); + R.string.deletion_helper_title, DELETION_HELPER_SETTINGS, args); return true; } return super.onOptionsItemSelected(item); @@ -507,6 +511,18 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment { return super.onPreferenceTreeClick(pref); } + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == DELETION_HELPER_SETTINGS && resultCode == DELETION_HELPER_CLEAR && + StorageManagerUpsellDialog.shouldShow(getActivity())) { + long freedBytes = data.getLongExtra(DeletionHelperFragment.FREED_BYTES_KEY, 0); + StorageManagerUpsellDialog dialog = + StorageManagerUpsellDialog.newInstance(freedBytes); + dialog.show(getFragmentManager(), StorageManagerUpsellDialog.TAG); + } + } + private final MeasurementReceiver mReceiver = new MeasurementReceiver() { @Override public void onDetailsChanged(MeasurementDetails details) { |