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

Hide ConfigureWifiPreference tiles behind Advanced

Browse Source 
Also reordered the preferences.

Bug: 34889722
Test: manual inspection.
Change-Id: Ica2fda91e6fe98edae49bca687ebb2da83251770
This commit is contained in:
Stephen Chen
2017-02-01 17:37:45 -08:00
parent d1172942ee
commit a7b27b22b9
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
res/xml/wifi_configure_settings.xml
View File

@@ -17,12 +17,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/wifi_configure_titlebar">
<!-- android:dependency="enable_wifi" -->
<ListPreference
android:key="sleep_policy"
android:title="@string/wifi_setting_sleep_policy_title"
android:entries="@array/wifi_sleep_policy_entries"
android:entryValues="@array/wifi_sleep_policy_values" />
<SwitchPreference
android:key="enable_wifi_wakeup"
android:title="@string/wifi_wakeup"
android:summary="@string/wifi_wakeup_summary" />
<SwitchPreference
android:key="allow_recommendations"
@@ -34,23 +32,16 @@
android:title="@string/wifi_notify_open_networks"
android:summary="@string/wifi_notify_open_networks_summary" />
<SwitchPreference
android:key="enable_wifi_wakeup"
android:title="@string/wifi_wakeup"
android:summary="@string/wifi_wakeup_summary" />
<SwitchPreference
android:key="wifi_cellular_data_fallback"
android:title="@string/wifi_cellular_data_fallback_title"
android:summary="@string/wifi_cellular_data_fallback_summary"/>
<Preference
android:key="mac_address"
android:title="@string/wifi_advanced_mac_address_title"/>
<Preference
android:key="current_ip_address"
android:title="@string/wifi_advanced_ip_address_title"/>
<ListPreference
android:key="sleep_policy"
android:title="@string/wifi_setting_sleep_policy_title"
android:entries="@array/wifi_sleep_policy_entries"
android:entryValues="@array/wifi_sleep_policy_values" />
<Preference
android:key="install_credentials"
@@ -77,4 +68,12 @@
android:key="wps_pin_entry"
android:title="@string/wifi_menu_wps_pin" />
<Preference
android:key="mac_address"
android:title="@string/wifi_advanced_mac_address_title"/>
<Preference
android:key="current_ip_address"
android:title="@string/wifi_advanced_ip_address_title"/>
</PreferenceScreen>

6
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -49,6 +49,12 @@ public class ConfigureWifiSettings extends DashboardFragment {
return TAG;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
mProgressiveDisclosureMixin.setTileLimit(5);
}
@Override
protected int getPreferenceScreenResId() {
return R.xml.wifi_configure_settings;