From f8c23e67f17c5b7142bf4ab846f1b73e228c9f3d Mon Sep 17 00:00:00 2001
From: Android Dialer <noreply@google.com>
Date: Fri, 22 Sep 2017 09:48:22 -0700
Subject: Delay commiting of promo fragment until user visits the contacts tab

Also fixes an issue where if the promo is shown after the dialpad or search UI is brought up then the promo will be added to the bottom of those UIs.

Bug: 64491095
Test: manual
PiperOrigin-RevId: 169700496
Change-Id: I76a1aa977df623964b843d8e4b20146ba7c2f874
---
 java/com/android/dialer/app/DialtactsActivity.java                 | 5 +++--
 java/com/android/dialer/app/voicemail/error/res/values/strings.xml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/com/android/dialer/app/DialtactsActivity.java b/java/com/android/dialer/app/DialtactsActivity.java
index 08adeab7c..00d28fe68 100644
--- a/java/com/android/dialer/app/DialtactsActivity.java
+++ b/java/com/android/dialer/app/DialtactsActivity.java
@@ -695,7 +695,8 @@ public class DialtactsActivity extends TransactionSafeActivity
   }
 
   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 @@ public class DialtactsActivity extends TransactionSafeActivity
     }
     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 @@ public class DialtactsActivity extends TransactionSafeActivity
       mListsFragment.sendScreenViewForCurrentPosition();
       mListsFragment.setUserVisibleHint(true);
     }
+    onPageSelected(mListsFragment.getCurrentTabIndex());
 
     mActionBarController.onSearchUiExited();
   }
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 42d31a4aa..3917cf8a2 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 @@ Si no acepta todos estos términos y condiciones, no use el buzón de voz visual
 
   <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>
-- 
cgit v1.2.3