Merge "Customized Wifi calling text" into qt-dev

am: 83f60c81f5

Change-Id: I9b052ee41bbcdbc3289a28a06567518e56ec05ea
This commit is contained in:
jackqdyulei
2019-04-04 20:24:58 -07:00
committed by android-build-merger

View File

@@ -35,6 +35,7 @@ import androidx.preference.PreferenceScreen;
import com.android.ims.ImsConfig; import com.android.ims.ImsConfig;
import com.android.ims.ImsManager; import com.android.ims.ImsManager;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -116,6 +117,9 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont
preference.setSummary(null); preference.setSummary(null);
preference.setIntent(intent); preference.setIntent(intent);
} else { } else {
final String title = SubscriptionManager.getResourcesForSubId(mContext, mSubId)
.getString(R.string.wifi_calling_settings_title);
preference.setTitle(title);
int resId = com.android.internal.R.string.wifi_calling_off_summary; int resId = com.android.internal.R.string.wifi_calling_off_summary;
if (mImsManager.isWfcEnabledByUser()) { if (mImsManager.isWfcEnabledByUser()) {
boolean wfcRoamingEnabled = mEditableWfcRoamingMode && !mUseWfcHomeModeForRoaming; boolean wfcRoamingEnabled = mEditableWfcRoamingMode && !mUseWfcHomeModeForRoaming;