summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathanielWaggoner <nwaggoner@cyngn.com>2016-05-10 16:04:28 -0700
committerNathaniel Waggoner <nwaggoner@cyngn.com>2016-05-13 14:31:37 -0700
commiteb8962e3eac3d4edd5e8fda9cd4f95a80501d404 (patch)
tree6a8985aa4f946867c4700e1810ac5ae460fd2473
parent44c0cf4c0931a5649573819b383ccd65325bb1b0 (diff)
downloadpackages_apps_InCallUI-eb8962e3eac3d4edd5e8fda9cd4f95a80501d404.tar.gz
packages_apps_InCallUI-eb8962e3eac3d4edd5e8fda9cd4f95a80501d404.tar.bz2
packages_apps_InCallUI-eb8962e3eac3d4edd5e8fda9cd4f95a80501d404.zip
Best fix for the case where ModButtonPresenter UI wasn't updating
properly in onResume cases. NOTES-122 Change-Id: I8dab2c5d4d77f63e868ff950c523c3f13fc4cc02 (cherry picked from commit 77f56a511ddd14abfe96f0ca363e2a1749af1a5f)
-rw-r--r--src/com/android/incallui/ModButtonFragment.java2
-rw-r--r--src/com/android/incallui/ModButtonPresenter.java8
2 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/incallui/ModButtonFragment.java b/src/com/android/incallui/ModButtonFragment.java
index e3cda71c..271af48d 100644
--- a/src/com/android/incallui/ModButtonFragment.java
+++ b/src/com/android/incallui/ModButtonFragment.java
@@ -129,7 +129,7 @@ public class ModButtonFragment
@Override
public void onResume() {
super.onResume();
-
+ getPresenter().getPreferredLinks();
updateColors();
}
diff --git a/src/com/android/incallui/ModButtonPresenter.java b/src/com/android/incallui/ModButtonPresenter.java
index d70f97c2..338f3c81 100644
--- a/src/com/android/incallui/ModButtonPresenter.java
+++ b/src/com/android/incallui/ModButtonPresenter.java
@@ -148,11 +148,7 @@ public class ModButtonPresenter extends Presenter<ModButtonPresenter.ModButtonUi
mCall = null;
}
- if (mCall != null && mPrimaryContactInfo == null) {
- startContactInfoSearch(mCall, newState == InCallState.INCOMING);
- getPreferredLinks();
- }
-
+ getPreferredLinks();
updateUi(newState, mCall);
}
@@ -493,7 +489,7 @@ public class ModButtonPresenter extends Presenter<ModButtonPresenter.ModButtonUi
}
public void getPreferredLinks() {
- if (mCall != null) {
+ if (mCall != null && (mNoteDeepLink == null || !mNoteDeepLink.getAlreadyHasContent())) {
Uri callUri = DeepLinkIntegrationManager.generateCallUri(mCall.getNumber(),
mCall.getCreateTimeMillis());
DeepLinkIntegrationManager.getInstance().getPreferredLinksFor(mNoteDeepLinkCallback,