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

Merge "[Wi-Fi] Fix 2 Wi-Fi shortcuts bug" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-11 11:32:12 +00:00
committed by Android (Google) Code Review
parent a38859b2b7 0a45c4099d
commit f9570ad33f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
View File

@@ -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);