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

Merge "Remove the PreferenceGroup without title in WifiNetworkDetailsFragment" into qt-dev

Browse Source
This commit is contained in:
Arc Wang
2019-04-09 01:39:35 +00:00
committed by Android (Google) Code Review
parent 6b5d0230b4 63b4c1ab85
commit 73f539d296
2 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
res/xml/wifi_network_details_fragment.xml
View File

@@ -36,49 +36,45 @@
android:key="buttons" android:key="buttons"
android:selectable="false" /> android:selectable="false" />
<!-- General Details Category --> <!-- General Details Preferences -->
<PreferenceCategory <Preference
android:key="general_details_category" > android:key="signal_strength"
<Preference android:title="@string/wifi_signal"
android:key="signal_strength" android:selectable="false"
android:title="@string/wifi_signal" settings:allowDividerAbove="true"/>
android:selectable="false"/>
<Preference <Preference
android:key="frequency" android:key="frequency"
android:icon="@drawable/ic_frequency_antenna" android:icon="@drawable/ic_frequency_antenna"
android:title="@string/wifi_frequency" android:title="@string/wifi_frequency"
android:selectable="false"/> android:selectable="false"/>
<Preference <Preference
android:key="security" android:key="security"
android:icon="@drawable/ic_security_lock_24dp" android:icon="@drawable/ic_security_lock_24dp"
android:title="@string/wifi_security" android:title="@string/wifi_security"
android:selectable="false"/> android:selectable="false"/>
<DropDownPreference <DropDownPreference
android:key="metered" android:key="metered"
android:icon="@drawable/ic_attach_money_black_24dp" android:icon="@drawable/ic_attach_money_black_24dp"
android:title="@string/data_usage_metered_yes" android:title="@string/data_usage_metered_yes"
android:entries="@array/wifi_metered_entries" android:entries="@array/wifi_metered_entries"
android:entryValues="@array/wifi_metered_values"/> android:entryValues="@array/wifi_metered_values"/>
<DropDownPreference <DropDownPreference
android:key="privacy" android:key="privacy"
android:icon="@drawable/ic_wifi_privacy_24dp" android:icon="@drawable/ic_wifi_privacy_24dp"
android:title="@string/wifi_privacy_settings" android:title="@string/wifi_privacy_settings"
android:entries="@array/wifi_privacy_entries" android:entries="@array/wifi_privacy_entries"
android:entryValues="@array/wifi_privacy_values"/> android:entryValues="@array/wifi_privacy_values"/>
</PreferenceCategory>
<!-- Add device Category --> <!-- Add device Preference -->
<PreferenceCategory <Preference
android:key="add_device_category" > android:key="add_device_to_network"
<Preference android:title="@string/wifi_dpp_add_device"
android:key="add_device_to_network" android:summary="@string/wifi_dpp_connect_network_using_qr_code"
android:title="@string/wifi_dpp_add_device" settings:allowDividerAbove="true"/>
android:summary="@string/wifi_dpp_connect_network_using_qr_code"/>
</PreferenceCategory>
<!-- Network Details --> <!-- Network Details -->
<PreferenceCategory <PreferenceCategory

3
src/com/android/settings/wifi/details/AddDevicePreferenceController.java
View File

@@ -35,14 +35,13 @@ public class AddDevicePreferenceController extends BasePreferenceController {
private static final String TAG = "AddDevicePreferenceController"; private static final String TAG = "AddDevicePreferenceController";
private static final String KEY_ADD_DEVICE_CATEGORY = "add_device_category";
private static final String KEY_ADD_DEVICE = "add_device_to_network"; private static final String KEY_ADD_DEVICE = "add_device_to_network";
private AccessPoint mAccessPoint; private AccessPoint mAccessPoint;
private WifiManager mWifiManager; private WifiManager mWifiManager;
public AddDevicePreferenceController(Context context) { public AddDevicePreferenceController(Context context) {
super(context, KEY_ADD_DEVICE_CATEGORY); super(context, KEY_ADD_DEVICE);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
} }