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

Commit f9b41559 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use the getBidiFormattedPhoneNumber to replace getFormattedPhoneNumber"

parents f0771bdb 0f844d16

src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java

+2 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import android.content.Context; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;

import android.widget.Toast;
@@ -160,10 +158,10 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { 


    @VisibleForTesting

    CharSequence getFormattedPhoneNumber(SubscriptionInfo subscriptionInfo) {

        final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,

        final String phoneNumber = DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext,

                subscriptionInfo);

        return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)

                : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);

                : phoneNumber;

    }



    @VisibleForTesting

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+13 −19
Original line number Diff line number Diff line
@@ -26,17 +26,15 @@ import android.os.Bundle; 
import android.os.PersistableBundle;

import android.os.UserHandle;

import android.telephony.CarrierConfigManager;

import android.telephony.SmsCbMessage;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SmsCbMessage;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyManager;

import android.telephony.euicc.EuiccManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;



import androidx.annotation.NonNull;
@@ -224,8 +222,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 


    private void updatePhoneNumber() {

        // If formattedNumber is null or empty, it'll display as "Unknown".

        mDialog.setText(PHONE_NUMBER_VALUE_ID, BidiFormatter.getInstance().unicodeWrap(

                getPhoneNumber(), TextDirectionHeuristics.LTR));

        mDialog.setText(PHONE_NUMBER_VALUE_ID,

                DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext, mSubscriptionInfo));

    }



    private void updateDataState(int state) {
@@ -409,7 +407,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        final PersistableBundle carrierConfig =

                mCarrierConfigManager.getConfigForSubId(subscriptionId);

        final boolean showImsRegState = carrierConfig == null ? false :

            carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);

                carrierConfig.getBoolean(

                        CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);

        if (showImsRegState) {

            final boolean isImsRegistered = mTelephonyManager.isImsRegistered(subscriptionId);

            mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString(isImsRegistered ?
@@ -461,11 +460,6 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        };

    }



    @VisibleForTesting

    String getPhoneNumber() {

        return DeviceInfoUtils.getFormattedPhoneNumber(mContext, mSubscriptionInfo);

    }



    @VisibleForTesting

    SignalStrength getSignalStrength() {

        return mTelephonyManager.getSignalStrength();

src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java

+2 −4
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.content.Intent; 
import android.net.Uri;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;
@@ -100,10 +98,10 @@ public class DeviceInfoSlice implements CustomSliceable { 
        if (subscriptionInfo == null) {

            return mContext.getString(R.string.device_info_default);

        }

        final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,

        final String phoneNumber = DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext,

                subscriptionInfo);

        return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)

                : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);

                : phoneNumber;

    }



    private CharSequence getDeviceModel() {

src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java

+5 −10
Original line number Diff line number Diff line
@@ -28,29 +28,26 @@ import android.telephony.ServiceState; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.BidiFormatter;

import android.text.TextDirectionHeuristics;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.AdapterView;

import android.widget.ArrayAdapter;

import android.widget.EditText;

import android.widget.ImageView;

import android.widget.Spinner;

import android.widget.TextView;



import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settingslib.DeviceInfoUtils;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;



import com.android.settings.R;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settingslib.DeviceInfoUtils;



/**

 * A dialog allowing the display name of a mobile network subscription to be changed

 */
@@ -159,9 +156,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 
        phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE);



        final TextView phoneNumber = view.findViewById(R.id.number_value);

        final String formattedNumber = DeviceInfoUtils.getFormattedPhoneNumber(getContext(), info);

        phoneNumber.setText(BidiFormatter.getInstance().unicodeWrap(formattedNumber,

                TextDirectionHeuristics.LTR));

        phoneNumber.setText(DeviceInfoUtils.getBidiFormattedPhoneNumber(getContext(), info));

    }



    @Override

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

+38 −40
Original line number Diff line number Diff line
@@ -16,35 +16,21 @@ 


package com.android.settings.deviceinfo.simstatus;



import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .CELL_DATA_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .CELL_VOICE_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_DATA_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_VOICE_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ICCID_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ICCID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .IMS_REGISTRATION_STATE_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .IMS_REGISTRATION_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .NETWORK_PROVIDER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .OPERATOR_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .OPERATOR_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .PHONE_NUMBER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ROAMING_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SERVICE_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SIGNAL_STRENGTH_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SIGNAL_STRENGTH_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.PHONE_NUMBER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ROAMING_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SERVICE_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;
@@ -70,8 +56,11 @@ import android.telephony.euicc.EuiccManager; 
import androidx.lifecycle.LifecycleOwner;



import com.android.settings.R;

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

import com.android.settingslib.DeviceInfoUtils;

import com.android.settingslib.core.lifecycle.Lifecycle;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -80,10 +69,12 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.Shadows;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowPackageManager;

import org.robolectric.util.ReflectionHelpers;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowDeviceInfoUtils.class})

public class SimStatusDialogControllerTest {



    @Mock
@@ -120,11 +111,11 @@ public class SimStatusDialogControllerTest { 
        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        mController = spy(new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));

        ShadowDeviceInfoUtils.setPhoneNumber("");

        doReturn(mServiceState).when(mController).getCurrentServiceState();

        doReturn(0).when(mSignalStrength).getDbm();

        doReturn(0).when(mSignalStrength).getAsuLevel();

        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();

        doReturn("").when(mController).getPhoneNumber();

        doReturn(mSignalStrength).when(mController).getSignalStrength();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
@@ -147,6 +138,11 @@ public class SimStatusDialogControllerTest { 
        shadowPackageManager.addPackage(sysUIPackageInfo);

    }



    @After

    public void tearDown() {

        ShadowDeviceInfoUtils.reset();

    }



    @Test

    public void initialize_updateNetworkProviderWithFoobarCarrier_shouldUpdateCarrierWithFoobar() {

        final CharSequence carrierName = "foobar";
@@ -159,8 +155,10 @@ public class SimStatusDialogControllerTest { 


    @Test

    public void initialize_updatePhoneNumberWith1111111111_shouldUpdatePhoneNumber() {

        final String phoneNumber = "1111111111";

        doReturn(phoneNumber).when(mController).getPhoneNumber();

        ShadowDeviceInfoUtils.setPhoneNumber("1111111111");



        final String phoneNumber = DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext,

                mSubscriptionInfo);



        mController.initialize();