Merge "[Passpointv2] Provide two views for saved networks" (457f9a6e) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -2266,6 +2266,10 @@

		<!-- Wifi saved access points. Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
		<string name="wifi_saved_access_points_label">Saved networks</string>
		<!-- Tab title for showing subscribed WiFi access points. [CHAR LIMIT=20] -->
		<string name="wifi_subscribed_access_points_tab">Subscriptions</string>
		<!-- Tab title for showing saved WiFi access points. -->
		<string name="wifi_saved_access_points_tab">@string/wifi_access_points</string>
		<!-- Wifi Advanced settings. Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
		<string name="wifi_advanced_settings_label">IP settings</string>
		<!-- Error message for users that aren't allowed to see or modify WiFi advanced settings [CHAR LIMIT=NONE] -->

res/xml/wifi_display_saved_access_points.xml

+6 −1

Original line number	Diff line number	Diff line
		@@ -20,9 +20,14 @@
		android:key="saved_access_points"
		android:title="@string/wifi_saved_access_points_label">

		<PreferenceCategory
		android:key="subscribed_access_points_category"
		android:title="@string/wifi_subscribed_access_points_tab"
		settings:controller="com.android.settings.wifi.savedaccesspoints.SubscribedAccessPointsPreferenceController"/>

		<PreferenceCategory
		android:key="saved_access_points_category"
		android:layout="@layout/preference_category_no_label"
		android:title="@string/wifi_saved_access_points_tab"
		settings:controller="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsPreferenceController"/>

		</PreferenceScreen>

src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import androidx.preference.PreferenceScreen;

		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.utils.PreferenceGroupChildrenCache;
		import com.android.settings.R;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		import com.android.settingslib.utils.ThreadUtils;
		@@ -122,6 +123,12 @@ public class SavedAccessPointsPreferenceController extends BasePreferenceControl
		final int accessPointsSize = accessPoints.size();
		for (int i = 0; i < accessPointsSize; ++i) {
		AccessPoint ap = accessPoints.get(i);

		if (mHost != null && mHost.isSubscriptionsFeatureEnabled()
		&& ap.isPasspointConfig()) {
		continue;
		}

		String key = ap.getKey();
		AccessPointPreference preference =
		(AccessPointPreference) mChildrenCache.getCachedPreference(key);
		@@ -139,6 +146,15 @@ public class SavedAccessPointsPreferenceController extends BasePreferenceControl

		if (mPreferenceGroup.getPreferenceCount() < 1) {
		Log.w(TAG, "Saved networks activity loaded, but there are no saved networks!");
		mPreferenceGroup.setVisible(false);
		} else {
		mPreferenceGroup.setVisible(true);
		}

		if (mHost != null && !mHost.isSubscriptionsFeatureEnabled()) {
		mPreferenceGroup.setVisible(true);
		mPreferenceGroup.setTitle(null);
		mPreferenceGroup.setLayoutResource(R.layout.preference_category_no_label);
		}
		}
		}

src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -75,6 +75,8 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
		.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
		use(SavedAccessPointsPreferenceController.class)
		.setHost(this);
		use(SubscribedAccessPointsPreferenceController.class)
		.setHost(this);
		}

		@Override
		@@ -172,10 +174,15 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
		Log.e(TAG, "Failed to remove Passpoint configuration for "
		+ mSelectedAccessPoint.getConfigName());
		}
		if (isSubscriptionsFeatureEnabled()) {
		use(SubscribedAccessPointsPreferenceController.class)
		.postRefreshSubscribedAccessPoints();
		} else {
		use(SavedAccessPointsPreferenceController.class)
		.postRefreshSavedAccessPoints();
		}
		} else {
		// mForgetListener will call initPreferences upon completion
		// both onSuccess/onFailure will call postRefreshSavedAccessPoints
		mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId,
		use(SavedAccessPointsPreferenceController.class));
		}
		@@ -198,4 +205,9 @@ public class SavedAccessPointsWifiSettings extends DashboardFragment
		}
		return false;
		}

		boolean isSubscriptionsFeatureEnabled() {
		return FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.MOBILE_NETWORK_V2)
		&& FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2);
		}
		}

src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceController.java

0 → 100644

+158 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.wifi.savedaccesspoints;


		import android.content.Context;
		import android.net.wifi.WifiManager;
		import android.util.Log;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceGroup;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.utils.PreferenceGroupChildrenCache;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		import com.android.settingslib.core.lifecycle.events.OnStart;
		import com.android.settingslib.utils.ThreadUtils;
		import com.android.settingslib.wifi.AccessPoint;
		import com.android.settingslib.wifi.AccessPointPreference;
		import com.android.settingslib.wifi.AccessPointPreference.UserBadgeCache;
		import com.android.settingslib.wifi.WifiSavedConfigUtils;

		import java.util.Collections;
		import java.util.List;

		/**
		* Controller that manages a PreferenceGroup, which contains a list of subscribed access points.
		*/
		// TODO(b/127206629): Code refactor to avoid duplicated coding after removed feature flag.
		public class SubscribedAccessPointsPreferenceController extends BasePreferenceController implements
		LifecycleObserver, OnStart, Preference.OnPreferenceClickListener,
		WifiManager.ActionListener {

		private static final String TAG = "SubscribedAPPrefCtrl";

		private final WifiManager mWifiManager;
		private final PreferenceGroupChildrenCache mChildrenCache;
		private final UserBadgeCache mUserBadgeCache;
		private PreferenceGroup mPreferenceGroup;
		private SavedAccessPointsWifiSettings mHost;

		public SubscribedAccessPointsPreferenceController(Context context,
		String preferenceKey) {
		super(context, preferenceKey);
		mUserBadgeCache = new AccessPointPreference.UserBadgeCache(context.getPackageManager());
		mWifiManager = context.getSystemService(WifiManager.class);
		mChildrenCache = new PreferenceGroupChildrenCache();
		}

		public SubscribedAccessPointsPreferenceController setHost(SavedAccessPointsWifiSettings host) {
		mHost = host;
		return this;
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE;
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mPreferenceGroup = screen.findPreference(getPreferenceKey());
		}

		@Override
		public void onStart() {
		refreshSubscribedAccessPoints();
		}

		public void postRefreshSubscribedAccessPoints() {
		ThreadUtils.postOnMainThread(() -> refreshSubscribedAccessPoints());
		}

		@Override
		public boolean onPreferenceClick(Preference preference) {
		if (mHost != null) {
		mHost.showWifiDialog((AccessPointPreference) preference);
		}
		return false;
		}

		@Override
		public void onSuccess() {
		postRefreshSubscribedAccessPoints();
		}

		@Override
		public void onFailure(int reason) {
		postRefreshSubscribedAccessPoints();
		}

		@VisibleForTesting
		void refreshSubscribedAccessPoints() {
		if (mPreferenceGroup == null) {
		Log.w(TAG, "PreferenceGroup is null, skipping.");
		return;
		}

		if (mHost != null && !mHost.isSubscriptionsFeatureEnabled()) {
		mPreferenceGroup.setVisible(false);
		return;
		}

		final Context prefContext = mPreferenceGroup.getContext();

		final List<AccessPoint> accessPoints =
		WifiSavedConfigUtils.getAllConfigs(mContext, mWifiManager);
		Collections.sort(accessPoints, SavedNetworkComparator.INSTANCE);
		mChildrenCache.cacheRemoveAllPrefs(mPreferenceGroup);

		final int accessPointsSize = accessPoints.size();
		for (int i = 0; i < accessPointsSize; ++i) {
		AccessPoint ap = accessPoints.get(i);
		if (!ap.isPasspointConfig()) {
		continue;
		}

		final String key = ap.getKey();
		AccessPointPreference preference =
		(AccessPointPreference) mChildrenCache.getCachedPreference(key);
		if (preference == null) {
		preference = new AccessPointPreference(ap, prefContext, mUserBadgeCache, true);
		preference.setKey(key);
		preference.setIcon(null);
		preference.setOnPreferenceClickListener(this);
		mPreferenceGroup.addPreference(preference);
		}
		preference.setOrder(i);
		}

		mChildrenCache.removeCachedPrefs(mPreferenceGroup);

		if (mPreferenceGroup.getPreferenceCount() < 1) {
		Log.w(TAG, "Subscribed networks activity loaded,"
		+ " but there are no subscribed networks!");
		mPreferenceGroup.setVisible(false);
		} else {
		mPreferenceGroup.setVisible(true);
		}
		}
		}