PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6fb425e2: am eefa61ed: Merge "Settings: Use ICS alert drawable"

Browse Source 
* commit '6fb425e2805a1c27c048fc954d402f4612cbf74d':
  Settings: Use ICS alert drawable
This commit is contained in:
Jean-Baptiste Queru
2012-08-13 16:03:15 -07:00
committed by Android Git Automerger
parent 70372dcfc3 6fb425e280
commit 9e8e9a1783
12 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/AccessibilitySettings.java
View File

@@ -766,7 +766,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
} }
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(title) .setTitle(title)
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(message) .setMessage(message)
.setCancelable(true) .setCancelable(true)
.setPositiveButton(android.R.string.ok, this) .setPositiveButton(android.R.string.ok, this)

4
src/com/android/settings/CredentialStorage.java
View File

@@ -235,7 +235,7 @@ public final class CredentialStorage extends Activity {
private ResetDialog() { private ResetDialog() {
AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this) AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
.setTitle(android.R.string.dialog_alert_title) .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) .setMessage(R.string.credentials_reset_hint)
.setPositiveButton(android.R.string.ok, this) .setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this) .setNegativeButton(android.R.string.cancel, this)
@@ -305,7 +305,7 @@ public final class CredentialStorage extends Activity {
private ConfigureKeyGuardDialog() { private ConfigureKeyGuardDialog() {
AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this) AlertDialog dialog = new AlertDialog.Builder(CredentialStorage.this)
.setTitle(android.R.string.dialog_alert_title) .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) .setMessage(R.string.credentials_configure_lock_screen_hint)
.setPositiveButton(android.R.string.ok, this) .setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this) .setNegativeButton(android.R.string.cancel, this)

2
src/com/android/settings/CryptKeeperSettings.java
View File

@@ -91,7 +91,7 @@ public class CryptKeeperSettings extends Fragment {
// TODO replace (or follow) this dialog with an explicit launch into password UI // TODO replace (or follow) this dialog with an explicit launch into password UI
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(getActivity())
.setTitle(R.string.crypt_keeper_dialog_need_password_title) .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) .setMessage(R.string.crypt_keeper_dialog_need_password_message)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)
.create() .create()

2
src/com/android/settings/DevelopmentSettings.java
View File

@@ -819,7 +819,7 @@ public class DevelopmentSettings extends PreferenceFragment
mAdbDialog = new AlertDialog.Builder(getActivity()).setMessage( mAdbDialog = new AlertDialog.Builder(getActivity()).setMessage(
getActivity().getResources().getString(R.string.adb_warning_message)) getActivity().getResources().getString(R.string.adb_warning_message))
.setTitle(R.string.adb_warning_title) .setTitle(R.string.adb_warning_title)
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setPositiveButton(android.R.string.yes, this) .setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this) .setNegativeButton(android.R.string.no, this)
.show(); .show();

2
src/com/android/settings/PrivacySettings.java
View File

@@ -119,7 +119,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
// TODO: DialogFragment? // TODO: DialogFragment?
mConfirmDialog = new AlertDialog.Builder(getActivity()).setMessage(msg) mConfirmDialog = new AlertDialog.Builder(getActivity()).setMessage(msg)
.setTitle(R.string.backup_erase_dialog_title) .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) .setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, this) .setNegativeButton(android.R.string.cancel, this)
.show(); .show();

14
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -826,7 +826,7 @@ public class InstalledAppDetails extends Fragment
case DLG_CLEAR_DATA: case DLG_CLEAR_DATA:
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.clear_data_dlg_title)) .setTitle(getActivity().getText(R.string.clear_data_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.clear_data_dlg_text)) .setMessage(getActivity().getText(R.string.clear_data_dlg_text))
.setPositiveButton(R.string.dlg_ok, .setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@@ -840,7 +840,7 @@ public class InstalledAppDetails extends Fragment
case DLG_FACTORY_RESET: case DLG_FACTORY_RESET:
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title)) .setTitle(getActivity().getText(R.string.app_factory_reset_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text)) .setMessage(getActivity().getText(R.string.app_factory_reset_dlg_text))
.setPositiveButton(R.string.dlg_ok, .setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@@ -854,7 +854,7 @@ public class InstalledAppDetails extends Fragment
case DLG_APP_NOT_FOUND: case DLG_APP_NOT_FOUND:
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_not_found_dlg_title)) .setTitle(getActivity().getText(R.string.app_not_found_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_not_found_dlg_title)) .setMessage(getActivity().getText(R.string.app_not_found_dlg_title))
.setNeutralButton(getActivity().getText(R.string.dlg_ok), .setNeutralButton(getActivity().getText(R.string.dlg_ok),
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@@ -867,7 +867,7 @@ public class InstalledAppDetails extends Fragment
case DLG_CANNOT_CLEAR_DATA: case DLG_CANNOT_CLEAR_DATA:
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.clear_failed_dlg_title)) .setTitle(getActivity().getText(R.string.clear_failed_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.clear_failed_dlg_text)) .setMessage(getActivity().getText(R.string.clear_failed_dlg_text))
.setNeutralButton(R.string.dlg_ok, .setNeutralButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@@ -881,7 +881,7 @@ public class InstalledAppDetails extends Fragment
case DLG_FORCE_STOP: case DLG_FORCE_STOP:
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.force_stop_dlg_title)) .setTitle(getActivity().getText(R.string.force_stop_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.force_stop_dlg_text)) .setMessage(getActivity().getText(R.string.force_stop_dlg_text))
.setPositiveButton(R.string.dlg_ok, .setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@@ -897,14 +897,14 @@ public class InstalledAppDetails extends Fragment
getOwner().getMoveErrMsg(moveErrorCode)); getOwner().getMoveErrMsg(moveErrorCode));
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.move_app_failed_dlg_title)) .setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(msg) .setMessage(msg)
.setNeutralButton(R.string.dlg_ok, null) .setNeutralButton(R.string.dlg_ok, null)
.create(); .create();
case DLG_DISABLE: case DLG_DISABLE:
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getText(R.string.app_disable_dlg_title)) .setTitle(getActivity().getText(R.string.app_disable_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getText(R.string.app_disable_dlg_text)) .setMessage(getActivity().getText(R.string.app_disable_dlg_text))
.setPositiveButton(R.string.dlg_ok, .setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {

2
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -507,7 +507,7 @@ public class RunningServiceDetails extends Fragment
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setTitle(getActivity().getString(R.string.runningservicedetails_stop_dlg_title)) .setTitle(getActivity().getString(R.string.runningservicedetails_stop_dlg_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getActivity().getString(R.string.runningservicedetails_stop_dlg_text)) .setMessage(getActivity().getString(R.string.runningservicedetails_stop_dlg_text))
.setPositiveButton(R.string.dlg_ok, .setPositiveButton(R.string.dlg_ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {

2
src/com/android/settings/bluetooth/Utils.java
View File

@@ -93,7 +93,7 @@ final class Utils {
Context activity = manager.getForegroundActivity(); Context activity = manager.getForegroundActivity();
if(manager.isForegroundActivity()) { if(manager.isForegroundActivity()) {
new AlertDialog.Builder(activity) new AlertDialog.Builder(activity)
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.bluetooth_error_title) .setTitle(R.string.bluetooth_error_title)
.setMessage(message) .setMessage(message)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)

2
src/com/android/settings/inputmethod/InputMethodPreference.java
View File

@@ -253,7 +253,7 @@ public class InputMethodPreference extends CheckBoxPreference
} }
mDialog = (new AlertDialog.Builder(mFragment.getActivity())) mDialog = (new AlertDialog.Builder(mFragment.getActivity()))
.setTitle(android.R.string.dialog_alert_title) .setTitle(android.R.string.dialog_alert_title)
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setCancelable(true) .setCancelable(true)
.setPositiveButton(android.R.string.ok, .setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {

2
src/com/android/settings/inputmethod/SpellCheckersSettings.java
View File

@@ -122,7 +122,7 @@ public class SpellCheckersSettings extends SettingsPreferenceFragment
} }
mDialog = (new AlertDialog.Builder(getActivity())) mDialog = (new AlertDialog.Builder(getActivity()))
.setTitle(android.R.string.dialog_alert_title) .setTitle(android.R.string.dialog_alert_title)
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setCancelable(true) .setCancelable(true)
.setPositiveButton(android.R.string.ok, .setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {

2
src/com/android/settings/quicklaunch/QuickLaunchSettings.java
View File

@@ -144,7 +144,7 @@ public class QuickLaunchSettings extends PreferenceActivity implements
// Create the dialog for clearing a shortcut // Create the dialog for clearing a shortcut
return new AlertDialog.Builder(this) return new AlertDialog.Builder(this)
.setTitle(getString(R.string.quick_launch_clear_dialog_title)) .setTitle(getString(R.string.quick_launch_clear_dialog_title))
.setIcon(android.R.drawable.ic_dialog_alert) .setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(getString(R.string.quick_launch_clear_dialog_message, .setMessage(getString(R.string.quick_launch_clear_dialog_message,
mClearDialogShortcut, mClearDialogBookmarkTitle)) mClearDialogShortcut, mClearDialogBookmarkTitle))
.setPositiveButton(R.string.quick_launch_clear_ok_button, this) .setPositiveButton(R.string.quick_launch_clear_ok_button, this)

2
src/com/android/settings/tts/TextToSpeechSettings.java
View File

@@ -323,7 +323,7 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment implements
Log.i(TAG, "Displaying data alert for :" + key); Log.i(TAG, "Displaying data alert for :" + key);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(android.R.string.dialog_alert_title); builder.setTitle(android.R.string.dialog_alert_title);
builder.setIcon(android.R.drawable.ic_dialog_alert); builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setMessage(getActivity().getString( builder.setMessage(getActivity().getString(
R.string.tts_engine_security_warning, mEnginesHelper.getEngineInfo(key).label)); R.string.tts_engine_security_warning, mEnginesHelper.getEngineInfo(key).label));
builder.setCancelable(true); builder.setCancelable(true);