Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff411ddb authored by Adam Powell's avatar Adam Powell Committed by Gerrit Code Review
Browse files

Merge "Framework: Use holo alert drawables"

parents 8ea5ce15 1129a852

core/java/android/webkit/WebCoreThreadWatchdog.java

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ class WebCoreThreadWatchdog implements Runnable { 
                                            SUBSEQUENT_TIMEOUT_PERIOD);

                                }

                            })

                    .setIcon(android.R.drawable.ic_dialog_alert)

                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .show();

        }

    }

packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class ConfirmDialog extends AlertActivity implements 
                    getString(R.string.prompt, app.loadLabel(pm)));

            ((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.mPositiveButtonText = getText(android.R.string.ok);

            mAlertParams.mPositiveButtonListener = this;

services/java/com/android/server/accessibility/AccessibilityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
                return;

            }

            mEnableTouchExplorationDialog = new AlertDialog.Builder(mContext)

                .setIcon(android.R.drawable.ic_dialog_alert)

                .setIconAttribute(android.R.attr.alertDialogIcon)

                .setPositiveButton(android.R.string.ok, new OnClickListener() {

                    @Override

                    public void onClick(DialogInterface dialog, int which) {