commit 317eb36669867809aa81f196bdae3f46093d2285
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 22 21:09:08 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 22 21:09:08 2017 +0000
tree 55786cdc394a3deee57c39807159101288bf0fbf
parent 07b9b300ffea967ef7a483e872418c7480f3b600
parent f8c23e67f17c5b7142bf4ab846f1b73e228c9f3d

Merge "Delay commiting of promo fragment until user visits the contacts tab"

java/com/android/dialer/app/DialtactsActivity.java

diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 08adeab..00d28fe 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -695,7 +695,8 @@
   }
 
   public boolean inAllContactsTab() {
-    return mListsFragment.getCurrentTabIndex() == DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS;
+    return mListsFragment.getUserVisibleHint()
+        && mListsFragment.getCurrentTabIndex() == DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS;
   }
 
   @Override
@@ -1268,7 +1269,6 @@
     }
     mFloatingActionButtonController.scaleIn(FAB_SCALE_IN_DELAY_MS);
     onPageScrolled(mListsFragment.getCurrentTabIndex(), 0 /* offset */, 0 /* pixelOffset */);
-    onPageSelected(mListsFragment.getCurrentTabIndex());
 
     final FragmentTransaction transaction = getFragmentManager().beginTransaction();
     if (mSmartDialSearchFragment != null) {
@@ -1291,6 +1291,7 @@
       mListsFragment.sendScreenViewForCurrentPosition();
       mListsFragment.setUserVisibleHint(true);
     }
+    onPageSelected(mListsFragment.getCurrentTabIndex());
 
     mActionBarController.onSearchUiExited();
   }

java/com/android/dialer/app/voicemail/error/res/values/strings.xml

diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
index 42d31a4..3917cf8 100644
--- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
+++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml
@@ -179,7 +179,7 @@
 
   <string name="dialer_terms_and_conditions_learn_more">Learn more</string>
 
-  <!-- TODO: STOP SHIP, get real url, b/65734734 -->
+  <!-- TODO(mdooley): STOP SHIP, get real url, b/65734734 -->
   <string translatable="false" name="dialer_terms_and_conditions_learn_more_url">https://www.google.com</string>
 
   <string translatable="false" name="verizon_terms_and_conditions_policy_url">http://www.verizon.com/about/privacy/policy/</string>