drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Framework: Use holo alert drawables"

Browse Source
This commit is contained in:
Adam Powell
2012-12-07 11:20:08 -08:00
committed by Gerrit Code Review
parent 8ea5ce1565 1129a85203
commit ff411ddb40
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/WebCoreThreadWatchdog.java
View File

@ -270,7 +270,7 @@ class WebCoreThreadWatchdog implements Runnable {
SUBSEQUENT_TIMEOUT_PERIOD); SUBSEQUENT_TIMEOUT_PERIOD);
} }
}) })
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.show(); .show();
} }
} }

2
packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java
View File

@ -66,7 +66,7 @@ public class ConfirmDialog extends AlertActivity implements
getString(R.string.prompt, app.loadLabel(pm))); getString(R.string.prompt, app.loadLabel(pm)));
((CompoundButton) view.findViewById(R.id.check)).setOnCheckedChangeListener(this); ((CompoundButton) view.findViewById(R.id.check)).setOnCheckedChangeListener(this);
mAlertParams.mIconId = android.R.drawable.ic_dialog_alert; mAlertParams.mIconAttrId = android.R.attr.alertDialogIcon;
mAlertParams.mTitle = getText(android.R.string.dialog_alert_title); mAlertParams.mTitle = getText(android.R.string.dialog_alert_title);
mAlertParams.mPositiveButtonText = getText(android.R.string.ok); mAlertParams.mPositiveButtonText = getText(android.R.string.ok);
mAlertParams.mPositiveButtonListener = this; mAlertParams.mPositiveButtonListener = this;

2
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@ -1123,7 +1123,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
return; return;
} }
mEnableTouchExplorationDialog = new AlertDialog.Builder(mContext) mEnableTouchExplorationDialog = new AlertDialog.Builder(mContext)
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.ok, new OnClickListener() { .setPositiveButton(android.R.string.ok, new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {