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

Commit 7a5719ff authored by Johnson Lu's avatar Johnson Lu
Browse files

Add preference for WiFi MAC randomization. 

Preference visibility contolled by feature flag -
settings_wifi_mac_randomization.

Bug: 1227787
Test: RunSettingsRoboTests

Change-Id: Ibad8d3ea2bfa3879acc1ec883b8c03f1979bde45
parent d69be7df

res/layout/wifi_dialog.xml

+21 −0
Original line number Diff line number Diff line
@@ -483,6 +483,27 @@ 


            </LinearLayout>



            <LinearLayout android:id="@+id/privacy_settings_fields"

                          android:layout_width="match_parent"

                          android:layout_height="wrap_content"

                          style="@style/wifi_item"

                          android:visibility="gone">



                <TextView android:id="@+id/privacy_settings_title"

                          android:layout_width="wrap_content"

                          android:layout_height="wrap_content"

                          style="@style/wifi_item_label"

                          android:text="@string/wifi_privacy_settings" />



                <Spinner android:id="@+id/privacy_settings"

                         android:layout_width="match_parent"

                         android:layout_height="wrap_content"

                         style="@style/wifi_item_spinner"

                         android:prompt="@string/wifi_privacy_settings"

                         android:entries="@array/wifi_privacy_entries"/>



            </LinearLayout>



            <LinearLayout android:id="@+id/staticip"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

res/values/arrays.xml

+10 −0
Original line number Diff line number Diff line
@@ -1081,6 +1081,11 @@ 
        <item>Treat as unmetered</item>

    </string-array>



    <string-array name="wifi_privacy_entries">

        <item>Default (use randomized MAC)</item>

        <item>Trusted</item>

    </string-array>



    <string-array name="wifi_hidden_entries">

        <item>No</item>

        <item>Yes</item>
@@ -1092,6 +1097,11 @@ 
        <item>2</item>

    </string-array>



    <string-array name="wifi_privacy_values" translatable="false">

        <item>0</item>

        <item>1</item>

    </string-array>



    <!-- Titles for ui dark mode preference. -->

    <string-array name="dark_ui_mode_entries" >

        <item>Automatic (based on time of day)</item>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2052,6 +2052,8 @@ 
    <string name="wifi_ap_band_select_one">Choose at least one band for Wi\u2011Fi hotspot:</string>

    <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->

    <string name="wifi_ip_settings">IP settings</string>

    <!-- Label for the spinner to show Wifi MAC randomization [CHAR LIMIT=25] -->

    <string name="wifi_privacy_settings">Privacy</string>

    <!-- Label for the check box to share a network with other users on the same device -->

    <string name="wifi_shared">Share with other device users</string>

    <!-- Hint for unchanged fields -->

res/xml/wifi_network_details_fragment.xml

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ 
                android:title="@string/data_usage_metered_yes"

                android:entries="@array/wifi_metered_entries"

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



        <DropDownPreference

            android:key="privacy"

            android:title="@string/wifi_privacy_settings"

            android:entries="@array/wifi_privacy_entries"

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

    </PreferenceCategory>



    <!-- Network Details -->

src/com/android/settings/core/FeatureFlags.java

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ public class FeatureFlags { 
    public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";

    public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";

    public static final String DATA_USAGE_V2 = "settings_data_usage_v2";

    public static final String WIFI_MAC_RANDOMIZATION = "settings_wifi_mac_randomization";

}