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

Commit ce732b43 authored by Abhisek Devkota's avatar Abhisek Devkota
Browse files

Revert "WirelessSettings: Remove NFC category if there's no NFC adapter" 

RM-165
This reverts commit 64acf974.

Change-Id: Idd0dd83db83a2132880178d5c641bffc3b33d777
parent 64acf974

src/com/android/settings/WirelessSettings.java

+3 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.preference.Preference;

import android.preference.Preference.OnPreferenceChangeListener;

import android.preference.PreferenceCategory;

import android.preference.PreferenceScreen;

import android.preference.SwitchPreference;

import android.provider.SearchIndexableResource;
@@ -77,7 +76,6 @@ public class WirelessSettings extends SettingsPreferenceFragment 
    private static final String KEY_SMS_APPLICATION = "sms_application";

    private static final String KEY_TOGGLE_NSD = "toggle_nsd"; //network service discovery

    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";

    private static final String KEY_NFC_CATEGORY_SETTINGS = "nfc_category_settings";

    private static final String KEY_NFC_PAYMENT_SETTINGS = "nfc_payment_settings";



    public static final String EXIT_ECM_RESULT = "exit_ecm_result";
@@ -270,8 +268,6 @@ public class WirelessSettings extends SettingsPreferenceFragment 
        final Activity activity = getActivity();

        mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);

        SwitchPreference nfc = (SwitchPreference) findPreference(KEY_TOGGLE_NFC);

        PreferenceCategory nfcCategory = (PreferenceCategory)

                findPreference(KEY_NFC_CATEGORY_SETTINGS);



        PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS);

        SwitchPreference nsd = (SwitchPreference) findPreference(KEY_TOGGLE_NSD);
@@ -336,7 +332,9 @@ public class WirelessSettings extends SettingsPreferenceFragment 
        // Remove NFC if not available

        mNfcAdapter = NfcAdapter.getDefaultAdapter(activity);

        if (mNfcAdapter == null) {

            getPreferenceScreen().removePreference(nfcCategory);

            getPreferenceScreen().removePreference(nfc);

            getPreferenceScreen().removePreference(androidBeam);

            getPreferenceScreen().removePreference(nfcPayment);

            mNfcEnabler = null;

        } else if (!mPm.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {

            // Only show if we have the HCE feature