commit b9bd549d7bbb74411c27cea332b5c86250cc48a4
author Brian Attwell <brianattwell@google.com> Fri Oct 17 20:45:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 17 20:45:13 2014 +0000
tree ba762f39f6d3477bd8dcfe9ca3affbf7cf93678a
parent d9ce069a8d6d240c8347919b7ecba6f5fc74b461
parent 9203788d3f55e84d55db4c5a87bbbf1fa1e36b43

Merge "Map MenuItems to ViewPager tabs correctly in RTL" into lmp-mr1-dev

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

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 9f25e4e..ba77438 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -572,7 +572,7 @@
 
     private void showEmptyStateForTab(int tab) {
         if (mContactsUnavailableFragment != null) {
-            switch (tab) {
+            switch (getTabPositionForTextDirection(tab)) {
                 case TabState.FAVORITES:
                     mContactsUnavailableFragment.setMessageText(
                             R.string.listTotalAllContactsZeroStarred, -1);
@@ -1022,7 +1022,7 @@
             clearFrequentsMenu.setVisible(false);
             helpMenu.setVisible(false);
         } else {
-            switch (mActionBarAdapter.getCurrentTab()) {
+            switch (getTabPositionForTextDirection(mActionBarAdapter.getCurrentTab())) {
                 case TabState.FAVORITES:
                     contactsFilterMenu.setVisible(false);
                     clearFrequentsMenu.setVisible(hasFrequents());