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

Commit 9f61f4e4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e24 

Change-Id: I6963808bde5c96e4ee93ef72de3135409a7947d2
parents d5e10793 c2153e24

res/layout/wifi_dialog.xml

+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"