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

Commit 2c461006 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 6bfec2d6: Remove all dialog icons in Settings 

* commit '6bfec2d6':
  Remove all dialog icons in Settings
parents 9947787a 6bfec2d6

src/com/android/settings/CredentialStorage.java

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

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

                    .setTitle(android.R.string.dialog_alert_title)

                    .setIconAttribute(android.R.attr.alertDialogIcon)

                    .setMessage(R.string.credentials_reset_hint)

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

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

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

                    .setTitle(android.R.string.dialog_alert_title)

                    .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

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 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)

                    .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

+0 −2
Original line number Diff line number Diff line
@@ -1239,7 +1239,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
                        getActivity().getResources().getString(

                                R.string.dev_settings_warning_message))

                        .setTitle(R.string.dev_settings_warning_title)

                        .setIconAttribute(android.R.attr.alertDialogIcon)

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

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

                        .show();
@@ -1280,7 +1279,6 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
                mAdbDialog = new AlertDialog.Builder(getActivity()).setMessage(

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

                        .setTitle(R.string.adb_warning_title)

                        .setIconAttribute(android.R.attr.alertDialogIcon)

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

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

                        .show();

src/com/android/settings/PrivacySettings.java

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

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

                .setTitle(R.string.backup_erase_dialog_title)

                .setIconAttribute(android.R.attr.alertDialogIcon)

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

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

                .show();

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

+0 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ public class ToggleAccessibilityServicePreferenceFragment 
                AlertDialog ad = new AlertDialog.Builder(getActivity())

                        .setTitle(getString(R.string.enable_service_title,

                                info.getResolveInfo().loadLabel(getPackageManager())))

                        .setIconAttribute(android.R.attr.alertDialogIcon)

                        .setView(createEnableDialogContentView(info))

                        .setCancelable(true)

                        .setPositiveButton(android.R.string.ok, this)
@@ -182,7 +181,6 @@ public class ToggleAccessibilityServicePreferenceFragment 
                return new AlertDialog.Builder(getActivity())

                        .setTitle(getString(R.string.disable_service_title,

                                info.getResolveInfo().loadLabel(getPackageManager())))

                        .setIconAttribute(android.R.attr.alertDialogIcon)

                        .setMessage(getString(R.string.disable_service_message,

                                info.getResolveInfo().loadLabel(getPackageManager())))

                        .setCancelable(true)