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

am 81df8360: am 59ee3889: Merge "Settings: fix storage measurement for device without emulated sdcard"

Browse Source 
* commit '81df8360c9c27189445c69577f0f8f6f07e4b73b':
  Settings: fix storage measurement for device without emulated sdcard
This commit is contained in:
Jeff Sharkey
2012-11-28 13:06:25 -08:00
committed by Android Git Automerger
parent a714c33d2f 81df8360c9
commit 4ae21d17d9
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,7 +422,7 @@ public class StorageMeasurement {
} }
// Measure misc files not counted under media // Measure misc files not counted under media
if (mIsInternal || mIsPrimary) { if (measureMedia) {
final File path = mIsInternal ? currentEnv.getExternalStorageDirectory() final File path = mIsInternal ? currentEnv.getExternalStorageDirectory()
: mVolume.getPathFile(); : mVolume.getPathFile();
details.miscSize = measureMisc(imcs, path); details.miscSize = measureMisc(imcs, path);

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

@@ -194,8 +194,9 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
} }
final boolean isRemovable = mVolume != null ? mVolume.isRemovable() : false; final boolean isRemovable = mVolume != null ? mVolume.isRemovable() : false;
// Always create the preference since many code rely on it existing
mMountTogglePreference = new Preference(context);
if (isRemovable) { if (isRemovable) {
mMountTogglePreference = new Preference(context);
mMountTogglePreference.setTitle(R.string.sd_eject); mMountTogglePreference.setTitle(R.string.sd_eject);
mMountTogglePreference.setSummary(R.string.sd_eject_summary); mMountTogglePreference.setSummary(R.string.sd_eject_summary);
addPreference(mMountTogglePreference); addPreference(mMountTogglePreference);
@@ -240,12 +241,12 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
final String state = mStorageManager.getVolumeState(mVolume.getPath()); final String state = mStorageManager.getVolumeState(mVolume.getPath());
if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) { if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
mItemAvailable.setSummary(R.string.memory_available_read_only); mItemAvailable.setTitle(R.string.memory_available_read_only);
if (mFormatPreference != null) { if (mFormatPreference != null) {
removePreference(mFormatPreference); removePreference(mFormatPreference);
} }
} else { } else {
mItemAvailable.setSummary(R.string.memory_available); mItemAvailable.setTitle(R.string.memory_available);
} }
if (Environment.MEDIA_MOUNTED.equals(state) if (Environment.MEDIA_MOUNTED.equals(state)
@@ -310,7 +311,9 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
private static long totalValues(HashMap<String, Long> map, String... keys) { private static long totalValues(HashMap<String, Long> map, String... keys) {
long total = 0; long total = 0;
for (String key : keys) { for (String key : keys) {
total += map.get(key); if (map.containsKey(key)) {
total += map.get(key);
}
} }
return total; return total;
} }