From d004dfc4b377b1688a089dddc41d67204050b405 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Fri, 10 Apr 2020 13:19:30 +0800
Subject: [PATCH] [Wi-Fi] Fix Hidden network option scrolls to bottom problem

Should not scroll to bottom since Hidden network option
is not at the bottom most.

Bug: 148036155
Test: manual
      Wi-Fi Setings -> Add network -> Advanced options ->
      click 'Hidden network' Yes -> should not scroll to bottom.
Change-Id: I6511f75441ebad62e2c28df76a39d702d78898a6
---
 .../android/settings/wifi/WifiConfigController.java   | 11 ++---------
 .../android/settings/wifi/WifiConfigController2.java  | 11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 54026a5671c..b84e964d970 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -1573,15 +1573,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();
         }
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 4df0dfdc84e..7763c60f6bf 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -1569,15 +1569,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();
         }