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

Update storage setting summary text format.

Browse Source 
New format: 38% used - 19.80 GB free

Bug: 34975053
Test: make RunSettingRoboTests
Change-Id: I7c8f5f0fe825eade8167764622c940e8234be6a9
This commit is contained in:
Fan Zhang
2017-02-09 16:33:48 -08:00
parent 3fca717d3b
commit 4f9e8d4a14
4 changed files with 105 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.deviceinfo;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
@@ -59,10 +58,10 @@ import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
import com.android.settingslib.drawer.SettingsDrawerActivity;
import java.io.File;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -513,10 +512,13 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
private final Context mContext;
private final SummaryLoader mLoader;
private final StorageManagerVolumeProvider mStorageManagerVolumeProvider;
private SummaryProvider(Context context, SummaryLoader loader) {
mContext = context;
mLoader = loader;
final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
mStorageManagerVolumeProvider = new StorageManagerVolumeProvider(storageManager);
}
@Override
@@ -528,13 +530,13 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
private void updateSummary() {
// TODO: Register listener.
final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
new StorageManagerVolumeProvider(storageManager));
long privateUsedBytes = info.totalBytes - info.freeBytes;
final NumberFormat percentageFormat = NumberFormat.getPercentInstance();
final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
mStorageManagerVolumeProvider);
double privateUsedBytes = info.totalBytes - info.freeBytes;
mLoader.setSummary(this, mContext.getString(R.string.storage_summary,
Formatter.formatFileSize(mContext, privateUsedBytes),
Formatter.formatFileSize(mContext, info.totalBytes)));
percentageFormat.format(privateUsedBytes / info.totalBytes),
Formatter.formatFileSize(mContext, info.freeBytes)));
}
}