Merge "Remove networkScorer wrapper" into pi-dev (272d3b50) · Commits · e / os / android_packages_apps_Settings

res/xml/wifi_configure_settings.xml

+27 −26

Original line number	Diff line number	Diff line
		@@ -56,7 +56,8 @@
		<Preference
		android:key="network_scorer_picker"
		android:title="@string/network_scorer_picker_title"
		android:fragment="com.android.settings.network.NetworkScorerPicker"/>
		android:fragment="com.android.settings.network.NetworkScorerPicker"
		settings:controller="com.android.settings.network.NetworkScorerPickerPreferenceController" />

		<Preference
		android:key="wifi_direct"

src/com/android/settings/network/NetworkScorerPicker.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -26,11 +26,11 @@ import android.text.TextUtils;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;

		import com.android.internal.logging.nano.MetricsProto;
		import com.android.settings.R;
		import com.android.settings.core.InstrumentedPreferenceFragment;
		import com.android.settings.widget.RadioButtonPreference;
		import com.android.settings.wrapper.NetworkScoreManagerWrapper;

		import java.util.List;

		@@ -40,7 +40,7 @@ import java.util.List;
		public class NetworkScorerPicker extends InstrumentedPreferenceFragment implements
		RadioButtonPreference.OnClickListener {

		private NetworkScoreManagerWrapper mNetworkScoreManager;
		private NetworkScoreManager mNetworkScoreManager;

		@Override
		public int getMetricsCategory() {
		@@ -56,7 +56,7 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		mNetworkScoreManager = createNetworkScorerManagerWrapper(context);
		mNetworkScoreManager = createNetworkScorerManager(context);
		}

		@Override
		@@ -138,7 +138,7 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
		}

		@VisibleForTesting
		NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
		return new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
		NetworkScoreManager createNetworkScorerManager(Context context) {
		return (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
		}
		}

src/com/android/settings/network/NetworkScorerPickerPreferenceController.java

+10 −18

Original line number	Diff line number	Diff line
		@@ -16,12 +16,12 @@
		package com.android.settings.network;

		import android.content.Context;
		import android.net.NetworkScoreManager;
		import android.net.NetworkScorerAppData;
		import android.support.v7.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.wrapper.NetworkScoreManagerWrapper;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settingslib.core.AbstractPreferenceController;

		import java.util.List;
		@@ -30,22 +30,19 @@ import java.util.List;
		* {@link AbstractPreferenceController} that shows the active network scorer and toggles the
		* preference based on whether or not there are valid scorers installed.
		*/
		public class NetworkScorerPickerPreferenceController extends AbstractPreferenceController
		implements PreferenceControllerMixin {
		public class NetworkScorerPickerPreferenceController extends BasePreferenceController {

		private static final String KEY_NETWORK_SCORER_PICKER = "network_scorer_picker";
		private final NetworkScoreManager mNetworkScoreManager;

		private final NetworkScoreManagerWrapper mNetworkScoreManager;

		public NetworkScorerPickerPreferenceController(Context context,
		NetworkScoreManagerWrapper networkScoreManager) {
		super(context);
		mNetworkScoreManager = networkScoreManager;
		public NetworkScorerPickerPreferenceController(Context context, String key) {
		super(context, key);
		mNetworkScoreManager =
		(NetworkScoreManager) mContext.getSystemService(Context.NETWORK_SCORE_SERVICE);
		}

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

		@Override
		@@ -67,9 +64,4 @@ public class NetworkScorerPickerPreferenceController extends AbstractPreferenceC
		preference.setSummary(scorer.getRecommendationServiceLabel());
		}
		}

		@Override
		public boolean isAvailable() {
		return true;
		}
		}

src/com/android/settings/wifi/ConfigureWifiSettings.java

+2 −9

Original line number	Diff line number	Diff line
		@@ -21,18 +21,15 @@ import android.content.Context;
		import android.content.Intent;
		import android.net.ConnectivityManager;
		import android.net.NetworkInfo;
		import android.net.NetworkScoreManager;
		import android.net.wifi.WifiManager;
		import android.provider.SearchIndexableResource;

		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.settings.R;
		import com.android.settings.dashboard.DashboardFragment;
		import com.android.settings.network.NetworkScorerPickerPreferenceController;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
		import com.android.settings.wrapper.NetworkScoreManagerWrapper;
		import com.android.settingslib.core.AbstractPreferenceController;

		import java.util.ArrayList;
		@@ -74,16 +71,12 @@ public class ConfigureWifiSettings extends DashboardFragment {

		@Override
		protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
		final NetworkScoreManagerWrapper networkScoreManagerWrapper =
		new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
		mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context);
		mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
		networkScoreManagerWrapper, getLifecycle());
		getLifecycle());
		final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
		final List<AbstractPreferenceController> controllers = new ArrayList<>();
		controllers.add(mWifiWakeupPreferenceController);
		controllers.add(new NetworkScorerPickerPreferenceController(context,
		networkScoreManagerWrapper));
		controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
		controllers.add(mUseOpenWifiPreferenceController);
		controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager));

src/com/android/settings/wifi/UseOpenWifiPreferenceController.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.text.TextUtils;

		import com.android.settings.R;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settings.wrapper.NetworkScoreManagerWrapper;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		@@ -38,11 +37,12 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
		implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
		LifecycleObserver, OnResume, OnPause {
		private static final String KEY_USE_OPEN_WIFI_AUTOMATICALLY = "use_open_wifi_automatically";
		@VisibleForTesting static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;
		@VisibleForTesting
		static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;

		private final ContentResolver mContentResolver;
		private final Fragment mFragment;
		private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
		private final NetworkScoreManager mNetworkScoreManager;
		private final SettingObserver mSettingObserver;

		private Preference mPreference;
		@@ -50,11 +50,12 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
		private boolean mDoFeatureSupportedScorersExist;

		public UseOpenWifiPreferenceController(Context context, Fragment fragment,
		NetworkScoreManagerWrapper networkScoreManagerWrapper, Lifecycle lifecycle) {
		Lifecycle lifecycle) {
		super(context);
		mContentResolver = context.getContentResolver();
		mFragment = fragment;
		mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
		mNetworkScoreManager =
		(NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
		mSettingObserver = new SettingObserver();
		updateEnableUseWifiComponentName();
		checkForFeatureSupportedScorers();
		@@ -62,7 +63,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
		}

		private void updateEnableUseWifiComponentName() {
		NetworkScorerAppData appData = mNetworkScoreManagerWrapper.getActiveScorer();
		NetworkScorerAppData appData = mNetworkScoreManager.getActiveScorer();
		mEnableUseWifiComponentName =
		appData == null ? null : appData.getEnableUseOpenWifiActivity();
		}
		@@ -72,7 +73,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
		mDoFeatureSupportedScorersExist = true;
		return;
		}
		List<NetworkScorerAppData> scorers = mNetworkScoreManagerWrapper.getAllValidScorers();
		List<NetworkScorerAppData> scorers = mNetworkScoreManager.getAllValidScorers();
		for (NetworkScorerAppData scorer : scorers) {
		if (scorer.getEnableUseOpenWifiActivity() != null) {
		mDoFeatureSupportedScorersExist = true;
		@@ -115,7 +116,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
		}
		final SwitchPreference useOpenWifiPreference = (SwitchPreference) preference;

		boolean isScorerSet = mNetworkScoreManagerWrapper.getActiveScorerPackage() != null;
		boolean isScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
		boolean doesActiveScorerSupportFeature = mEnableUseWifiComponentName != null;

		useOpenWifiPreference.setChecked(isSettingEnabled());