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

Merge "Linkify and show URL's if they are incuded in ALERT messages" into jb-ub-mail

Browse Source
This commit is contained in:
Marc Blank 2012-07-27 15:50:07 -07:00 committed by Android (Google) Code Review
commit 446e2c109f
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/dimensions.xml
View File

@ -50,4 +50,9 @@
<dimen name="replystate_margin_left">8dip</dimen>
<dimen name="replystate_margin_right">0dip</dimen>
<dimen name="replystate_margin_top">10sp</dimen>
<!-- Notification dialog -->
<dimen name="dialog_text_size">10sp</dimen>
<dimen name="dialog_padding_left">10sp</dimen>
<dimen name="dialog_padding_other">4sp</dimen>
</resources>

22
src/com/android/email/activity/setup/AccountSettings.java
View File

@ -32,10 +32,15 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.text.SpannableString;
import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
import android.util.Log;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.TextView;
import com.android.email.R;
import com.android.email.activity.ActivityHelper;
@ -842,8 +847,21 @@ public class AccountSettings extends PreferenceActivity {
b.setTitle(R.string.account_settings_login_dialog_title);
b.setIconAttribute(android.R.attr.alertDialogIcon);
if (mReason != null) {
b.setMessage(res.getString(R.string.account_settings_login_dialog_reason_fmt,
accountName, mReason));
final TextView message = new TextView(context);
String alert = res.getString(
R.string.account_settings_login_dialog_reason_fmt, accountName, mReason);
SpannableString spannableAlertString = new SpannableString(alert);
Linkify.addLinks(spannableAlertString, Linkify.WEB_URLS);
message.setText(spannableAlertString);
// There must be a better way than specifying size/padding this way
// It does work and look right, though
int textSize = res.getDimensionPixelSize(R.dimen.dialog_text_size);
message.setTextSize(textSize);
int paddingLeft = res.getDimensionPixelSize(R.dimen.dialog_padding_left);
int paddingOther = res.getDimensionPixelSize(R.dimen.dialog_padding_other);
message.setPadding(paddingLeft, paddingOther, paddingOther, paddingOther);
message.setMovementMethod(LinkMovementMethod.getInstance());
b.setView(message);
} else {
b.setMessage(res.getString(R.string.account_settings_login_dialog_content_fmt,
accountName));