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

Commit 8fd68732 authored by Binyi Wu's avatar Binyi Wu Committed by Android (Google) Code Review
Browse files

Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev

parents d9174aa3 26e5e919

res/layout/wifi_add_network_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
<androidx.core.widget.NestedScrollView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:layout_height="wrap_content"

    android:fitsSystemWindows="true">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

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

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.Bundle; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.widget.Button;

import android.widget.ImageButton;

import android.widget.TextView;
@@ -82,6 +83,10 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf 
        ssidScannerButton.setOnClickListener(this);

        mUIController = new WifiConfigController2(this, rootView, null, getMode());



        // Resize the layout when keyboard opens.

        getActivity().getWindow().setSoftInputMode(

                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);



        return rootView;

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.SystemClock; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.WindowManager;

import android.widget.Button;



import androidx.annotation.VisibleForTesting;
@@ -124,6 +125,10 @@ public class ConfigureWifiEntryFragment extends InstrumentedFragment implements 
            actionBar.setDisplayShowHomeEnabled(false);

        }



        // Resize the layout when keyboard opens.

        getActivity().getWindow().setSoftInputMode(

                WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);



        return rootView;

    }