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

Refactor Reset options Settings

Browse Source 
Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: I94969f6903d047b9bc41b1e8c14096c92c460b38
This commit is contained in:
Edgar Wang
2020-08-04 23:13:05 +08:00
parent 867e9db69d
commit 21f8cb3a44
21 changed files with 254 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/ResetNetworkTest.java
View File

@@ -18,10 +18,9 @@ package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.Shadows.shadowOf;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
import android.app.Activity;
import android.content.Intent;
@@ -57,7 +56,7 @@ public class ResetNetworkTest {
Intent intent = shadowOf(mActivity).getNextStartedActivity();
assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
.getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isTrue();
.getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isTrue();
}
@Test
@@ -69,7 +68,7 @@ public class ResetNetworkTest {
Intent intent = shadowOf(mActivity).getNextStartedActivity();
assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
.getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
.getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
}
@Test
@@ -81,7 +80,7 @@ public class ResetNetworkTest {
Intent intent = shadowOf(mActivity).getNextStartedActivity();
assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
.getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
.getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
}
@Test
@@ -93,6 +92,6 @@ public class ResetNetworkTest {
Intent intent = shadowOf(mActivity).getNextStartedActivity();
assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
.getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
.getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
}
}