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

Commit afa6361d authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev

parents ef1d4b66 346625ad

res/layout/wifi_ap_dialog.xml

+79 −58
Original line number Diff line number Diff line
@@ -27,16 +27,18 @@ 
        <LinearLayout android:id="@+id/info"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/wifi_item"

                android:orientation="vertical" />

                style="@style/wifi_section" />



        <LinearLayout android:id="@+id/type"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/wifi_item"

                android:orientation="vertical"

                style="@style/wifi_section"

                android:visibility="gone">



            <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item">

                <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"
@@ -52,7 +54,12 @@ 
                        android:hint="@string/wifi_ssid_hint"

                        android:inputType="textNoSuggestions"

                        android:maxLength="32" />

            </LinearLayout>



            <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item">

                <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"
@@ -66,16 +73,20 @@ 
                        style="@style/wifi_item_content"

                        android:prompt="@string/wifi_security"

                        android:entries="@array/wifi_ap_security" />

            </LinearLayout>



        </LinearLayout>



        <LinearLayout android:id="@+id/fields"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/wifi_item"

                android:orientation="vertical"

                style="@style/wifi_section"

                android:visibility="gone">



            <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item">

                <TextView

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"
@@ -91,7 +102,12 @@ 
                        android:password="true"

                        android:maxLength="63"

                        android:imeOptions="flagForceAscii" />

            </LinearLayout>



            <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item">

                <TextView android:id="@+id/hint"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"
@@ -106,13 +122,17 @@ 
                        style="@style/wifi_item_content"

                        android:text="@string/wifi_show_password" />

            </LinearLayout>

        </LinearLayout>



        <LinearLayout android:id="@+id/fields"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                style="@style/wifi_item"

                android:orientation="vertical">

                style="@style/wifi_section" >



            <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    style="@style/wifi_item">

                <TextView

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"
@@ -126,6 +146,7 @@ 
                    style="@style/wifi_item_content"

                    android:prompt="@string/wifi_ap_band_config" />

            </LinearLayout>

        </LinearLayout>



    </LinearLayout>

</ScrollView>