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

am 533b7b53: am 90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2

Browse Source 
* commit '533b7b53bcff1a682f295398293878f85ec419e3':
  Used space visible in SD Card bar graph
This commit is contained in:
Gilles Debunne
2011-06-06 15:22:53 -07:00
committed by Android Git Automerger
parent b7e7a8cb9c 533b7b53bc
commit cfe26919ab
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -478,6 +478,7 @@ public class StorageMeasurement {
File top = new File(mStorageVolume.getPath()); File top = new File(mStorageVolume.getPath());
mFileInfoForMisc = new ArrayList<FileInfo>(); mFileInfoForMisc = new ArrayList<FileInfo>();
File[] files = top.listFiles(); File[] files = top.listFiles();
if (files == null) return;
final int len = files.length; final int len = files.length;
// Get sizes of all top level nodes except the ones already computed... // Get sizes of all top level nodes except the ones already computed...
long counter = 0; long counter = 0;
@@ -524,4 +525,11 @@ public class StorageMeasurement {
return mFileName + " : " + mSize + ", id:" + mId; return mFileName + " : " + mSize + ", id:" + mId;
} }
} }
/**
* TODO remove this method, only used because external SD Card needs a special treatment.
*/
boolean isPrimary() {
return mIsPrimary;
}
} }

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

@@ -289,6 +289,12 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory implemen
mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize)); mPreferences[TOTAL_SIZE].setSummary(formatSize(totalSize));
if (!mMeasurement.isPrimary()) {
// 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);
}
updatePreference(appsSize, totalSize, APPLICATIONS); updatePreference(appsSize, totalSize, APPLICATIONS);
long totalMediaSize = 0; long totalMediaSize = 0;