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

Commit 57ff6599 authored Apr 10, 2020 by Arc Wang Committed by Android (Google) Code Review Apr 10, 2020

Merge "[Wi-Fi] Fix Hidden network option scrolls to bottom problem" into rvc-dev

parents 417011c6 d004dfc4

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -1596,15 +1596,8 @@ public class WifiConfigController implements TextWatcher,
		} else if (parent == mProxySettingsSpinner) {
		showProxyFields();
		} else if (parent == mHiddenSettingsSpinner) {
		mHiddenWarningView.setVisibility(
		position == NOT_HIDDEN_NETWORK
		? View.GONE
		: View.VISIBLE);
		if (position == HIDDEN_NETWORK) {
		mDialogContainer.post(() -> {
		mDialogContainer.fullScroll(View.FOCUS_DOWN);
		});
		}
		mHiddenWarningView.setVisibility(position == NOT_HIDDEN_NETWORK
		? View.GONE : View.VISIBLE);
		} else {
		showIpConfigFields();
		}

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

+2 −9

Original line number	Diff line number	Diff line
		@@ -1592,15 +1592,8 @@ public class WifiConfigController2 implements TextWatcher,
		} else if (parent == mProxySettingsSpinner) {
		showProxyFields();
		} else if (parent == mHiddenSettingsSpinner) {
		mHiddenWarningView.setVisibility(
		position == NOT_HIDDEN_NETWORK
		? View.GONE
		: View.VISIBLE);
		if (position == HIDDEN_NETWORK) {
		mDialogContainer.post(() -> {
		mDialogContainer.fullScroll(View.FOCUS_DOWN);
		});
		}
		mHiddenWarningView.setVisibility(position == NOT_HIDDEN_NETWORK
		? View.GONE : View.VISIBLE);
		} else {
		showIpConfigFields();
		}