Merge "Remove dead Nsd checkbox"

src/com/android/settings/NsdEnabler.java

@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.nsd.NsdManager;
-import android.preference.Preference;
-
-import android.preference.SwitchPreference;
-
-/**
- * NsdEnabler is a helper to manage network service discovery on/off checkbox state.
- */
-public class NsdEnabler implements Preference.OnPreferenceChangeListener {
-    private final Context mContext;
-    private final SwitchPreference mSwitchPreference;
-    private final IntentFilter mIntentFilter;
-    private NsdManager mNsdManager;
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (NsdManager.ACTION_NSD_STATE_CHANGED.equals(action)) {
-                handleNsdStateChanged(intent.getIntExtra(NsdManager.EXTRA_NSD_STATE,
-                        NsdManager.NSD_STATE_DISABLED));
-            }
-        }
-    };
-
-    public NsdEnabler(Context context, SwitchPreference pref) {
-        mContext = context;
-        mSwitchPreference = pref;
-        mNsdManager = (NsdManager) mContext.getSystemService(Context.NSD_SERVICE);
-        mIntentFilter = new IntentFilter(NsdManager.ACTION_NSD_STATE_CHANGED);
-    }
-
-    public void resume() {
-        mContext.registerReceiver(mReceiver, mIntentFilter);
-        mSwitchPreference.setOnPreferenceChangeListener(this);
-    }
-
-    public void pause() {
-        mContext.unregisterReceiver(mReceiver);
-        mSwitchPreference.setOnPreferenceChangeListener(null);
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object value) {
-
-        final boolean desiredState = (Boolean) value;
-        mSwitchPreference.setEnabled(false);
-        mNsdManager.setEnabled(desiredState);
-        return false;
-    }
-
-    private void handleNsdStateChanged(int newState) {
-        switch (newState) {
-            case NsdManager.NSD_STATE_DISABLED:
-                mSwitchPreference.setChecked(false);
-                mSwitchPreference.setEnabled(true);
-                break;
-            case NsdManager.NSD_STATE_ENABLED:
-                mSwitchPreference.setChecked(true);
-                mSwitchPreference.setEnabled(true);
-                break;
-        }
-    }
-}

src/com/android/settings/WirelessSettings.java

@@ -26,7 +26,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -35,7 +34,6 @@ import android.nfc.NfcAdapter;
 import android.nfc.NfcManager;
 import android.os.Bundle;
 import android.os.SystemProperties;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -70,7 +68,6 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
     private static final String KEY_MANAGE_MOBILE_PLAN = "manage_mobile_plan";
-    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_WFC_SETTINGS = "wifi_calling_settings";
 
@@ -81,7 +78,6 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
     private SwitchPreference mAirplaneModePreference;
     private NfcEnabler mNfcEnabler;
     private NfcAdapter mNfcAdapter;
-    private NsdEnabler mNsdEnabler;
 
     private ConnectivityManager mCm;
     private TelephonyManager mTm;
@@ -232,17 +228,12 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
         mAirplaneModePreference = (SwitchPreference) findPreference(KEY_TOGGLE_AIRPLANE);
         SwitchPreference nfc = (SwitchPreference) findPreference(KEY_TOGGLE_NFC);
         PreferenceScreen androidBeam = (PreferenceScreen) findPreference(KEY_ANDROID_BEAM_SETTINGS);
-        SwitchPreference nsd = (SwitchPreference) findPreference(KEY_TOGGLE_NSD);
 
         mAirplaneModeEnabler = new AirplaneModeEnabler(activity, mAirplaneModePreference);
         mNfcEnabler = new NfcEnabler(activity, nfc, androidBeam);
 
         mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
 
-        // Remove NSD checkbox by default
-        getPreferenceScreen().removePreference(nsd);
-        //mNsdEnabler = new NsdEnabler(activity, nsd);
-
         String toggleable = Settings.Global.getString(activity.getContentResolver(),
                 Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
 
@@ -366,9 +357,6 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
         if (mNfcEnabler != null) {
             mNfcEnabler.resume();
         }
-        if (mNsdEnabler != null) {
-            mNsdEnabler.resume();
-        }
 
         // update WFC setting
         final Context context = getActivity();
@@ -399,9 +387,6 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
         if (mNfcEnabler != null) {
             mNfcEnabler.pause();
         }
-        if (mNsdEnabler != null) {
-            mNsdEnabler.pause();
-        }
     }
 
     @Override
@@ -437,8 +422,6 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
             public List<String> getNonIndexableKeys(Context context) {
                 final ArrayList<String> result = new ArrayList<String>();
 
-                result.add(KEY_TOGGLE_NSD);
-
                 final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
                 final boolean isSecondaryUser = !um.isAdminUser();
                 final boolean isWimaxEnabled = !isSecondaryUser