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

am a0098bd3: Merge "bug:3402846 fix settings->storage" into honeycomb

Browse Source 
* commit 'a0098bd34602acdf129ded0152ffeb07bb64d28d':
  bug:3402846 fix settings->storage
This commit is contained in:
Vasu Nori
2011-01-28 18:42:50 -08:00
committed by Android Git Automerger
parent c3bc110466 a0098bd346
commit 1acf3d1629
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,7 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
mInternalMediaColor = mRes.getColor(R.color.memory_media_usage); mInternalMediaColor = mRes.getColor(R.color.memory_media_usage);
mInternalAppsColor = mRes.getColor(R.color.memory_apps_usage); mInternalAppsColor = mRes.getColor(R.color.memory_apps_usage);
mInternalUsedColor = mRes.getColor(R.color.memory_used); mInternalUsedColor = android.graphics.Color.GRAY;
float[] radius = new float[] { float[] radius = new float[] {
5f, 5f, 5f, 5f, 5f, 5f, 5f, 5f 5f, 5f, 5f, 5f, 5f, 5f, 5f, 5f
@@ -401,23 +401,18 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
} }
private void updateUiExact(long totalSize, long availSize, long mediaSize, long appsSize) { private void updateUiExact(long totalSize, long availSize, long mediaSize, long appsSize) {
// There are other things that can take up storage, but we didn't measure it.
// add that unaccounted-for-usage to Apps Usage
final long appsPlusRemaining = totalSize - availSize - mediaSize;
mInternalSize.setSummary(formatSize(totalSize)); mInternalSize.setSummary(formatSize(totalSize));
mInternalAvail.setSummary(formatSize(availSize)); mInternalAvail.setSummary(formatSize(availSize));
mInternalMediaUsage.setSummary(formatSize(mediaSize)); mInternalMediaUsage.setSummary(formatSize(mediaSize));
mInternalAppsUsage.setSummary(formatSize(appsSize)); mInternalAppsUsage.setSummary(formatSize(appsPlusRemaining));
mInternalUsageChart.clear(); mInternalUsageChart.clear();
mInternalUsageChart.addEntry(mediaSize / (float) totalSize, mInternalMediaColor); mInternalUsageChart.addEntry(mediaSize / (float) totalSize, mInternalMediaColor);
mInternalUsageChart.addEntry(appsSize / (float) totalSize, mInternalAppsColor); mInternalUsageChart.addEntry(appsPlusRemaining / (float) totalSize, mInternalAppsColor);
final long usedSize = totalSize - availSize;
// There are other things that can take up storage, but we didn't
// measure it.
final long remaining = usedSize - (mediaSize + appsSize);
if (remaining > 0) {
mInternalUsageChart.addEntry(remaining / (float) totalSize, mInternalUsedColor);
}
mInternalUsageChart.commit(); mInternalUsageChart.commit();
} }