Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "settings(nfc): Remove NFC beam settings" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-30 17:11:17 +00:00
committed by Android (Google) Code Review
parent db99e6027c 21c3bca13f
commit 336e95cf64
10 changed files with 1 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
View File

@@ -17,12 +17,10 @@ package com.android.settings.connecteddevice;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.nfc.AndroidBeamPreferenceController;
import com.android.settings.print.PrintSettingPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.uwb.UwbPreferenceController;
@@ -111,17 +109,6 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
return Arrays.asList(sir);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
PackageManager pm = context.getPackageManager();
if (!pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
}
return keys;
}
@Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {