From a33c0c74cc5fd5230b555bd1311ba92fb5d81d22 Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Wed, 19 Jan 2011 10:57:19 -0800
Subject: [PATCH] Revert string name change

to prevent churn for the translators, revert the string name change

Change-Id: I22710d810a5f3602ccd53a9cb4d2f31edca572f1
---
 res/layout/widget.xml                              | 2 +-
 res/values/strings.xml                             | 2 +-
 src/com/android/email/provider/WidgetProvider.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 13f76a562..fac3ff5ef 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -53,7 +53,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="-2sp"
-                android:text="@string/widget_all_inbox"
+                android:text="@string/widget_all_mail"
                 android:textSize="14sp"
                 android:textStyle="bold"
                 android:textColor="@android:color/white"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d067458a..17f6b8e84 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1006,7 +1006,7 @@ save attachment.</string>
     <!-- Instruction for how to move to different widget views [CHAR LIMIT=20] -->
     <string name="widget_other_views">Tap icon to change</string>
     <!-- Header for the "Combined Inbox" view (showing mail in all inboxes) [CHAR LIMIT=20] -->
-    <string name="widget_all_inbox">Combined Inbox</string>
+    <string name="widget_all_mail">Combined Inbox</string>
     <!-- Header for the "Unread" widget view (showing all unread mail) [CHAR LIMIT=20] -->
     <string name="widget_unread">Unread</string>
     <!-- Header for the "Starred" widget view (showing all starred mail) [CHAR LIMIT=20] -->
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index b667bafc2..cbc35f07f 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -128,7 +128,7 @@ public class WidgetProvider extends AppWidgetProvider {
      * mail; we rotate between them.  Each ViewType is composed of a selection string and a title.
      */
     public enum ViewType {
-        ALL_INBOX(null, NO_ARGUMENTS, R.string.widget_all_inbox),
+        ALL_INBOX(null, NO_ARGUMENTS, R.string.widget_all_mail),
         UNREAD(MessageColumns.FLAG_READ + "=0", NO_ARGUMENTS, R.string.widget_unread),
         STARRED(Message.ALL_FAVORITE_SELECTION, NO_ARGUMENTS, R.string.widget_starred),
         ACCOUNT(MessageColumns.ACCOUNT_KEY + "=?", new String[1], 0);