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

Commit 528f8fb6 authored by Abhisek Devkota's avatar Abhisek Devkota Committed by Gerrit Code Review
Browse files

Merge "Settings: Remove V+ pref if V+ isn't present" into cm-11.0

parents 446cc4ee bb192ebe

src/com/android/settings/WirelessSettings.java

+4 −2
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ public class WirelessSettings extends RestrictedSettingsFragment 
    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";



    private static final String GOOGLE_VOICE_PACKAGE = "com.google.android.apps.googlevoice";

    private static final String VOICE_PLUS_PACKAGE = "org.cyanogenmod.voiceplus";

    private static final ComponentName VOICE_PLUS_SETUP =

            new ComponentName("org.cyanogenmod.voiceplus", "org.cyanogenmod.voiceplus.VoicePlusSetup");
@@ -381,8 +382,9 @@ public class WirelessSettings extends RestrictedSettingsFragment 
            removePreference(KEY_SMS_APPLICATION);

        }



        // Remove Voice+ option if Google Voice is not installed

        if (!Utils.isPackageInstalled(getActivity(), GOOGLE_VOICE_PACKAGE)) {

        // Remove Voice+ option if Google Voice or Voice Plus is not installed

        if (!Utils.isPackageInstalled(getActivity(), GOOGLE_VOICE_PACKAGE)

                || !Utils.isPackageInstalled(getActivity(), VOICE_PLUS_PACKAGE)) {

            removePreference(KEY_VOICE_PLUS_ACCOUNT);

        }