From 3905f1069afeb3cbf548934c594cd3b52d4398f3 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Mon, 22 Apr 2024 15:12:55 +0000 Subject: [PATCH] Redirect NFC Panel to settings page Flag: com.android.settings.flags.slices_retirement Bug: 328528962 Test: manual test adb shell am start -a android.settings.panel.action.NFC Change-Id: I5232c9e8ed8608d8f27bedbef10c62d7cc12cb8e --- .../settings/panel/PanelFeatureProviderImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java index 71711f9228e..8196b9f4e67 100644 --- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java +++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java @@ -22,11 +22,15 @@ import android.os.Bundle; import android.provider.Settings; import android.util.FeatureFlagUtils; +import androidx.annotation.Nullable; + import com.android.settings.Utils; +import com.android.settings.flags.Flags; public class PanelFeatureProviderImpl implements PanelFeatureProvider { @Override + @Nullable public PanelContent getPanel(Context context, Bundle bundle) { if (context == null) { return null; @@ -46,7 +50,14 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider { context.sendBroadcast(intent); return null; case Settings.Panel.ACTION_NFC: - return NfcPanel.create(context); + if (Flags.slicesRetirement()) { + Intent nfcIntent = new Intent(Settings.ACTION_NFC_SETTINGS); + nfcIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(nfcIntent); + return null; + } else { + return NfcPanel.create(context); + } case Settings.Panel.ACTION_WIFI: return WifiPanel.create(context); case Settings.Panel.ACTION_VOLUME: