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

Commit 1a66d9b2 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Hide number label if info is opportunistic" into qt-dev

parents 8c16ef29 7e9ef341

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

+4 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 


    @VisibleForTesting

    protected void populateView(View view) {

        mNameView = (EditText) view.findViewById(R.id.edittext);

        mNameView = view.findViewById(R.id.edittext);

        final SubscriptionInfo info = mSubscriptionManager.getActiveSubscriptionInfo(mSubId);

        if (info == null) {

            Log.w(TAG, "got null SubscriptionInfo for mSubId:" + mSubId);
@@ -125,6 +125,9 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen 
        final ServiceState serviceState = mTelephonyManager.getServiceStateForSubscriber(mSubId);

        operatorName.setText(serviceState.getOperatorAlphaLong());



        final TextView phoneTitle = view.findViewById(R.id.number_label);

        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,

tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java

+20 −3
Original line number Diff line number Diff line
@@ -34,9 +34,15 @@ import android.telephony.ServiceState; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.Button;

import android.widget.EditText;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.FragmentActivity;



import com.android.settings.R;

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



import org.junit.Before;
@@ -49,9 +55,6 @@ import org.robolectric.Robolectric; 
import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.FragmentActivity;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = ShadowAlertDialogCompat.class)

public class RenameMobileNetworkDialogFragmentTest {
@@ -123,6 +126,20 @@ public class RenameMobileNetworkDialogFragmentTest { 
        assertThat(captor.getValue()).isEqualTo("test2");

    }



    @Test

    public void populateView_infoIsOpportunistic_hideNumberLabel() {

        final View view = LayoutInflater.from(mActivity).inflate(

                R.layout.dialog_mobile_network_rename, null);

        when(mSubscriptionMgr.getActiveSubscriptionInfo(mSubscriptionId)).thenReturn(

                mSubscriptionInfo);

        when(mSubscriptionInfo.isOpportunistic()).thenReturn(true);



        startDialog();

        mFragment.populateView(view);



        assertThat(view.findViewById(R.id.number_label).getVisibility()).isEqualTo(View.GONE);

    }



    /** Helper method to start the dialog */

    private AlertDialog startDialog() {

        mFragment.show(mActivity.getSupportFragmentManager(), null);