Merge "Display OBB usage as part of app details" into honeycomb

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index c2a51b0..1860d6d 100644 (file)
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -57,7 +57,7 @@ import java.util.List;
 public class Memory extends SettingsPreferenceFragment implements OnCancelListener,
         MeasurementReceiver {
     private static final String TAG = "Memory";
-    private static final boolean localLOGV = false;
+    static final boolean localLOGV = false;
 
     private static final String MEMORY_SD_SIZE = "memory_sd_size";
 
@@ -278,6 +278,12 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
             intent.setClass(getActivity(), com.android.settings.MediaFormat.class);
             startActivity(intent);
             return true;
+        } else if (preference == mInternalAppsUsage) {
+            Intent intent = new Intent(Intent.ACTION_MANAGE_PACKAGE_STORAGE);
+            intent.setClass(getActivity(),
+                    com.android.settings.Settings.ManageApplicationsActivity.class);
+            startActivity(intent);
+            return true;
         }
 
         return false;

diff --git a/src/com/android/settings/deviceinfo/MemoryMeasurement.java b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
index 19bd784..1aef202 100644 (file)
--- a/src/com/android/settings/deviceinfo/MemoryMeasurement.java
+++ b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
@@ -307,7 +307,9 @@ public class MemoryMeasurement {
                     return;
                 }
                 if (succeeded) {
-                    mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize;
+                    mAppsSizeForThisStatsObserver += stats.codeSize + stats.dataSize +
+                            stats.externalCacheSize + stats.externalDataSize +
+                            stats.externalMediaSize + stats.externalObbSize;
                 }
 
                 synchronized (mAppsList) {
@@ -363,8 +365,8 @@ public class MemoryMeasurement {
 
             long mediaSize;
             try {
-                // TODO get these directories from somewhere
-                mediaSize = imcs.calculateDirectorySize("/data/media");
+                mediaSize = imcs.calculateDirectorySize(
+                        Environment.getExternalStorageDirectory().getAbsolutePath());
             } catch (Exception e) {
                 Log.i(TAG, "Could not read memory from default container service");
                 return;