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

Storage correctly updates internal storage graph.

Browse Source 
The estimated used size used to be displayed next to the actual applications' size.

Change-Id: I9a9bf1faf638f8495507930e531ca4c851558f26
This commit is contained in:
Gilles Debunne
2011-07-08 16:05:09 -07:00
parent 6dc0f9639e
commit b7609ff999
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/deviceinfo/Memory.java
View File

@@ -85,12 +85,10 @@ public class Memory extends SettingsPreferenceFragment {
if (!Environment.isExternalStorageEmulated()) {
// External storage is separate from internal storage; need to
// show internal storage as a separate item.
StorageVolumePreferenceCategory storagePreferenceCategory =
new StorageVolumePreferenceCategory(getActivity(), mResources, null,
mStorageManager, true);
mInternalStorageVolumePreferenceCategory = storagePreferenceCategory;
getPreferenceScreen().addPreference(storagePreferenceCategory);
storagePreferenceCategory.init();
mInternalStorageVolumePreferenceCategory = new StorageVolumePreferenceCategory(
getActivity(), mResources, null, mStorageManager, false);
getPreferenceScreen().addPreference(mInternalStorageVolumePreferenceCategory);
mInternalStorageVolumePreferenceCategory.init();
}
StorageVolume[] storageVolumes = mStorageManager.getVolumeList();
@@ -101,12 +99,11 @@ public class Memory extends SettingsPreferenceFragment {
mStorageVolumePreferenceCategories = new StorageVolumePreferenceCategory[length];
for (int i = 0; i < length; i++) {
StorageVolume storageVolume = storageVolumes[i];
StorageVolumePreferenceCategory storagePreferenceCategory =
new StorageVolumePreferenceCategory(getActivity(), mResources, storageVolume,
mStorageManager, i == 0); // The first volume is the primary volume
mStorageVolumePreferenceCategories[i] = storagePreferenceCategory;
getPreferenceScreen().addPreference(storagePreferenceCategory);
storagePreferenceCategory.init();
boolean isPrimary = i == 0;
mStorageVolumePreferenceCategories[i] = new StorageVolumePreferenceCategory(
getActivity(), mResources, storageVolume, mStorageManager, isPrimary);
getPreferenceScreen().addPreference(mStorageVolumePreferenceCategories[i]);
mStorageVolumePreferenceCategories[i].init();
}
// only show options menu if we are not using the legacy USB mass storage support
@@ -132,9 +129,8 @@ public class Memory extends SettingsPreferenceFragment {
StorageEventListener mStorageListener = new StorageEventListener() {
@Override
public void onStorageStateChanged(String path, String oldState, String newState) {
Log.i(TAG, "Received storage state changed notification that " +
path + " changed state from " + oldState +
" to " + newState);
Log.i(TAG, "Received storage state changed notification that " + path +
" changed state from " + oldState + " to " + newState);
for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
StorageVolumePreferenceCategory svpc = mStorageVolumePreferenceCategories[i];
if (path.equals(svpc.getStorageVolume().getPath())) {
@@ -233,6 +229,7 @@ public class Memory extends SettingsPreferenceFragment {
private final BroadcastReceiver mMediaScannerReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
// mInternalStorageVolumePreferenceCategory is not affected by the media scanner
for (int i = 0; i < mStorageVolumePreferenceCategories.length; i++) {
mStorageVolumePreferenceCategories[i].onMediaScannerFinished();
}

4
src/com/android/settings/deviceinfo/StorageMeasurement.java
View File

@@ -549,7 +549,7 @@ public class StorageMeasurement {
/**
* TODO remove this method, only used because external SD Card needs a special treatment.
*/
boolean isPrimary() {
return mIsPrimary;
boolean isExternalSDCard() {
return !mIsPrimary && !mIsInternal;
}
}

2
src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
View File

@@ -311,7 +311,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory implemen
mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
if (!mMeasurement.isPrimary()) {
if (mMeasurement.isExternalSDCard()) {
// TODO FIXME: external SD card will not report any size. Show used space in bar graph
final long usedSize = totalSize - availSize;
mUsageBarPreference.addEntry(usedSize / (float) totalSize, android.graphics.Color.GRAY);