From 1bd9cab5a047ea850fa3dbf7d74d327b5095a919 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Mon, 22 Apr 2024 15:47:02 +0000 Subject: [PATCH] Redirect Wifi Panel to settings page Flag: com.android.settings.flags.slices_retirement Bug: 328529085 Test: manual test adb shell am start -a android.settings.panel.action.WIFI Change-Id: Iaa7a7fd83000aa8106ceac486c8c96e3a9d1854d --- .../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..a5d4304a73f 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; @@ -48,7 +52,14 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider { case Settings.Panel.ACTION_NFC: return NfcPanel.create(context); case Settings.Panel.ACTION_WIFI: - return WifiPanel.create(context); + if (Flags.slicesRetirement()) { + Intent wifiIntent = new Intent(Settings.ACTION_WIFI_SETTINGS); + wifiIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(wifiIntent); + return null; + } else { + return WifiPanel.create(context); + } case Settings.Panel.ACTION_VOLUME: if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI)) {