diff options
| author | Stephen Bird <sbird@cyngn.com> | 2016-03-07 11:54:44 -0800 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-08 10:42:51 -0700 |
| commit | 27e78ce4d5350e006e74966f9dc864ef3401a954 (patch) | |
| tree | 288b000cf665b39cb2f4a4a7bb59645c74d4aaa4 | |
| parent | a7c8e4172648186cd86719b57c5cf3d4392944a3 (diff) | |
| download | android_packages_apps_PhoneCommon-27e78ce4d5350e006e74966f9dc864ef3401a954.tar.gz android_packages_apps_PhoneCommon-27e78ce4d5350e006e74966f9dc864ef3401a954.tar.bz2 android_packages_apps_PhoneCommon-27e78ce4d5350e006e74966f9dc864ef3401a954.zip | |
Prioritize credits over subscriptions.
If the user has any credits. We want to show those over
subscriptions.
Change-Id: I1505c37ff2ba1260449278c202f87f38a33d8b48
Ticket: CD-465
| -rw-r--r-- | src-ambient/incall/CallMethodInfo.java | 12 | ||||
| -rw-r--r-- | src-ambient/incall/CreditBarHelper.java | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src-ambient/incall/CallMethodInfo.java b/src-ambient/incall/CallMethodInfo.java index 29352c6..4fa62a3 100644 --- a/src-ambient/incall/CallMethodInfo.java +++ b/src-ambient/incall/CallMethodInfo.java @@ -322,9 +322,17 @@ public class CallMethodInfo { } } - public boolean usesSubscriptions() { + public boolean showSubscriptions() { + // If the user has > 0 credits, we don't want to show the subscription. List<SubscriptionInfo> subscriptionInfos = this.mProviderCreditInfo.subscriptions; - return subscriptionInfos != null && !subscriptionInfos.isEmpty(); + CreditBalance creditBalance = this.mProviderCreditInfo.balance; + + boolean hasSubscriptions = subscriptionInfos != null && !subscriptionInfos.isEmpty(); + + boolean hasCredits = creditBalance != null && creditBalance.currencyCode != null + && creditBalance.balance > 0; + + return !hasCredits && hasSubscriptions; } public int getCurrencyAmount() { diff --git a/src-ambient/incall/CreditBarHelper.java b/src-ambient/incall/CreditBarHelper.java index 62116c1..2a55eb6 100644 --- a/src-ambient/incall/CreditBarHelper.java +++ b/src-ambient/incall/CreditBarHelper.java @@ -74,7 +74,7 @@ public class CreditBarHelper { } else { if (cmi.mIsAuthenticated) { button = cmi.mManageCreditIntent; - if (cmi.usesSubscriptions()) { + if (cmi.showSubscriptions()) { buttonText = cmi.mSubscriptionButtonText; } else { if (cmi.getCurrencyAmount() <= cmi.mCreditWarn) { |