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

Commit 66bd88c9 authored by Goven Liu's avatar Goven Liu Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi] Update "Factory MAC" to "Device MAC" in strings."

parents 96635d9f 6a9afea5

res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -2206,8 +2206,8 @@ 
    <string name="wifi_advanced_titlebar">Advanced Wi\u2011Fi</string>

    <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's SSID. [CHAR LIMIT=20] -->

    <string name="wifi_advanced_ssid_title">SSID</string>

    <!-- Wi-Fi settings screen, advanced, title of the item to show the factory's Wi-Fi MAC address. [CHAR LIMIT=50] -->

    <string name="wifi_advanced_factory_mac_address_title">Factory MAC address</string>

    <!-- Wi-Fi settings screen, advanced, title of the item to show the device's Wi-Fi MAC address. [CHAR LIMIT=50] -->

    <string name="wifi_advanced_device_mac_address_title">Device MAC address</string>

    <!-- Wi-Fi settings screen, advanced, title of the item to show the randomized Wi-Fi MAC address. [CHAR LIMIT=50] -->

    <string name="wifi_advanced_randomized_mac_address_title">Randomized MAC address</string>

    <!-- Title of the screen to adjust IP settings -->
@@ -3035,8 +3035,8 @@ 
    <string name="status_operator">Network</string>

    <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->

    <string name="status_wifi_mac_address">Wi\u2011Fi MAC address</string>

    <!-- About phone, status item title.  The Factory MAC address of the Wi-Fi network adapter. [CHAR LIMIT=50] -->

    <string name="status_factory_wifi_mac_address">Factory Wi\u2011Fi MAC address</string>

    <!-- About phone, status item title.  The device's MAC address of the Wi-Fi network adapter. [CHAR LIMIT=50] -->

    <string name="status_device_wifi_mac_address">Device Wi\u2011Fi MAC address</string>

    <!-- About phone, status item title.  The bluetooth adapter's hardware address-->

    <string name="status_bt_address">Bluetooth address</string>

    <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->

res/xml/my_device_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
    <Preference

        android:key="wifi_mac_address"

        android:order="46"

        android:title="@string/status_factory_wifi_mac_address"

        android:title="@string/status_device_wifi_mac_address"

        android:summary="@string/summary_placeholder"

        android:selectable="false"

        settings:enableCopying="true"/>

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

+1 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
                (mWifiConfig.macRandomizationSetting

                        == WifiConfiguration.RANDOMIZATION_PERSISTENT)

                        ? R.string.wifi_advanced_randomized_mac_address_title

                        : R.string.wifi_advanced_factory_mac_address_title);

                        : R.string.wifi_advanced_device_mac_address_title);



    }

}

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

+5 −6
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ package com.android.settings.wifi.details; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.nullable;
@@ -35,8 +35,8 @@ import static org.mockito.Mockito.when; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.res.Resources;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;
@@ -56,7 +56,6 @@ import android.net.wifi.WifiInfo; 
import android.net.wifi.WifiManager;

import android.os.Handler;

import android.provider.Settings;

import android.util.FeatureFlagUtils;

import android.view.View;

import android.view.View.OnClickListener;

import android.widget.ImageView;
@@ -69,9 +68,9 @@ import androidx.preference.PreferenceScreen; 


import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.FeatureFlags;

import com.android.settings.development.featureflags.FeatureFlagPersistent;

import com.android.settings.Utils;

import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;

import com.android.settings.testutils.shadow.ShadowEntityHeaderController;

import com.android.settings.widget.EntityHeaderController;
@@ -101,8 +100,8 @@ import org.robolectric.shadows.ShadowToast; 
import java.net.Inet4Address;

import java.net.InetAddress;

import java.net.UnknownHostException;

import java.util.Arrays;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.stream.Collectors;



@RunWith(RobolectricTestRunner.class)
@@ -1867,7 +1866,7 @@ public class WifiDetailPreferenceControllerTest { 


        displayAndResume();



        verify(mockMacAddressPref).setTitle(R.string.wifi_advanced_factory_mac_address_title);

        verify(mockMacAddressPref).setTitle(R.string.wifi_advanced_device_mac_address_title);

    }



    private ActionButtonsPreference createMock() {