diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-14 08:39:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-14 08:39:24 -0700 |
| commit | 291389ed5ce3c97c7f5ec145f00a6bc68862f8f4 (patch) | |
| tree | 78e254966e7b56804759fea59565eab94e0af14e | |
| parent | 865a914fb5459dd5d6d676b11a09c95d15f2ef6e (diff) | |
| parent | 5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba (diff) | |
| download | packages_apps_settings-291389ed5ce3c97c7f5ec145f00a6bc68862f8f4.zip packages_apps_settings-291389ed5ce3c97c7f5ec145f00a6bc68862f8f4.tar.gz packages_apps_settings-291389ed5ce3c97c7f5ec145f00a6bc68862f8f4.tar.bz2 | |
am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
Fix use of holo drawables in a few more places
3 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 4e6ebfb..46ffe83 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -757,7 +757,7 @@ public class DevelopmentSettings extends PreferenceFragment getActivity().getResources().getString( R.string.dev_settings_warning_message)) .setTitle(R.string.dev_settings_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(); diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index ccbf371..7fe3711 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -909,7 +909,7 @@ public class InstalledAppDetails extends Fragment case DLG_DISABLE_NOTIFICATIONS: return new AlertDialog.Builder(getActivity()) .setTitle(getActivity().getText(R.string.app_disable_notifications_dlg_title)) - .setIcon(android.R.drawable.ic_dialog_alert) + .setIconAttribute(android.R.attr.alertDialogIcon) .setMessage(getActivity().getText(R.string.app_disable_notifications_dlg_text)) .setPositiveButton(R.string.dlg_ok, new DialogInterface.OnClickListener() { diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index ea3ddf4..13f4435 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -155,7 +155,7 @@ public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment { if (mDialog == null) { mDialog = (new AlertDialog.Builder(getActivity())) .setTitle(android.R.string.dialog_alert_title) - .setIcon(android.R.drawable.ic_dialog_alert) + .setIconAttribute(android.R.attr.alertDialogIcon) .setCancelable(true) .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { |