Merge donut into master
This commit is contained in:
@@ -52,6 +52,14 @@ public class ApplicationSettings extends PreferenceActivity implements
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDestroy() {
|
||||
super.onDestroy();
|
||||
if (mWarnInstallApps != null) {
|
||||
mWarnInstallApps.dismiss();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
|
||||
if (preference == mToggleAppInstallation) {
|
||||
|
||||
@@ -212,8 +212,6 @@ public class InstalledAppDetails extends Activity implements View.OnClickListene
|
||||
totalSizeStr = appSizeStr = dataSizeStr = mComputingStr;
|
||||
if(localLOGV) Log.i(TAG, "Have to compute package sizes");
|
||||
mSizeObserver = new PkgSizeObserver();
|
||||
mPm.getPackageSizeInfo(packageName, mSizeObserver);
|
||||
|
||||
try {
|
||||
mAppInfo = mPm.getApplicationInfo(packageName,
|
||||
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) {
|
||||
//display confirmation dialog
|
||||
new AlertDialog.Builder(this)
|
||||
|
||||
Reference in New Issue
Block a user