summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2015-02-12 12:39:34 -0800
committerSanket Padawe <sanketpadawe@google.com>2015-02-12 12:39:34 -0800
commit7e21fa5ab4f867263088a38ed279d889b902a05b (patch)
treeecb4f56cabd335d6f360a6e7d22f5b9d42d8d730 /src
parent4decadbc44b12cca8790b4d27ab9c29e34cb9909 (diff)
downloadpackages_apps_Settings-7e21fa5ab4f867263088a38ed279d889b902a05b.zip
packages_apps_Settings-7e21fa5ab4f867263088a38ed279d889b902a05b.tar.gz
packages_apps_Settings-7e21fa5ab4f867263088a38ed279d889b902a05b.tar.bz2
Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
Bug: 19363726 Change-Id: Id4194deb126323b2f7674c58f9911f892793dff4
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/DataUsageSummary.java17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index ce68e3d..c4c79d1 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -670,10 +670,12 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
final Context context = getActivity();
mTabHost.clearAllTabs();
- for (int i = 0; i < mTelephonyManager.getSimCount(); i++) {
+ int simCount = mTelephonyManager.getSimCount();
+
+ for (int i = 0; i < simCount; i++) {
final SubscriptionInfo sir = Utils.findRecordBySlotId(context, i);
if (sir != null) {
- addMobileTab(context, sir);
+ addMobileTab(context, sir, (simCount > 1));
}
}
@@ -2672,11 +2674,16 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
}
};
- private void addMobileTab(Context context, SubscriptionInfo subInfo) {
+ private void addMobileTab(Context context, SubscriptionInfo subInfo, boolean isMultiSim) {
if (subInfo != null && mMobileTagMap != null) {
if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
- mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
- subInfo.getDisplayName()));
+ if (isMultiSim) {
+ mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+ subInfo.getDisplayName()));
+ } else {
+ mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+ R.string.data_usage_tab_mobile));
+ }
}
} else {
if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null");