Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge donut into master

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2009-04-22 17:12:39 -07:00
parent 743182c668 0306e8b7dc
commit 9b64ef4b44
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/ApplicationSettings.java
View File

@@ -52,6 +52,14 @@ public class ApplicationSettings extends PreferenceActivity implements
} }
} }
@Override
protected void onDestroy() {
super.onDestroy();
if (mWarnInstallApps != null) {
mWarnInstallApps.dismiss();
}
}
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
if (preference == mToggleAppInstallation) { if (preference == mToggleAppInstallation) {

10
src/com/android/settings/InstalledAppDetails.java
View File

@@ -212,8 +212,6 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
totalSizeStr = appSizeStr = dataSizeStr = mComputingStr; totalSizeStr = appSizeStr = dataSizeStr = mComputingStr;
if(localLOGV) Log.i(TAG, "Have to compute package sizes"); if(localLOGV) Log.i(TAG, "Have to compute package sizes");
mSizeObserver = new PkgSizeObserver(); mSizeObserver = new PkgSizeObserver();
mPm.getPackageSizeInfo(packageName, mSizeObserver);
try { try {
mAppInfo = mPm.getApplicationInfo(packageName, mAppInfo = mPm.getApplicationInfo(packageName,
PackageManager.GET_UNINSTALLED_PACKAGES); PackageManager.GET_UNINSTALLED_PACKAGES);
@@ -290,6 +288,14 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
} }
} }
@Override
public void onStart() {
super.onStart();
if (mAppInfo != null && mAppInfo.packageName != null) {
mPm.getPackageSizeInfo(mAppInfo.packageName, mSizeObserver);
}
}
private void displayErrorDialog(int msgId, final boolean finish, final boolean changed) { private void displayErrorDialog(int msgId, final boolean finish, final boolean changed) {
//display confirmation dialog //display confirmation dialog
new AlertDialog.Builder(this) new AlertDialog.Builder(this)