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

Commit 3a5d9020 authored Feb 13, 2019 by Johnson Lu Committed by Arc Wang Feb 15, 2019

Remove feature flags of WiFi Sharing feature

Bug: 120744414
Test: Manual
Change-Id: I655ebb8d149d0976063845478bc667cc4d72d96d

parent 72ba39cd

src/com/android/settings/core/FeatureFlags.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ public class FeatureFlags {
		public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";
		public static final String WIFI_MAC_RANDOMIZATION = "settings_wifi_mac_randomization";
		public static final String NETWORK_INTERNET_V2 = "settings_network_and_internet_v2";
		public static final String WIFI_SHARING = "settings_wifi_sharing";
		public static final String SLICE_INJECTION = "settings_slice_injection";
		public static final String MAINLINE_MODULE = "settings_mainline_module";
		}

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

+8 −10

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
		mCancelBtn.setOnClickListener(this);
		mUIController = new WifiConfigController(this, rootView, null, getMode());

		if (WifiDppUtils.isSharingNetworkEnabled(getContext())) {
		final ImageButton scannerButton = rootView.findViewById(R.id.ssid_scanner_button);
		if (scannerButton != null) {
		scannerButton.setVisibility(View.VISIBLE);
		@@ -76,7 +75,6 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
		WifiDppUtils.getEnrolleeQrCodeScannerIntent(/* ssid */ null));
		});
		}
		}

		return rootView;
		}

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

+12 −14

Original line number	Diff line number	Diff line
		@@ -80,7 +80,6 @@ public class WifiDialog extends AlertDialog implements WifiConfigUiBase,
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		mView = getLayoutInflater().inflate(R.layout.wifi_dialog, /* root */ null);
		if (WifiDppUtils.isSharingNetworkEnabled(getContext())) {
		final ImageButton scannerButton = mView.findViewById(R.id.password_scanner_button);
		if (scannerButton != null) {
		scannerButton.setVisibility(View.VISIBLE);
		@@ -94,7 +93,6 @@ public class WifiDialog extends AlertDialog implements WifiConfigUiBase,
		WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid));
		});
		}
		}
		setView(mView);
		mController = new WifiConfigController(this, mView, mAccessPoint, mMode);
		super.onCreate(savedInstanceState);

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -239,14 +239,12 @@ public class WifiSettings extends RestrictedSettingsFragment
		mAddPreference = new ButtonPreference(prefContext);
		mAddPreference.setIcon(R.drawable.ic_menu_add);
		mAddPreference.setTitle(R.string.wifi_add_network);
		if (WifiDppUtils.isSharingNetworkEnabled(getContext())) {
		mAddPreference.setButtonIcon(R.drawable.ic_scan_24dp);
		mAddPreference.setButtonOnClickListener((View v) -> {
		// Launch QR code scanner to join a network.
		getContext().startActivity(
		WifiDppUtils.getEnrolleeQrCodeScannerIntent(/* ssid */ null));
		});
		}
		mStatusMessagePreference = (LinkablePreference) findPreference(PREF_KEY_STATUS_MESSAGE);

		mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -534,8 +534,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
		* Returns whether the user can share the network represented by this preference with QR code.
		*/
		private boolean canShareNetwork() {
		return mAccessPoint.getConfig() != null && FeatureFlagUtils.isEnabled(mContext,
		FeatureFlags.WIFI_SHARING);
		return mAccessPoint.getConfig() != null;
		}

		/**