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

Commit eefa61ed authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "Settings: Use ICS alert drawable"

parents 5d72b272 e7c53b1c

src/com/android/settings/AccessibilitySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -766,7 +766,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            }

            return new AlertDialog.Builder(getActivity())

                .setTitle(title)

                .setIcon(android.R.drawable.ic_dialog_alert)

                .setIconAttribute(android.R.attr.alertDialogIcon)

                .setMessage(message)

                .setCancelable(true)

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

src/com/android/settings/CredentialStorage.java

+2 −2
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public final class CredentialStorage extends Activity { 
        private ResetDialog() {

            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)

                    .setTitle(android.R.string.dialog_alert_title)

                    .setIcon(android.R.drawable.ic_dialog_alert)

                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .setMessage(R.string.credentials_reset_hint)

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

                    .setNegativeButton(android.R.string.cancel, this)
@@ -305,7 +305,7 @@ public final class CredentialStorage extends Activity { 
        private ConfigureKeyGuardDialog() {

            AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)

                    .setTitle(android.R.string.dialog_alert_title)

                    .setIcon(android.R.drawable.ic_dialog_alert)

                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .setMessage(R.string.credentials_configure_lock_screen_hint)

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

                    .setNegativeButton(android.R.string.cancel, this)

src/com/android/settings/CryptKeeperSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class CryptKeeperSettings extends Fragment { 
                // TODO replace (or follow) this dialog with an explicit launch into password UI

                new AlertDialog.Builder(getActivity())

                    .setTitle(R.string.crypt_keeper_dialog_need_password_title)

                    .setIcon(android.R.drawable.ic_dialog_alert)

                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .setMessage(R.string.crypt_keeper_dialog_need_password_message)

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

                    .create()

src/com/android/settings/DevelopmentSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ public class DevelopmentSettings extends PreferenceFragment 
                mAdbDialog = new AlertDialog.Builder(getActivity()).setMessage(

                        getActivity().getResources().getString(R.string.adb_warning_message))

                        .setTitle(R.string.adb_warning_title)

                        .setIcon(android.R.drawable.ic_dialog_alert)

                        .setIconAttribute(android.R.attr.alertDialogIcon)

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

                        .setNegativeButton(android.R.string.no, this)

                        .show();

src/com/android/settings/PrivacySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements 
        // TODO: DialogFragment?

        mConfirmDialog = new AlertDialog.Builder(getActivity()).setMessage(msg)

                .setTitle(R.string.backup_erase_dialog_title)

                .setIcon(android.R.drawable.ic_dialog_alert)

                .setIconAttribute(android.R.attr.alertDialogIcon)

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

                .setNegativeButton(android.R.string.cancel, this)

                .show();