diff options
author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-02-09 18:00:34 -0800 |
---|---|---|
committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-08 10:42:50 -0700 |
commit | 553153391872df5c4f3b7357be9c4611321103be (patch) | |
tree | 595aff9fae25ccf78a2883bc1dd3bd022be5ef28 | |
parent | 567526214eae4157e321372b8eae3f50c91b54b6 (diff) | |
download | android_packages_apps_PhoneCommon-553153391872df5c4f3b7357be9c4611321103be.tar.gz android_packages_apps_PhoneCommon-553153391872df5c4f3b7357be9c4611321103be.tar.bz2 android_packages_apps_PhoneCommon-553153391872df5c4f3b7357be9c4611321103be.zip |
Fix Subscription button text
Subscriptions use wrong button text
Ticket CD-338
Change-Id: I2d3f9c0534a34a0d1654a009ccd1d4a0f9fd082f
-rw-r--r-- | src-ambient/incall/CallMethodInfo.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src-ambient/incall/CallMethodInfo.java b/src-ambient/incall/CallMethodInfo.java index 63f24a8..b68e74d 100644 --- a/src-ambient/incall/CallMethodInfo.java +++ b/src-ambient/incall/CallMethodInfo.java @@ -72,6 +72,8 @@ public class CallMethodInfo { public float mCreditWarn = 0.0f; public PendingIntent mLoginIntent; + private int mCurrencyAmount; + private static CallMethodInfo sEmergencyCallMethod; @Override @@ -166,10 +168,6 @@ public class CallMethodInfo { } } - private boolean isSubscription; - private boolean isCredits; - private int mCurrencyAmmount; - public String getCreditsDescriptionText(Resources r) { String ret = null; CreditInfo ci = this.mProviderCreditInfo; @@ -182,11 +180,11 @@ public class CallMethodInfo { } else { CreditBalance balance = ci.balance; if (balance != null) { - mCurrencyAmmount = (int) balance.balance; + mCurrencyAmount = (int) balance.balance; try { if (balance.currencyCode != null) { Currency currencyCode = Currency.getInstance(balance.currencyCode); - BigDecimal availableCredit = BigDecimal.valueOf(mCurrencyAmmount, + BigDecimal availableCredit = BigDecimal.valueOf(mCurrencyAmount, currencyCode.getDefaultFractionDigits()); @@ -212,14 +210,11 @@ public class CallMethodInfo { } public boolean usesSubscriptions() { - return isSubscription; - } - - public boolean usesCurrency() { - return isCredits; + List<SubscriptionInfo> subscriptionInfos = this.mProviderCreditInfo.subscriptions; + return subscriptionInfos != null && !subscriptionInfos.isEmpty(); } public int getCurrencyAmount() { - return mCurrencyAmmount; + return mCurrencyAmount; } } |