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

Merge "Redirect Wifi Panel to settings page" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-06 19:13:19 +00:00
committed by Android (Google) Code Review
parent 9ab4bf20f7 1bd9cab5a0
commit 94291dfd2d
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/panel/PanelFeatureProviderImpl.java
View File

@@ -22,11 +22,15 @@ import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.util.FeatureFlagUtils; import android.util.FeatureFlagUtils;
import androidx.annotation.Nullable;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.flags.Flags;
public class PanelFeatureProviderImpl implements PanelFeatureProvider { public class PanelFeatureProviderImpl implements PanelFeatureProvider {
@Override @Override
@Nullable
public PanelContent getPanel(Context context, Bundle bundle) { public PanelContent getPanel(Context context, Bundle bundle) {
if (context == null) { if (context == null) {
return null; return null;
@@ -48,7 +52,14 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider {
case Settings.Panel.ACTION_NFC: case Settings.Panel.ACTION_NFC:
return NfcPanel.create(context); return NfcPanel.create(context);
case Settings.Panel.ACTION_WIFI: 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: case Settings.Panel.ACTION_VOLUME:
if (FeatureFlagUtils.isEnabled(context, if (FeatureFlagUtils.isEnabled(context,
FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI)) { FeatureFlagUtils.SETTINGS_VOLUME_PANEL_IN_SYSTEMUI)) {