PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread

Browse Source 
Merge commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2' into gingerbread-plus-aosp

* commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2':
  Fix android:allowClearUserData.
This commit is contained in:
Dianne Hackborn
2010-09-30 19:14:28 -07:00
committed by Android Git Automerger
parent ddaf8f490f 95d7a702c3
commit 3cda486cd2
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -71,6 +71,7 @@ public class InstalledAppDetails extends Activity
implements View.OnClickListener, ApplicationsState.Callbacks {
private static final String TAG="InstalledAppDetails";
static final boolean SUPPORT_DISABLE_APPS = false;
private static final boolean localLOGV = false;
private PackageManager mPm;
private ApplicationsState mState;
@@ -80,7 +81,7 @@ public class InstalledAppDetails extends Activity
private boolean mMoveInProgress = false;
private boolean mUpdatedSysApp = false;
private Button mActivitiesButton;
private boolean localLOGV = false;
private boolean mCanClearData = true;
private TextView mAppVersion;
private TextView mTotalSize;
private TextView mAppSize;
@@ -182,12 +183,20 @@ public class InstalledAppDetails extends Activity
}
private void initDataButtons() {
if (mAppEntry.info.manageSpaceActivityName != null) {
mClearDataButton.setText(R.string.manage_space_text);
} else {
if ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM
| ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA))
== ApplicationInfo.FLAG_SYSTEM) {
mClearDataButton.setText(R.string.clear_user_data_text);
mClearDataButton.setEnabled(false);
mCanClearData = false;
} else {
if (mAppEntry.info.manageSpaceActivityName != null) {
mClearDataButton.setText(R.string.manage_space_text);
} else {
mClearDataButton.setText(R.string.clear_user_data_text);
}
mClearDataButton.setOnClickListener(this);
}
mClearDataButton.setOnClickListener(this);
}
private CharSequence getMoveErrMsg(int errCode) {
@@ -505,7 +514,7 @@ public class InstalledAppDetails extends Activity
mTotalSize.setText(getSizeStr(mAppEntry.size));
}
if (mAppEntry.dataSize <= 0) {
if (mAppEntry.dataSize <= 0 || !mCanClearData) {
mClearDataButton.setEnabled(false);
} else {
mClearDataButton.setEnabled(true);