commit 8731cb1b6a45cde528cedd92cc3373b91f96ff50
author Dianne Hackborn <hackbod@google.com> Fri Oct 22 12:59:31 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 22 12:59:31 2010 -0700
tree 39e2f78f2f524e6f7874b134d382dbfeb08f092f
parent 92acdba01c6593b9353d3e18ae16920794e99d23
parent 5e34f239861874455d815f1001feed24d994eafd

am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size

res/layout/manage_applications.xml

diff --git a/res/layout/manage_applications.xml b/res/layout/manage_applications.xml
index 2d6678a..95d4847 100755
--- a/res/layout/manage_applications.xml
+++ b/res/layout/manage_applications.xml
@@ -60,7 +60,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
-                android:layout_marginTop="-23dp"
+                android:layout_marginTop="-20dp"
                 android:textAppearance="?android:attr/textAppearanceSmallInverse"
                 android:textColor="#ccc"
                 android:shadowColor="#000"

res/layout/running_processes_view.xml

diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index 2e62c48..3558e92 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -60,7 +60,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="0"
-            android:layout_marginTop="-23dp"
+            android:layout_marginTop="-20dp"
             android:textAppearance="?android:attr/textAppearanceSmallInverse"
             android:textColor="#ccc"
             android:shadowColor="#000"

src/com/android/settings/applications/ApplicationsState.java

diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index c08ae5a..814bbbf 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -585,7 +585,7 @@
 
     private long getTotalSize(PackageStats ps) {
         if (ps != null) {
-            return ps.cacheSize+ps.codeSize+ps.dataSize;
+            return ps.codeSize+ps.dataSize;
         }
         return SIZE_INVALID;
     }