Merge "Rename tab "Contacts" to "All""
diff --git a/res/layout-sw580dp/people_activity.xml b/res/layout-sw580dp/people_activity.xml
index 7301d24..a6d9a37 100644
--- a/res/layout-sw580dp/people_activity.xml
+++ b/res/layout-sw580dp/people_activity.xml
@@ -45,9 +45,9 @@
android:layout_marginLeft="40dip"
android:layout_marginTop="24dip" />
- <!-- Contacts -->
+ <!-- All -->
<fragment
- android:id="@+id/contacts_fragment"
+ android:id="@+id/all_fragment"
class="com.android.contacts.list.DefaultContactBrowseListFragment"
android:layout_height="0dip"
android:layout_width="match_parent"
diff --git a/res/layout/people_activity.xml b/res/layout/people_activity.xml
index bcf218b..11431b3 100644
--- a/res/layout/people_activity.xml
+++ b/res/layout/people_activity.xml
@@ -26,9 +26,9 @@
android:layout_height="match_parent"
android:layout_width="match_parent" />
- <!-- Contacts -->
+ <!-- All -->
<fragment
- android:id="@+id/contacts_fragment"
+ android:id="@+id/all_fragment"
class="com.android.contacts.list.DefaultContactBrowseListFragment"
android:layout_height="match_parent"
android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e88440..821e5f8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -384,8 +384,8 @@
<item quantity="other"><xliff:g id="count">%d</xliff:g> found</item>
</plurals>
- <!-- The description text for the contacts tab. Space is limited for this string, so the shorter the better -->
- <string name="contactsIconLabel">Contacts</string>
+ <!-- The description text for the "all contacts" tab. Space is limited for this string, so the shorter the better -->
+ <string name="contactsAllLabel">All</string>
<!-- The description text for the groups tab. Space is limited for this string, so the shorter the better -->
<string name="contactsGroupsLabel">Groups</string>
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index ad66956..19019f4 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -155,7 +155,7 @@
private boolean mOptionsMenuContactsAvailable;
- private DefaultContactBrowseListFragment mContactsFragment;
+ private DefaultContactBrowseListFragment mAllFragment;
private StrequentContactListFragment mFavoritesFragment;
private StrequentContactListFragment mFrequentFragment;
private GroupBrowseListFragment mGroupsFragment;
@@ -171,7 +171,7 @@
private Handler mHandler = new Handler();
private enum TabState {
- FAVORITES, CONTACTS, GROUPS
+ FAVORITES, ALL, GROUPS
}
private TabState mSelectedTab;
@@ -269,13 +269,13 @@
.findFragmentById(R.id.favorites_fragment);
mFrequentFragment = (StrequentContactListFragment) fragmentManager
.findFragmentById(R.id.frequent_fragment);
- mContactsFragment = (DefaultContactBrowseListFragment) fragmentManager
- .findFragmentById(R.id.contacts_fragment);
+ mAllFragment = (DefaultContactBrowseListFragment) fragmentManager
+ .findFragmentById(R.id.all_fragment);
mGroupsFragment = (GroupBrowseListFragment) fragmentManager
.findFragmentById(R.id.groups_fragment);
// Hide all tabs (the current tab will later be reshown once a tab is selected)
final FragmentTransaction transaction = fragmentManager.beginTransaction();
- transaction.hide(mContactsFragment);
+ transaction.hide(mAllFragment);
transaction.hide(mGroupsFragment);
if (mFrequentFragment != null) {
@@ -316,16 +316,16 @@
if (createContentView) {
actionBar.removeAllTabs();
Tab favoritesTab = actionBar.newTab();
- favoritesTab.setText(getString(R.string.strequentList));
+ favoritesTab.setText(getString(R.string.contactsFavoritesLabel));
favoritesTab.setTabListener(new TabChangeListener(mFavoritesFragment,
mFrequentFragment, TabState.FAVORITES));
actionBar.addTab(favoritesTab);
- Tab peopleTab = actionBar.newTab();
- peopleTab.setText(getString(R.string.people));
- peopleTab.setTabListener(new TabChangeListener(mContactsFragment,
- mContactDetailLoaderFragment, TabState.CONTACTS));
- actionBar.addTab(peopleTab);
+ Tab allTab = actionBar.newTab();
+ allTab.setText(getString(R.string.contactsAllLabel));
+ allTab.setTabListener(new TabChangeListener(mAllFragment,
+ mContactDetailLoaderFragment, TabState.ALL));
+ actionBar.addTab(allTab);
Tab groupsTab = actionBar.newTab();
groupsTab.setText(getString(R.string.contactsGroupsLabel));
@@ -399,7 +399,7 @@
mDetailsView.setVisibility(View.GONE);
break;
case GROUPS:
- case CONTACTS:
+ case ALL:
mFavoritesView.setVisibility(View.GONE);
mBrowserView.setVisibility(View.VISIBLE);
mDetailsView.setVisibility(View.VISIBLE);
@@ -541,7 +541,7 @@
}
// Bring the contact list fragment (and detail fragment if applicable) to the front
FragmentTransaction ft = getFragmentManager().beginTransaction();
- ft.show(mContactsFragment);
+ ft.show(mAllFragment);
if (mContactDetailFragment != null) ft.show(mContactDetailFragment);
ft.commit();
clearSearch();
@@ -553,9 +553,9 @@
// If the last selected tab was not the "All contacts" tab, then hide these
// fragments because we need to show favorites or groups.
- if (mSelectedTab != null && !mSelectedTab.equals(TabState.CONTACTS)) {
+ if (mSelectedTab != null && !mSelectedTab.equals(TabState.ALL)) {
FragmentTransaction transaction = getFragmentManager().beginTransaction();
- transaction.hide(mContactsFragment);
+ transaction.hide(mAllFragment);
if (mContactDetailFragment != null) transaction.hide(mContactDetailFragment);
transaction.commit();
}
@@ -1007,7 +1007,7 @@
case FAVORITES:
// TODO: Fall through until we determine what the menu items should be for
// this tab
- case CONTACTS:
+ case ALL:
addContactMenu.setVisible(true);
addGroupMenu.setVisible(false);
break;