diff --git a/res/drawable/btn_email_focused_63.png b/res/drawable/btn_email_focused_63.png
deleted file mode 100755
index f0cb73e8e..000000000
Binary files a/res/drawable/btn_email_focused_63.png and /dev/null differ
diff --git a/res/drawable/btn_email_pressed_63.png b/res/drawable/btn_email_pressed_63.png
deleted file mode 100755
index f89edef81..000000000
Binary files a/res/drawable/btn_email_pressed_63.png and /dev/null differ
diff --git a/res/drawable/btn_icon_bg_focused.9.png b/res/drawable/btn_icon_bg_focused.9.png
new file mode 100755
index 000000000..81857f4d1
Binary files /dev/null and b/res/drawable/btn_icon_bg_focused.9.png differ
diff --git a/res/drawable/btn_icon_bg_pressed.9.png b/res/drawable/btn_icon_bg_pressed.9.png
new file mode 100755
index 000000000..9201624d2
Binary files /dev/null and b/res/drawable/btn_icon_bg_pressed.9.png differ
diff --git a/res/drawable/btn_prev_next.xml b/res/drawable/btn_prev_next.xml
index f65e9f21d..788fed0ed 100644
--- a/res/drawable/btn_prev_next.xml
+++ b/res/drawable/btn_prev_next.xml
@@ -19,6 +19,6 @@
-->
- - %d unread (%s)
+
+
+ - %d unread (%s)
+
+
+ - %d unread (%s)
+
+
+
+
+
+
+ - in %d accounts
+
+ - in %d accounts
+
+
Inbox
@@ -146,10 +165,6 @@
Open
Save
-
- Previous
-
- Next
Attachment saved to SD card as %s.
diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 3c10fceec..2bbc3efcd 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -60,10 +60,7 @@ import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.view.View.OnClickListener;
-import android.webkit.CacheManager;
-import android.webkit.UrlInterceptHandler;
import android.webkit.WebView;
-import android.webkit.CacheManager.CacheResult;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -82,7 +79,7 @@ import java.util.Random;
import java.util.regex.Matcher;
public class MessageView extends Activity
- implements UrlInterceptHandler, OnClickListener {
+ implements OnClickListener {
private static final String EXTRA_ACCOUNT = "com.android.email.MessageView_account";
private static final String EXTRA_FOLDER = "com.android.email.MessageView_folder";
private static final String EXTRA_MESSAGE = "com.android.email.MessageView_message";
@@ -325,8 +322,6 @@ public class MessageView extends Activity
findViewById(R.id.delete).setOnClickListener(this);
findViewById(R.id.show_pictures).setOnClickListener(this);
- // UrlInterceptRegistry.registerHandler(this);
-
mMessageContentView.getSettings().setBlockNetworkImage(true);
mMessageContentView.getSettings().setSupportZoom(false);
@@ -656,26 +651,6 @@ public class MessageView extends Activity
return true;
}
- public CacheResult service(String url, Map headers) {
- String prefix = "http://cid/";
- if (url.startsWith(prefix)) {
- try {
- String contentId = url.substring(prefix.length());
- final Part part = MimeUtility.findPartByContentId(mMessage, "<" + contentId + ">");
- if (part != null) {
- CacheResult cr = new CacheManager.CacheResult();
- // TODO looks fixed in Mainline, cr.setInputStream
- // part.getBody().writeTo(cr.getStream());
- return cr;
- }
- }
- catch (Exception e) {
- // TODO
- }
- }
- return null;
- }
-
private Bitmap getPreviewIcon(Attachment attachment) {
try {
return BitmapFactory.decodeStream(
diff --git a/src/com/android/email/service/MailService.java b/src/com/android/email/service/MailService.java
index 27e3cfd05..b4f6a1046 100644
--- a/src/com/android/email/service/MailService.java
+++ b/src/com/android/email/service/MailService.java
@@ -213,7 +213,9 @@ public class MailService extends Service {
Intent i = new Intent(context, Accounts.class);
PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0);
notif.setLatestEventInfo(context, getString(R.string.notification_new_title),
- getString(R.string.notification_new_multi_account_fmt,
+ getResources().
+ getQuantityString(R.plurals.notification_new_multi_account_fmt,
+ accountsWithNewMail.size(),
accountsWithNewMail.size()), pi);
} else {
Account account1 = accountsWithNewMail.keySet().iterator().next();
@@ -221,7 +223,9 @@ public class MailService extends Service {
Intent i = FolderMessageList.actionHandleAccountIntent(context, account1, Email.INBOX);
PendingIntent pi = PendingIntent.getActivity(context, 0, i, 0);
notif.setLatestEventInfo(context, getString(R.string.notification_new_title),
- getString(R.string.notification_new_one_account_fmt, totalNewMails,
+ getResources().
+ getQuantityString(R.plurals.notification_new_one_account_fmt,
+ totalNewMails, totalNewMails,
account1.getDescription()), pi);
vibrate = account1.isVibrate();
ringtone = account1.getRingtone();