PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bdfdf07c: am 0362e870: am 7e21fa5a: Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.

Browse Source 
* commit 'bdfdf07ce3b788d2962f75027f6be615c9784e10':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
This commit is contained in:
Sanket Padawe
2015-02-13 00:01:08 +00:00
committed by Android Git Automerger
parent 785bfe719c bdfdf07ce3
commit 4a7ca7d5a7
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/DataUsageSummary.java
View File

@@ -670,10 +670,12 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
final Context context = getActivity(); final Context context = getActivity();
mTabHost.clearAllTabs(); 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); final SubscriptionInfo sir = Utils.findRecordBySlotId(context, i);
if (sir != null) { 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 (subInfo != null && mMobileTagMap != null) {
if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) { if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()), if (isMultiSim) {
subInfo.getDisplayName())); mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
subInfo.getDisplayName()));
} else {
mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
R.string.data_usage_tab_mobile));
}
} }
} else { } else {
if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null"); if (LOGD) Log.d(TAG, "addMobileTab: subInfoList is null");