commit bf72a6f3f484cf05deee5ea4bb15fbd11bd15919
author Nancy Chen <nancychen@google.com> Thu Jul 02 00:35:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 02 00:35:58 2015 +0000
tree 8bac1aacbbd42b4f7d492c65879c95ba8983ea72
parent dca5d94556a1fe574f9f4fc269594660f9142ab1
parent e343d33c8757a7eb41bfd07f21fa2af0c5152cf6

am e343d33c: Merge "Ensure the EXTRA_SHOW_TAB is checked for all new intents." into mnc-dev

* commit 'e343d33c8757a7eb41bfd07f21fa2af0c5152cf6':
  Ensure the EXTRA_SHOW_TAB is checked for all new intents.

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index b8a1d4d..ba1b8d1 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -545,6 +545,14 @@
         prepareVoiceSearchButton();
         mDialerDatabaseHelper.startSmartDialUpdateThread();
         mFloatingActionButtonController.align(getFabAlignment(), false /* animate */);
+
+        if (getIntent().hasExtra(EXTRA_SHOW_TAB)) {
+            int index = getIntent().getIntExtra(EXTRA_SHOW_TAB, ListsFragment.TAB_INDEX_SPEED_DIAL);
+            if (index < mListsFragment.getTabCount()) {
+                mListsFragment.showTab(index);
+            }
+        }
+
         Trace.endSection();
     }
 
@@ -906,11 +914,6 @@
         mStateSaved = false;
         displayFragment(newIntent);
 
-        if (newIntent.hasExtra(EXTRA_SHOW_TAB)) {
-            mListsFragment.showTab(
-                    getIntent().getIntExtra(EXTRA_SHOW_TAB, mListsFragment.TAB_INDEX_SPEED_DIAL));
-        }
-
         invalidateOptionsMenu();
     }
 

src/com/android/dialer/list/ListsFragment.java

diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index e45da0c..33c9776 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -347,6 +347,10 @@
         return mRemoveView;
     }
 
+    public int getTabCount() {
+        return mViewPagerAdapter.getCount();
+    }
+
     private int getRtlPosition(int position) {
         if (DialerUtils.isRtl()) {
             return mViewPagerAdapter.getCount() - 1 - position;