PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I5409c87391c8ec39bcdb1d9dcdf608b898d99cdf
This commit is contained in:
Arc Wang
2020-04-10 08:10:45 +00:00
committed by Automerger Merge Worker
parent 698b8f1f87 57ff6599e7
commit c41420bd4e
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -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();
}

11
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -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();
}