auto import from //branches/cupcake/...@130745
diff --git a/src/com/android/settings/InstalledAppDetails.java b/src/com/android/settings/InstalledAppDetails.java
index 04121bb..d4dfe97 100644
--- a/src/com/android/settings/InstalledAppDetails.java
+++ b/src/com/android/settings/InstalledAppDetails.java
@@ -66,6 +66,7 @@
private Button mActivitiesButton;
private boolean mCanUninstall;
private boolean localLOGV=Config.LOGV || false;
+ private TextView mAppSnippetSize;
private TextView mTotalSize;
private TextView mAppSize;
private TextView mDataSize;
@@ -76,6 +77,7 @@
private TextView mCacheSize;
private Button mClearCacheButton;
private ClearCacheObserver mClearCacheObserver;
+ private Button mForceStopButton;
PackageStats mSizeInfo;
private Button mManageSpaceButton;
@@ -227,10 +229,8 @@
appName = getString(_UNKNOWN_APP);
}
((TextView)findViewById(R.id.app_name)).setText(appName);
- CharSequence appDesc = mAppInfo.loadDescription(mPm);
- if(appDesc != null) {
- ((TextView)findViewById(R.id.app_description)).setText(appDesc);
- }
+ mAppSnippetSize = ((TextView)findViewById(R.id.app_size));
+ mAppSnippetSize.setText(totalSizeStr);
//TODO download str and download url
//set values on views
mTotalSize = (TextView)findViewById(R.id.total_size_text);
@@ -255,6 +255,8 @@
mCachePanel = findViewById(R.id.cache_panel);
mCacheSize = (TextView) findViewById(R.id.cache_size_text);
mClearCacheButton = (Button) findViewById(R.id.clear_cache_button);
+ mForceStopButton = (Button) findViewById(R.id.force_stop_button);
+ mForceStopButton.setOnClickListener(this);
//clear activities
mActivitiesButton = (Button)findViewById(R.id.clear_activities_button);
@@ -326,13 +328,17 @@
long newTot = newPs.cacheSize+newPs.codeSize+newPs.dataSize;
if(mSizeInfo == null) {
mSizeInfo = newPs;
- mTotalSize.setText(getSizeStr(newTot));
+ String str = getSizeStr(newTot);
+ mTotalSize.setText(str);
+ mAppSnippetSize.setText(str);
mAppSize.setText(getSizeStr(newPs.codeSize));
mDataSize.setText(getSizeStr(newPs.dataSize+newPs.cacheSize));
} else {
long oldTot = mSizeInfo.cacheSize+mSizeInfo.codeSize+mSizeInfo.dataSize;
if(newTot != oldTot) {
- mTotalSize.setText(getSizeStr(newTot));
+ String str = getSizeStr(newTot);
+ mTotalSize.setText(str);
+ mAppSnippetSize.setText(str);
changed = true;
}
if(newPs.codeSize != mSizeInfo.codeSize) {
@@ -446,6 +452,10 @@
mClearCacheObserver = new ClearCacheObserver();
}
mPm.deleteApplicationCacheFiles(packageName, mClearCacheObserver);
+ } else if (v == mForceStopButton) {
+ ActivityManager am = (ActivityManager)getSystemService(
+ Context.ACTIVITY_SERVICE);
+ am.restartPackage(packageName);
}
}