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

Remove networkScorer wrapper

Browse Source 
Also modified NetworkScorerPickerPreferenceController to register itself
in xml directily

Bug: 76167422
Test: robotests
Change-Id: I4a216b5e6845aecd6aaeed0ed9b3e06c9e0fc590
This commit is contained in:
Fan Zhang
2018-03-29 17:00:39 -07:00
parent f3789adffd
commit 368c81e97b
10 changed files with 85 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
res/xml/wifi_configure_settings.xml
View File

@@ -15,16 +15,16 @@
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="wifi_configure_settings_screen"
android:title="@string/wifi_configure_settings_preference_title">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="wifi_configure_settings_screen"
android:title="@string/wifi_configure_settings_preference_title">
<SwitchPreference
android:key="enable_wifi_wakeup"
android:title="@string/wifi_wakeup"
android:icon="@drawable/ic_auto_wifi"
android:summary="@string/wifi_wakeup_summary" />
android:key="enable_wifi_wakeup"
android:title="@string/wifi_wakeup"
android:icon="@drawable/ic_auto_wifi"
android:summary="@string/wifi_wakeup_summary" />
<SwitchPreference
android:key="use_open_wifi_automatically"
@@ -33,42 +33,43 @@
android:summary="@string/use_open_wifi_automatically_summary" />
<SwitchPreference
android:key="notify_open_networks"
android:title="@string/wifi_notify_open_networks"
android:icon="@drawable/ic_open_wifi_notifications"
android:summary="@string/wifi_notify_open_networks_summary" />
android:key="notify_open_networks"
android:title="@string/wifi_notify_open_networks"
android:icon="@drawable/ic_open_wifi_notifications"
android:summary="@string/wifi_notify_open_networks_summary" />
<SwitchPreference
android:key="wifi_cellular_data_fallback"
android:title="@string/wifi_cellular_data_fallback_title"
android:summary="@string/wifi_cellular_data_fallback_summary"/>
android:summary="@string/wifi_cellular_data_fallback_summary" />
<Preference
android:key="install_credentials"
android:title="@string/wifi_install_credentials">
android:key="install_credentials"
android:title="@string/wifi_install_credentials">
<intent android:action="android.credentials.INSTALL_AS_USER"
android:targetPackage="com.android.certinstaller"
android:targetClass="com.android.certinstaller.CertInstallerMain">
<extra android:name="install_as_uid" android:value="1010"/>
<extra android:name="install_as_uid" android:value="1010" />
</intent>
</Preference>
<Preference
android:key="network_scorer_picker"
android:title="@string/network_scorer_picker_title"
android:fragment="com.android.settings.network.NetworkScorerPicker"/>
android:key="network_scorer_picker"
android:title="@string/network_scorer_picker_title"
android:fragment="com.android.settings.network.NetworkScorerPicker"
settings:controller="com.android.settings.network.NetworkScorerPickerPreferenceController" />
<Preference
android:key="wifi_direct"
android:title="@string/wifi_menu_p2p"
android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings"/>
android:key="wifi_direct"
android:title="@string/wifi_menu_p2p"
android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings" />
<Preference
android:key="mac_address"
android:title="@string/wifi_advanced_mac_address_title"/>
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"/>
android:key="current_ip_address"
android:title="@string/wifi_advanced_ip_address_title" />
</PreferenceScreen>