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

This commit is contained in:
Arc Wang
2020-04-10 07:50:49 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 18 deletions

View File

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

View File

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