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

Commit 25d9d81b authored by blunden's avatar blunden Committed by Gerrit Code Review
Browse files

Framework: Use holo alert drawable 

Also remove the icon in the shutdown menu to match AOSP ICS
and later.

Change-Id: I9881c3940ba7bfc236fdec40bc98380d0dd7ccf8
parent bd4d5a7a

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();

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,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) {

services/java/com/android/server/pm/ShutdownThread.java

+1 −2
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ public final class ShutdownThread extends Thread { 
            final AlertDialog dialog;

            if (mReboot && !mRebootSafeMode){

                dialog = new AlertDialog.Builder(context)

                        .setIcon(android.R.drawable.ic_dialog_alert)

                        .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) {