From 7e9ef341126ee0f0bb352ab9d854904c05f112f6 Mon Sep 17 00:00:00 2001
From: Lei Yu <jackqdyulei@google.com>
Date: Thu, 25 Apr 2019 14:56:59 -0700
Subject: [PATCH] Hide number label if info is opportunistic

Fixes: 125855323
Test: RunSettingsRoboTests
Change-Id: I6f77d65691319097c9bf56232710ba12fa7360f3
---
 .../RenameMobileNetworkDialogFragment.java    |  5 +++-
 ...RenameMobileNetworkDialogFragmentTest.java | 23 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index 7a131d73313..f7e7de58f0d 100644
--- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -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,
diff --git a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
index 70816eacfa8..5b008be8511 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragmentTest.java
@@ -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);