diff options
author | Danesh M <danesh@cyngn.com> | 2016-05-20 13:05:12 -0700 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2016-05-20 15:38:07 -0700 |
commit | d4dafa92193252799ed4f0254dd215fd161662f5 (patch) | |
tree | 9d2e0a996552bbb61c1769d3ca600cc4c8c55e42 | |
parent | a6816a2da8c21171b840011ba3727032f0879306 (diff) | |
download | android_packages_apps_CMFileManager-d4dafa92193252799ed4f0254dd215fd161662f5.tar.gz android_packages_apps_CMFileManager-d4dafa92193252799ed4f0254dd215fd161662f5.tar.bz2 android_packages_apps_CMFileManager-d4dafa92193252799ed4f0254dd215fd161662f5.zip |
FileManager : Index all storage volumes
Fix disk usage for no categories
If no categories are found, ensure we fallback to drawUsed
so the graph represents the information correctly.
FEIJ-650
Change-Id: Ifdc069b1266c96dc1dc2569a2c0d45146f96b73d
(cherry picked from commit b0829d618a76d9a5ce1b5bbfda77001b55986341)
-rw-r--r-- | src/com/cyanogenmod/filemanager/FileManagerApplication.java | 7 | ||||
-rw-r--r-- | src/com/cyanogenmod/filemanager/ui/widgets/DiskUsageGraph.java | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/filemanager/FileManagerApplication.java b/src/com/cyanogenmod/filemanager/FileManagerApplication.java index 20a7073d..e3c88d6c 100644 --- a/src/com/cyanogenmod/filemanager/FileManagerApplication.java +++ b/src/com/cyanogenmod/filemanager/FileManagerApplication.java @@ -23,6 +23,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; import android.os.Environment; +import android.os.storage.StorageVolume; import android.util.Log; import com.cyanogenmod.filemanager.console.Console; @@ -42,6 +43,7 @@ import com.cyanogenmod.filemanager.ui.ThemeManager.Theme; import com.cyanogenmod.filemanager.util.AIDHelper; import com.cyanogenmod.filemanager.util.AndroidHelper; import com.cyanogenmod.filemanager.util.MimeTypeHelper; +import com.cyanogenmod.filemanager.util.StorageHelper; import java.io.File; import java.io.FileInputStream; @@ -183,6 +185,11 @@ public final class FileManagerApplication extends Application { File externalStorage = Environment.getExternalStorageDirectory(); MimeTypeIndexService.indexFileRoot(this, externalStorage.getAbsolutePath()); MimeTypeIndexService.indexFileRoot(this, Environment.getRootDirectory().getAbsolutePath()); + StorageVolume[] storageVolumes = StorageHelper.getStorageVolumes(this, true); + for (StorageVolume storageVolume : storageVolumes) { + MimeTypeIndexService.indexFileRoot(this, storageVolume.getPath()); + } + // Schedule in case not scheduled (i.e. never booted with this app on device SecureCacheCleanupService.scheduleCleanup(getApplicationContext()); diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/DiskUsageGraph.java b/src/com/cyanogenmod/filemanager/ui/widgets/DiskUsageGraph.java index bdae373c..bb7681d2 100644 --- a/src/com/cyanogenmod/filemanager/ui/widgets/DiskUsageGraph.java +++ b/src/com/cyanogenmod/filemanager/ui/widgets/DiskUsageGraph.java @@ -340,10 +340,10 @@ public class DiskUsageGraph extends View { drawTotal(rect, stroke); // Draw the usage - if (USE_COLORS) { - drawUsedWithColors(rect, stroke); - } else { + if (!USE_COLORS || mDiskUsage == null || mDiskUsage.getUsageCategoryList().isEmpty()) { drawUsed(rect, stroke, used); + } else { + drawUsedWithColors(rect, stroke); } if (used >= mDiskWarningAngle) { |