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

Change ScrollView to NestedScrollView for wifi_dialog

Browse Source 
After enabling collapsing toolbar, ScrollView is not working with
CoordinatorLayout. So we need to update it to NestedScrollView to make
it work with CoordinatorLayout.

Bug: 182221182
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=com.android.settingslib.wifi
      manual visual
      In Settings -< Network & internet -> Wi-Fi -> Add network,
      select enterprise type and scroll the screen.
Change-Id: Ie9de753ee198409275e818a123b5ba7f9b6a1e26
This commit is contained in:
Arc Wang
2021-03-09 14:25:37 +08:00
parent fea98ca447
commit 12d9d5e85a
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/wifi_dialog.xml
View File

@@ -14,7 +14,7 @@
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialog_scrollview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -704,4 +704,4 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.core.widget.NestedScrollView>

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

@@ -60,7 +60,6 @@ import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.TextView;
@@ -167,7 +166,6 @@ public class WifiConfigController implements TextWatcher,
private String mUseSystemCertsString;
private String mDoNotProvideEapUserCertString;
private ScrollView mDialogContainer;
private Spinner mSecuritySpinner;
@VisibleForTesting Spinner mEapMethodSpinner;
@VisibleForTesting Spinner mEapSimSpinner; // For EAP-SIM, EAP-AKA and EAP-AKA-PRIME.
@@ -275,7 +273,6 @@ public class WifiConfigController implements TextWatcher,
mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);

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

@@ -58,7 +58,6 @@ import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.TextView;
@@ -160,7 +159,6 @@ public class WifiConfigController2 implements TextWatcher,
private String mUseSystemCertsString;
private String mDoNotProvideEapUserCertString;
private ScrollView mDialogContainer;
private Spinner mSecuritySpinner;
@VisibleForTesting Spinner mEapMethodSpinner;
private int mLastShownEapMethod;
@@ -261,7 +259,6 @@ public class WifiConfigController2 implements TextWatcher,
mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);