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

Merge "Go to the correct subscription in WifiCallingSettings" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-10 20:01:32 +00:00
committed by Android (Google) Code Review
parent b2bf285911 02db2ef9b6
commit 3b7cdfb708
4 changed files with 163 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/com/android/settings/wifi/calling/WifiCallingSettings.java
View File

@@ -17,7 +17,9 @@
package com.android.settings.wifi.calling;
import android.app.settings.SettingsEnums;
import android.content.Intent;
import android.os.Bundle;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.util.Log;
@@ -25,6 +27,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
@@ -33,6 +36,7 @@ import com.android.ims.ImsManager;
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.support.actionbar.HelpMenuController;
import com.android.settings.support.actionbar.HelpResourceProvider;
@@ -88,10 +92,30 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
mPagerAdapter = new WifiCallingViewPagerAdapter(getChildFragmentManager(), mViewPager);
mViewPager.setAdapter(mPagerAdapter);
mViewPager.addOnPageChangeListener(new InternalViewPagerListener());
maybeSetViewForSubId();
return view;
}
private void maybeSetViewForSubId() {
if (mSil == null) {
return;
}
Intent intent = getActivity().getIntent();
if (intent == null) {
return;
}
int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
if (SubscriptionManager.isValidSubscriptionId(subId)) {
for (SubscriptionInfo subInfo : mSil) {
if (subId == subInfo.getSubscriptionId()) {
mViewPager.setCurrentItem(mSil.indexOf(subInfo));
break;
}
}
}
}
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -122,7 +146,8 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
return R.string.help_uri_wifi_calling;
}
private final class WifiCallingViewPagerAdapter extends FragmentPagerAdapter {
@VisibleForTesting
final class WifiCallingViewPagerAdapter extends FragmentPagerAdapter {
private final RtlCompatibleViewPager mViewPager;
public WifiCallingViewPagerAdapter(FragmentManager fragmentManager,
@@ -168,17 +193,22 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
}
}
@VisibleForTesting
boolean isWfcEnabledByPlatform(SubscriptionInfo info) {
ImsManager imsManager = ImsManager.getInstance(getActivity(), info.getSimSlotIndex());
return imsManager.isWfcEnabledByPlatform();
}
private void updateSubList() {
mSil = SubscriptionManager.from(getActivity()).getActiveSubscriptionInfoList(true);
mSil = SubscriptionUtil.getActiveSubscriptions(
getContext().getSystemService(SubscriptionManager.class));
// Only config Wfc if it's enabled by platform.
if (mSil == null) {
return;
}
for (int i = 0; i < mSil.size(); ) {
ImsManager imsManager = ImsManager.getInstance(getActivity(),
mSil.get(i).getSimSlotIndex());
if (!imsManager.isWfcEnabledByPlatform()) {
if (!isWfcEnabledByPlatform(mSil.get(i))) {
mSil.remove(i);
} else {
i++;