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 am: 6253abc2ab am: 98d4d8a0d0 am: a8cc148791

Browse Source 
Change-Id: Ibc8c7b7e54df51dc33558803e807742526a7b8f1
This commit is contained in:
Arc Wang
2020-04-10 09:12:48 +00:00
committed by Automerger Merge Worker
parent 299d1afb5b a8cc148791
commit dc43f1950a
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) { } 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();
} }

11
src/com/android/settings/wifi/WifiConfigController2.java
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();
} }