PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reordering the network provider UI for mobile and wifi network item am: a47c2b94fa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14831308

Change-Id: Ic01796f61fe416cba828ead543869446039f0ef6
This commit is contained in:
changbetty
2021-06-08 06:50:06 +00:00
committed by Automerger Merge Worker
parent a96f90a882 a47c2b94fa
commit fdd280489b
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
res/xml/network_provider_settings.xml
View File

@@ -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