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

Commit 0a45c409 authored by Arc Wang's avatar Arc Wang
Browse files

[Wi-Fi] Fix 2 Wi-Fi shortcuts bug 

Check feature flag to show the shortcut of
WifiSettingsActivity or WifiSettings2Activity.

Bug: 151133236
Test: manual
      Home context menu -> Widgets -> Settings shortcut
      Should only show 1 Wi-Fi shortcut option.
Change-Id: Ie980b69ce1f23614475070b5c74d9a6d5cdab7ae
parent be753c35

src/com/android/settings/shortcut/CreateShortcutPreferenceController.java

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.drawable.Drawable; 
import android.graphics.drawable.Icon;

import android.graphics.drawable.LayerDrawable;

import android.net.ConnectivityManager;

import android.util.FeatureFlagUtils;

import android.util.Log;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;
@@ -45,6 +46,8 @@ import androidx.preference.PreferenceGroup; 


import com.android.settings.R;

import com.android.settings.Settings.TetherSettingsActivity;

import com.android.settings.Settings.WifiSettings2Activity;

import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -187,6 +190,15 @@ public class CreateShortcutPreferenceController extends BasePreferenceController 
                Log.d(TAG, "Skipping non-system app: " + info.activityInfo);

                continue;

            }

            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {

                if (info.activityInfo.name.endsWith(WifiSettingsActivity.class.getSimpleName())) {

                    continue;

                }

            } else {

                if (info.activityInfo.name.endsWith(WifiSettings2Activity.class.getSimpleName())) {

                    continue;

                }

            }

            shortcuts.add(info);

        }

        Collections.sort(shortcuts, SHORTCUT_COMPARATOR);