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

Commit 497c1e37 authored by govenliu's avatar govenliu
Browse files

[Wi-Fi] Set Wi-Fi Privacy option at the last one position

Keep the privacy option at the last one even user choose the Static in ip settings.

Bug: 150094718
Test: manually push API and check UI order.
Change-Id: Ib44900f359d65532b6c6228c00739faffa652de2
parent 34fdec26
Loading
Loading
Loading
Loading
+20 −21
Original line number Diff line number Diff line
@@ -559,27 +559,6 @@

            </LinearLayout>

            <LinearLayout android:id="@+id/privacy_settings_fields"
                          android:layout_width="match_parent"
                          android:layout_height="wrap_content"
                          style="@style/wifi_item"
                          android:visibility="gone">

                <TextView android:id="@+id/privacy_settings_title"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
                          style="@style/wifi_item_label"
                          android:text="@string/wifi_privacy_settings" />

                <Spinner android:id="@+id/privacy_settings"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/wifi_item_spinner"
                         android:prompt="@string/wifi_privacy_settings"
                         android:entries="@array/wifi_privacy_entries"/>

            </LinearLayout>

            <LinearLayout android:id="@+id/staticip"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@@ -680,6 +659,26 @@
                </LinearLayout>
            </LinearLayout>

            <LinearLayout android:id="@+id/privacy_settings_fields"
                          android:layout_width="match_parent"
                          android:layout_height="wrap_content"
                          style="@style/wifi_item"
                          android:visibility="gone">

                <TextView android:id="@+id/privacy_settings_title"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
                          style="@style/wifi_item_label"
                          android:text="@string/wifi_privacy_settings" />

                <Spinner android:id="@+id/privacy_settings"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/wifi_item_spinner"
                         android:prompt="@string/wifi_privacy_settings"
                         android:entries="@array/wifi_privacy_entries"/>
            </LinearLayout>

            <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"