summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-02-01 06:08:59 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2015-02-01 06:08:59 -0800
commit169d1ec5216f5bf37e99516a6a772c5347f2263b (patch)
tree32cfd1bdc59eee81e9d8de6ed55f27e4a9ca9b6d
parent4add5cdd503a804ba6c58c3d02ec49014ede764f (diff)
parent016ea691651f8bab7f61ab0422ab178096357d4b (diff)
downloadandroid_packages_apps_InCallUI-169d1ec5216f5bf37e99516a6a772c5347f2263b.tar.gz
android_packages_apps_InCallUI-169d1ec5216f5bf37e99516a6a772c5347f2263b.tar.bz2
android_packages_apps_InCallUI-169d1ec5216f5bf37e99516a6a772c5347f2263b.zip
Merge "InCallUI: Display operator name in select phone account dialog"
-rw-r--r--src/com/android/incallui/SelectPhoneAccountDialogFragment.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/incallui/SelectPhoneAccountDialogFragment.java b/src/com/android/incallui/SelectPhoneAccountDialogFragment.java
index 097dd893..4fba17ae 100644
--- a/src/com/android/incallui/SelectPhoneAccountDialogFragment.java
+++ b/src/com/android/incallui/SelectPhoneAccountDialogFragment.java
@@ -42,6 +42,7 @@ import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.TextView;
+import com.android.contacts.common.MoreContactUtils;
import com.android.contacts.common.R;
import com.android.internal.telephony.PhoneConstants;
@@ -225,7 +226,12 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment {
PhoneAccountHandle accountHandle = getItem(position);
PhoneAccount account = mTelecomManager.getPhoneAccount(accountHandle);
- holder.textView.setText(account.getLabel());
+ if (MoreContactUtils.shouldShowOperator(mContext)) {
+ Long subId = Long.parseLong(accountHandle.getId());
+ holder.textView.setText(MoreContactUtils.getNetworkSpnName(mContext, subId));
+ } else {
+ holder.textView.setText(account.getLabel());
+ }
holder.imageView.setImageDrawable(account.getIcon(mContext));
return rowView;
}