commit d58b04f66f5e559ba6f654c36fdd5da15c3f9bc8
author Makoto Onuki <omakoto@google.com> Mon Aug 15 15:52:59 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 15 15:52:59 2011 -0700
tree a76416b34f27c2663caccb3ee793eab65f3553ff
parent 5bbb95cac54f5695ea8955f9ee16155dad4d4604
parent 9d2a74ef7b1817ad0708e41151358f5899aeeb67

Merge "New tab order: GROUPS / ALL / FAVORITES"

src/com/android/contacts/activities/ActionBarAdapter.java

diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 0c0841c..09f4f1c 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -77,16 +77,19 @@
     private boolean mShowHomeIcon;
 
     public enum TabState {
-        FAVORITES, ALL, GROUPS;
+        GROUPS,
+        ALL,
+        FAVORITES;
 
         public static TabState fromInt(int value) {
-            switch (value) {
-                case 0:
-                    return FAVORITES;
-                case 1:
-                    return ALL;
-                case 2:
-                    return GROUPS;
+            if (GROUPS.ordinal() == value) {
+                return GROUPS;
+            }
+            if (ALL.ordinal() == value) {
+                return ALL;
+            }
+            if (FAVORITES.ordinal() == value) {
+                return FAVORITES;
             }
             throw new IllegalArgumentException("Invalid value: " + value);
         }
@@ -126,9 +129,9 @@
         mActionBar.setCustomView(customSearchView, layoutParams);
 
         // Set up tabs
-        addTab(TabState.FAVORITES, mContext.getString(R.string.contactsFavoritesLabel));
-        addTab(TabState.ALL, mContext.getString(R.string.contactsAllLabel));
         addTab(TabState.GROUPS, mContext.getString(R.string.contactsGroupsLabel));
+        addTab(TabState.ALL, mContext.getString(R.string.contactsAllLabel));
+        addTab(TabState.FAVORITES, mContext.getString(R.string.contactsFavoritesLabel));
     }
 
     public void initialize(Bundle savedState, ContactsRequest request) {