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

Commit 73f539d2 authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

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

parents 6b5d0230 63b4c1ab

res/xml/wifi_network_details_fragment.xml

+34 −38
Original line number Diff line number Diff line
@@ -36,13 +36,12 @@ 
        android:key="buttons"

        android:selectable="false" />



    <!-- General Details Category -->

    <PreferenceCategory

            android:key="general_details_category" >

    <!-- General Details Preferences -->

    <Preference

        android:key="signal_strength"

        android:title="@string/wifi_signal"

                android:selectable="false"/>

        android:selectable="false"

        settings:allowDividerAbove="true"/>



    <Preference

        android:key="frequency"
@@ -69,16 +68,13 @@ 
        android:title="@string/wifi_privacy_settings"

        android:entries="@array/wifi_privacy_entries"

        android:entryValues="@array/wifi_privacy_values"/>

    </PreferenceCategory>



    <!-- Add device Category -->

    <PreferenceCategory

            android:key="add_device_category" >

    <!-- Add device Preference -->

    <Preference

        android:key="add_device_to_network"

        android:title="@string/wifi_dpp_add_device"

                android:summary="@string/wifi_dpp_connect_network_using_qr_code"/>

    </PreferenceCategory>

        android:summary="@string/wifi_dpp_connect_network_using_qr_code"

        settings:allowDividerAbove="true"/>



    <!-- Network Details -->

    <PreferenceCategory

src/com/android/settings/wifi/details/AddDevicePreferenceController.java

+1 −2
Original line number Diff line number Diff line
@@ -35,14 +35,13 @@ public class AddDevicePreferenceController extends BasePreferenceController { 


    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 AccessPoint mAccessPoint;

    private WifiManager mWifiManager;



    public AddDevicePreferenceController(Context context) {

        super(context, KEY_ADD_DEVICE_CATEGORY);

        super(context, KEY_ADD_DEVICE);



        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

    }