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

Commit a47c2b94 authored by changbetty's avatar changbetty
Browse files

Reordering the network provider UI for mobile and wifi network item 

- Reordering the UI option
  - Move the Mobile data network on the top

- Add the divider back (ag/14716097)

Bug: 189912933
Test: Manaul test
Change-Id: I2ebb6429c3d4b5514e18e24f2953917254aa2048
parent df0a84f0

res/xml/network_provider_settings.xml

+16 −12
Original line number Diff line number Diff line
@@ -25,14 +25,16 @@ 
        android:key="resetting_your_internet"

        android:title="@string/resetting_internet_text"

        android:selectable="false"

        android:layout="@layout/resetting_internet"/>

        android:layout="@layout/resetting_internet"

        settings:allowDividerBelow="true"/>



    <!-- Airplane mode message -->

    <com.android.settingslib.widget.LayoutPreference

        android:key="airplane_mode_message"

        android:title="@string/condition_airplane_title"

        android:selectable="false"

        android:layout="@layout/airplane_mode_message_preference"/>

        android:layout="@layout/airplane_mode_message_preference"

        settings:allowDividerBelow="true"/>



    <Preference

        android:key="connected_ethernet_network"
@@ -40,16 +42,23 @@ 
        android:summary="@string/to_switch_networks_disconnect_ethernet"

        android:icon="@drawable/ic_settings_ethernet"/>



    <PreferenceCategory

        android:key="connected_access_point"

        android:layout="@layout/preference_category_no_label"/>



    <PreferenceCategory

        android:key="provider_model_mobile_network"

        android:title="@string/summary_placeholder"

        android:layout="@layout/preference_category_no_label"

        settings:controller="com.android.settings.network.NetworkMobileProviderController"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="main_toggle_wifi"

        android:title="@string/wifi"

        android:summary="@string/wifi_switch_summary"

        settings:keywords="@string/keywords_wifi"

        settings:allowDividerAbove="true"/>



    <PreferenceCategory

        android:key="connected_access_point"

        android:layout="@layout/preference_category_no_label"/>



    <PreferenceCategory

        android:key="first_access_points"

        android:layout="@layout/preference_category_no_label"/>
@@ -58,16 +67,11 @@ 
        android:key="access_points"

        android:layout="@layout/preference_category_no_label"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="main_toggle_wifi"

        android:title="@string/wifi"

        android:summary="@string/wifi_switch_summary"

        settings:keywords="@string/keywords_wifi"/>



    <Preference

        android:key="configure_wifi_settings"

        android:title="@string/network_and_internet_preferences_title"

        android:summary="@string/network_and_internet_preferences_summary"

        settings:allowDividerAbove="true"

        android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>



    <Preference