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

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

Browse Source 
* commit '0362e870b258b03ec06110d032b521cac3d37bf2':
  Data Usage tab title should say "Cellular" with only 1 sim and wifi tab.
This commit is contained in:
Sanket Padawe
2015-02-12 23:55:01 +00:00
committed by Android Git Automerger
parent 31010cc155 0362e870b2
commit bdfdf07ce3
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();
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");