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

Commit 7892634b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Can change cellular service manually."

parents d26a673a 7746efe4

res/values/bools.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -92,4 +92,7 @@ 




    <!-- Whether notify user in cell to wlan feature -->

    <!-- Whether notify user in cell to wlan feature -->

    <bool name="cellular_to_wlan_hint">false</bool>

    <bool name="cellular_to_wlan_hint">false</bool>

    <!-- Whether to disable cellular data -->

    <bool name="disbale_cellular_data">false</bool>



</resources>
 
</resources>

src/com/android/settings/sim/SimSettings.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -368,7 +368,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable 
        final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_CELLULAR_DATA);

        final DropDownPreference simPref = (DropDownPreference) findPreference(KEY_CELLULAR_DATA);

        boolean callStateIdle = isCallStateIdle();

        boolean callStateIdle = isCallStateIdle();

        // Enable data preference in msim mode and call state idle

        // Enable data preference in msim mode and call state idle

        simPref.setEnabled((mNumSims > 1) && callStateIdle);

        boolean disableCellulardata = getResources().getBoolean(R.bool.disbale_cellular_data);

        simPref.setEnabled((mNumSims > 1) && callStateIdle && (!disableCellulardata));

        // Display toast only once when the user enters the activity even though the call moves

        // Display toast only once when the user enters the activity even though the call moves

        // through multiple call states (eg - ringing to offhook for incoming calls)

        // through multiple call states (eg - ringing to offhook for incoming calls)

        if (callStateIdle == false && inActivity && dataDisableToastDisplayed == false) {

        if (callStateIdle == false && inActivity && dataDisableToastDisplayed == false) {