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

Commit 31c4f2d3 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Framework: Use ICS alert drawable" into ics

parents 283df8ca 9e581f13

core/java/com/android/internal/app/ShutdownThread.java

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public final class ShutdownThread extends Thread { 
            // Set different dialog message based on whether or not we're rebooting

            if (mReboot) {

                dialog = new AlertDialog.Builder(context)

                        .setIcon(android.R.drawable.ic_dialog_alert)

                        .setIconAttribute(android.R.attr.alertDialogIcon)

                        .setTitle(com.android.internal.R.string.reboot_system)

                        .setSingleChoiceItems(com.android.internal.R.array.shutdown_reboot_options, 0, new DialogInterface.OnClickListener() {

                            public void onClick(DialogInterface dialog, int which) {
@@ -161,7 +161,7 @@ public final class ShutdownThread extends Thread { 
                mRebootReason = actions[0];

            } else {

                dialog = new AlertDialog.Builder(context)

                        .setIcon(android.R.drawable.ic_dialog_alert)

                        .setIconAttribute(android.R.attr.alertDialogIcon)

                        .setTitle(com.android.internal.R.string.power_off)

                        .setMessage(com.android.internal.R.string.shutdown_confirm)

                        .setPositiveButton(com.android.internal.R.string.yes, new DialogInterface.OnClickListener() {

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class ConfirmDialog extends Activity implements CompoundButton.OnCheckedC 
            ((CompoundButton) view.findViewById(R.id.check)).setOnCheckedChangeListener(this);



            mDialog = new AlertDialog.Builder(this)

                    .setIcon(android.R.drawable.ic_dialog_alert)

                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .setTitle(android.R.string.dialog_alert_title)

                    .setView(view)

                    .setPositiveButton(android.R.string.ok, this)