ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use proper alert icons on dialogs 

Bug 3364447
Bug 3241281

Change-Id: Ie791d8d5eae26a848de08658a14d6a09d06d0846
This commit is contained in:
Makoto Onuki 2011-01-18 10:14:14 -08:00
parent 2b6d0072df
commit 49518bb360
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/email/activity/AccountFolderList.java
View File

@ -194,7 +194,7 @@ public class AccountFolderList extends Activity implements AccountFolderListFrag
private Dialog createRemoveAccountDialog() {
final Activity activity = this;
return new AlertDialog.Builder(this)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.account_delete_dlg_title)
.setMessage(getString(R.string.account_delete_dlg_instructions_fmt,
mSelectedContextAccount.getDisplayName()))

2
src/com/android/email/activity/DeleteMessageConfirmationDialog.java
View File

@ -65,7 +65,7 @@ public class DeleteMessageConfirmationDialog extends DialogFragment
final Resources res = context.getResources();
final AlertDialog.Builder b = new AlertDialog.Builder(context);
b.setTitle(res.getString(R.string.message_delete_dialog_title))
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setMessage(res.getQuantityString(R.plurals.message_delete_confirm, countMessages))
.setPositiveButton(R.string.okay_action, this)
.setNegativeButton(R.string.cancel_action, null);

6
src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
View File

@ -52,7 +52,7 @@ import android.util.Log;
* conditions.
*/
public class AccountCheckSettingsFragment extends Fragment {
public final static String TAG = "AccountCheckSettingsFragment";
// Debugging flags - for debugging the UI
@ -756,7 +756,7 @@ public class AccountCheckSettingsFragment extends Fragment {
(AccountCheckSettingsFragment) getTargetFragment();
return new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(context.getString(R.string.account_setup_failed_dlg_title))
.setMessage(context.getString(messageId, messageArguments))
.setCancelable(true)
@ -808,7 +808,7 @@ public class AccountCheckSettingsFragment extends Fragment {
(AccountCheckSettingsFragment) getTargetFragment();
return new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(context.getString(R.string.account_setup_security_required_title))
.setMessage(context.getString(
R.string.account_setup_security_policies_required_fmt, hostName))

2
src/com/android/email/activity/setup/AccountSettingsFragment.java
View File

@ -650,7 +650,7 @@ public class AccountSettingsFragment extends PreferenceFragment {
final String name = getArguments().getString(BUNDLE_KEY_ACCOUNT_NAME);
return new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.account_delete_dlg_title)
.setMessage(context.getString(R.string.account_delete_dlg_instructions_fmt, name))
.setPositiveButton(

2
src/com/android/email/activity/setup/AccountSettingsXL.java
View File

@ -720,7 +720,7 @@ public class AccountSettingsXL extends PreferenceActivity {
final boolean isBack = getArguments().getBoolean(BUNDLE_KEY_BACK);
return new AlertDialog.Builder(activity)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(android.R.string.dialog_alert_title)
.setMessage(R.string.account_settings_exit_server_settings)
.setPositiveButton(

2
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -677,7 +677,7 @@ public class AccountSetupBasics extends AccountSetupActivity
final String note = getArguments().getString(BUNDLE_KEY_NOTE);
return new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(android.R.string.dialog_alert_title)
.setMessage(note)
.setPositiveButton(

4
src/com/android/email/activity/setup/AccountSetupOptions.java
View File

@ -47,7 +47,7 @@ import android.widget.Spinner;
import java.io.IOException;
/**
* TODO: Cleanup the manipulation of Account.FLAGS_INCOMPLETE and make sure it's never left set.
* TODO: Cleanup the manipulation of Account.FLAGS_INCOMPLETE and make sure it's never left set.
*/
public class AccountSetupOptions extends AccountSetupActivity implements OnClickListener {
@ -265,7 +265,7 @@ public class AccountSetupOptions extends AccountSetupActivity implements OnClick
runOnUiThread(new Runnable() {
public void run() {
new AlertDialog.Builder(AccountSetupOptions.this)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(getString(R.string.account_setup_failed_dlg_title))
.setMessage(getString(msgResId, args))
.setCancelable(true)

2
src/com/android/email/activity/setup/DuplicateAccountDialogFragment.java
View File

@ -51,7 +51,7 @@ public class DuplicateAccountDialogFragment extends DialogFragment {
String accountName = getArguments().getString(BUNDLE_KEY_ACCOUNT_NAME);
return new AlertDialog.Builder(context)
.setIcon(android.R.drawable.ic_dialog_alert)
.setIconAttribute(android.R.attr.alertDialogIcon)
.setTitle(R.string.account_duplicate_dlg_title)
.setMessage(context.getString(
R.string.account_duplicate_dlg_message_fmt, accountName))