Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f472d991 authored by Mill Chen's avatar Mill Chen Committed by Android (Google) Code Review
Browse files

Merge "Redirect NFC Panel to settings page" into main

parents f671734c 3905f106
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -50,7 +50,14 @@ public class PanelFeatureProviderImpl implements PanelFeatureProvider {
                context.sendBroadcast(intent);
                return null;
            case Settings.Panel.ACTION_NFC:
                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:
                if (Flags.slicesRetirement()) {
                    Intent wifiIntent = new Intent(Settings.ACTION_WIFI_SETTINGS);