PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide number label if info is opportunistic" into qt-dev am: 1a66d9b22f

Browse Source 
am: f6ff7a02fb

Change-Id: I5a1ccdc55dd564fe579c1db89704fd7f6c06e83e
This commit is contained in:
Lei Yu
2019-04-30 00:23:16 -07:00
committed by android-build-merger
parent 114fa266ef f6ff7a02fb
commit 4f207934a4
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
View File

@@ -109,7 +109,7 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
@VisibleForTesting @VisibleForTesting
protected void populateView(View view) { protected void populateView(View view) {
mNameView = (EditText) view.findViewById(R.id.edittext); mNameView = view.findViewById(R.id.edittext);
final SubscriptionInfo info = mSubscriptionManager.getActiveSubscriptionInfo(mSubId); final SubscriptionInfo info = mSubscriptionManager.getActiveSubscriptionInfo(mSubId);
if (info == null) { if (info == null) {
Log.w(TAG, "got null SubscriptionInfo for mSubId:" + mSubId); Log.w(TAG, "got null SubscriptionInfo for mSubId:" + mSubId);
@@ -125,6 +125,9 @@ public class RenameMobileNetworkDialogFragment extends InstrumentedDialogFragmen
final ServiceState serviceState = mTelephonyManager.getServiceStateForSubscriber(mSubId); final ServiceState serviceState = mTelephonyManager.getServiceStateForSubscriber(mSubId);
operatorName.setText(serviceState.getOperatorAlphaLong()); 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 TextView phoneNumber = view.findViewById(R.id.number_value);
final String formattedNumber = DeviceInfoUtils.getFormattedPhoneNumber(getContext(), info); final String formattedNumber = DeviceInfoUtils.getFormattedPhoneNumber(getContext(), info);
phoneNumber.setText(BidiFormatter.getInstance().unicodeWrap(formattedNumber, phoneNumber.setText(BidiFormatter.getInstance().unicodeWrap(formattedNumber,

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

@@ -34,9 +34,15 @@ import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; 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 com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import org.junit.Before; import org.junit.Before;
@@ -49,9 +55,6 @@ import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentActivity;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowAlertDialogCompat.class) @Config(shadows = ShadowAlertDialogCompat.class)
public class RenameMobileNetworkDialogFragmentTest { public class RenameMobileNetworkDialogFragmentTest {
@@ -123,6 +126,20 @@ public class RenameMobileNetworkDialogFragmentTest {
assertThat(captor.getValue()).isEqualTo("test2"); 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 */ /** Helper method to start the dialog */
private AlertDialog startDialog() { private AlertDialog startDialog() {
mFragment.show(mActivity.getSupportFragmentManager(), null); mFragment.show(mActivity.getSupportFragmentManager(), null);