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

Merge "Rename SubSettingLauncher.setTitle, add java doc"

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-09 18:01:10 +00:00
committed by Android (Google) Code Review
parent 7ce6ba52c5 e86eec0c07
commit c0e0262f9c
55 changed files with 101 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
View File

@@ -87,7 +87,7 @@ public class SubSettingLauncherTest {
public void launch_shouldIncludeAllParams() {
final ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext));
launcher.setTitle("123")
launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123)
@@ -111,7 +111,7 @@ public class SubSettingLauncherTest {
when(mFragment.getActivity()).thenReturn(mActivity);
final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext));
launcher.setTitle("123")
launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123)
@@ -128,7 +128,7 @@ public class SubSettingLauncherTest {
final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext));
doNothing().when(launcher).launchAsUser(any(Intent.class), any(UserHandle.class));
launcher.setTitle("123")
launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123)
@@ -147,7 +147,7 @@ public class SubSettingLauncherTest {
doNothing().when(launcher).launchForResultAsUser(
any(Intent.class), any(UserHandle.class), any(Fragment.class), anyInt());
launcher.setTitle("123")
launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123)

4
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -518,8 +518,8 @@ public class DataUsageSummaryPreferenceTest {
assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
.isEqualTo(NetworkTemplate.buildTemplateWifiWildcard());
assertThat(startedIntent.getCharSequenceExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE))
.isEqualTo(mContext.getString(R.string.wifi_data_usage));
assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
.isEqualTo(R.string.wifi_data_usage);
}
private void bindViewHolder() {

2
tests/unit/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
View File

@@ -89,7 +89,7 @@ public class BluetoothDeviceDetailsRotationTest {
args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, mDeviceAddress);
new SubSettingLauncher(activity)
.setDestination(BluetoothDeviceDetailsFragment.class.getName())
.setTitle("test")
.setTitleText("test")
.setArguments(args)
.setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN)
.launch();