Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fcb62fb authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by android-build-merger
Browse files

Fix missing text message when WiFi Calling is Off. 

automerge: a4314a5d

* commit 'a4314a5d':
  Fix missing text message when WiFi Calling is Off.
parents 22ffff6a a4314a5d

src/com/android/settings/WifiCallingSettings.java

+7 −4
Original line number Diff line number Diff line
@@ -172,10 +172,9 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
        boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)

                && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);

        mSwitch.setChecked(wfcEnabled);



        int wfcMode = ImsManager.getWfcMode(context);

        mButtonWfcMode.setValue(Integer.toString(wfcMode));

        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));

        updateButtonWfcMode(context, wfcEnabled, wfcMode);



        context.registerReceiver(mIntentReceiver, mIntentFilter);
@@ -211,11 +210,15 @@ public class WifiCallingSettings extends SettingsPreferenceFragment 
        ImsManager.setWfcSetting(context, isChecked);



        int wfcMode = ImsManager.getWfcMode(context);

        updateButtonWfcMode(context, isChecked, wfcMode);

    }



    private void updateButtonWfcMode(Context context, boolean wfcEnabled, int wfcMode) {

        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));

        mButtonWfcMode.setEnabled(isChecked);

        mButtonWfcMode.setEnabled(wfcEnabled);



        final PreferenceScreen preferenceScreen = getPreferenceScreen();

        if (isChecked) {

        if (wfcEnabled) {

            preferenceScreen.addPreference(mButtonWfcMode);

        } else {

            preferenceScreen.removePreference(mButtonWfcMode);