PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add searchable index for Bluetooth and Nfc only if the feature exists" into oc-dev

Browse Source 
am: 41a858fde1

Change-Id: Ida195181c34d5f53ea544b1a0c81d3154385219e
This commit is contained in:
Ruchi Kandoi
2017-04-25 19:20:06 +00:00
committed by android-build-merger
parent 9c5e338850 41a858fde1
commit 7094f1d170
4 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
View File

@@ -36,7 +36,7 @@ public class BluetoothMasterSwitchPreferenceController extends PreferenceControl
implements OnSummaryChangeListener,
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
private static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";
public static final String KEY_TOGGLE_BLUETOOTH = "toggle_bluetooth";
private LocalBluetoothManager mBluetoothManager;
private MasterSwitchPreference mBtPreference;

18
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice;
import android.content.Context;
import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
@@ -85,5 +86,20 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
sir.xmlResId = R.xml.connected_devices;
return Arrays.asList(sir);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
PackageManager pm = context.getPackageManager();
final List<String> keys = new ArrayList<String>();
if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
}
if (!pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
}
return keys;
}
};
}
}

4
src/com/android/settings/nfc/NfcPreferenceController.java
View File

@@ -39,8 +39,8 @@ import java.util.List;
public class NfcPreferenceController extends PreferenceController
implements LifecycleObserver, OnResume, OnPause {
private static final String KEY_TOGGLE_NFC = "toggle_nfc";
private static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
public static final String KEY_TOGGLE_NFC = "toggle_nfc";
public static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
private NfcEnabler mNfcEnabler;
private NfcAdapter mNfcAdapter;