diff options
| author | Android Dialer <noreply@google.com> | 2017-09-22 21:15:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-22 21:15:14 +0000 |
| commit | 58e5fa9031e78f2eff3c10c8bb71ee172ac80e29 (patch) | |
| tree | 863c50e3e1380092e0508442d28d0f661fbf74be | |
| parent | 97533ee1d712878624211db84958f9688d90fe8e (diff) | |
| parent | 317eb36669867809aa81f196bdae3f46093d2285 (diff) | |
Merge "Delay commiting of promo fragment until user visits the contacts tab"
am: 317eb36669
Change-Id: I901cfe439b4508ee46806f1304bf40e18e5ee8ed
| -rw-r--r-- | java/com/android/dialer/app/DialtactsActivity.java | 5 | ||||
| -rw-r--r-- | 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> |