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

am a33c0c74: Revert string name change

Browse Source 
* commit 'a33c0c74cc5fd5230b555bd1311ba92fb5d81d22':
  Revert string name change
This commit is contained in:
Todd Kennedy 2011-01-19 16:37:16 -08:00 committed by Android Git Automerger
commit ff69fdec8f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/widget.xml
View File

@ -53,7 +53,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-2sp" android:layout_marginTop="-2sp"
android:text="@string/widget_all_inbox" android:text="@string/widget_all_mail"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold" android:textStyle="bold"
android:textColor="@android:color/white" android:textColor="@android:color/white"

2
res/values/strings.xml
View File

@ -1006,7 +1006,7 @@ save attachment.</string>
<!-- Instruction for how to move to different widget views [CHAR LIMIT=20] --> <!-- Instruction for how to move to different widget views [CHAR LIMIT=20] -->
<string name="widget_other_views">Tap icon to change</string> <string name="widget_other_views">Tap icon to change</string>
<!-- Header for the "Combined Inbox" view (showing mail in all inboxes) [CHAR LIMIT=20] --> <!-- 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] --> <!-- Header for the "Unread" widget view (showing all unread mail) [CHAR LIMIT=20] -->
<string name="widget_unread">Unread</string> <string name="widget_unread">Unread</string>
<!-- Header for the "Starred" widget view (showing all starred mail) [CHAR LIMIT=20] --> <!-- Header for the "Starred" widget view (showing all starred mail) [CHAR LIMIT=20] -->

2
src/com/android/email/provider/WidgetProvider.java
View File

@ -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. * mail; we rotate between them. Each ViewType is composed of a selection string and a title.
*/ */
public enum ViewType { 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), UNREAD(MessageColumns.FLAG_READ + "=0", NO_ARGUMENTS, R.string.widget_unread),
STARRED(Message.ALL_FAVORITE_SELECTION, NO_ARGUMENTS, R.string.widget_starred), STARRED(Message.ALL_FAVORITE_SELECTION, NO_ARGUMENTS, R.string.widget_starred),
ACCOUNT(MessageColumns.ACCOUNT_KEY + "=?", new String[1], 0); ACCOUNT(MessageColumns.ACCOUNT_KEY + "=?", new String[1], 0);