Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dacd020 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change ScrollView to NestedScrollView for wifi_dialog" into sc-dev

parents 6ef1bc73 12d9d5e8

res/layout/wifi_dialog.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/wifi/WifiConfigController.java

+0 −3
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/wifi/WifiConfigController2.java

+0 −3
Original line number Diff line number Diff line
@@ -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);