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

Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ia6abb73f2bfde7ad4c13ca0bcea28cfe6460968c
This commit is contained in:
Betty Chang
2021-09-06 04:16:51 +00:00
committed by Automerger Merge Worker
parent 6e55a559d4 ebdc0e26f6
commit 3b1c25573b
4 changed files with 95 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ public class RenameMobileNetworkDialogFragmentTest {
eq(SubscriptionManager.NAME_SOURCE_USER_INPUT));
assertThat(captor.getValue()).isEqualTo("test2");
verify(mSubscriptionMgr)
.setIconTint(eq(Color.parseColor("#ff00796b" /* teal */)), eq(mSubscriptionId));
.setIconTint(eq(Color.parseColor("#ff006D74" /* cyan */)), eq(mSubscriptionId));
}
@Test
@@ -174,6 +174,34 @@ public class RenameMobileNetworkDialogFragmentTest {
assertThat(view.findViewById(R.id.number_label).getVisibility()).isEqualTo(View.GONE);
}
@Test
public void populateView_getPreviousSimColor_setCorrectSelection() {
final View view = LayoutInflater.from(mActivity).inflate(
R.layout.dialog_mobile_network_rename, null);
when(mSubscriptionInfo.getIconTint())
.thenReturn(Color.parseColor("#ff3367d6"/* blue700 */));
startDialog();
mFragment.populateView(view);
final Spinner colorSpinnerView = mFragment.getColorSpinnerView();
assertThat(colorSpinnerView.getSelectedItemPosition()).isEqualTo(1);
}
@Test
public void populateView_getUpdatedSimColor_setCorrectSelection() {
final View view = LayoutInflater.from(mActivity).inflate(
R.layout.dialog_mobile_network_rename, null);
when(mSubscriptionInfo.getIconTint())
.thenReturn(Color.parseColor("#ff137333"/* Green800 */));
startDialog();
mFragment.populateView(view);
final Spinner colorSpinnerView = mFragment.getColorSpinnerView();
assertThat(colorSpinnerView.getSelectedItemPosition()).isEqualTo(2);
}
/**
* Helper method to start the dialog
*/