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

Merge "Supercalifragilisticexpialidocious." into gingerbread

Browse Source
This commit is contained in:
Dianne Hackborn
2010-09-14 12:31:20 -07:00
committed by Android (Google) Code Review
parent c5c8dad0af 44178e2801
commit 5c2a468481
2 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,6 +69,7 @@ import android.widget.TextView;
public class InstalledAppDetails extends Activity
implements View.OnClickListener, ApplicationsState.Callbacks {
private static final String TAG="InstalledAppDetails";
static final boolean SUPPORT_DISABLE_APPS = false;
private PackageManager mPm;
private ApplicationsState mState;
@@ -259,6 +260,7 @@ public class InstalledAppDetails extends Activity
} else {
if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
enabled = false;
if (SUPPORT_DISABLE_APPS) {
try {
// Try to prevent the user from bricking their phone
// by not allowing disabling of apps signed with the
@@ -284,6 +286,7 @@ public class InstalledAppDetails extends Activity
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Unable to get package info", e);
}
}
} else {
mUninstallButton.setText(R.string.uninstall_text);
}

4
src/com/android/settings/applications/ManageApplications.java
View File

@@ -354,7 +354,11 @@ public class ManageApplications extends TabActivity implements
holder.appIcon.setImageDrawable(entry.icon);
}
holder.updateSizeText(ManageApplications.this);
if (InstalledAppDetails.SUPPORT_DISABLE_APPS) {
holder.disabled.setVisibility(entry.info.enabled ? View.GONE : View.VISIBLE);
} else {
holder.disabled.setVisibility(View.GONE);
}
}
mActive.remove(convertView);
mActive.add(convertView);