Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 614de3b7 authored by Victor Chang's avatar Victor Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix not delivering result to fragment using SubSettingLauncher"

parents fc9eeb63 61f72881

src/com/android/settings/core/SubSettingLauncher.java

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ public class SubSettingLauncher { 
    }



    private void launchForResult(Fragment listener, Intent intent, int requestCode) {

        listener.getActivity().startActivityForResult(intent, requestCode);

        listener.startActivityForResult(intent, requestCode);

    }



    /**

tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java

+1 −2
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ public final class AppInfoDashboardFragmentTest { 
    public void startAppInfoFragment_includesNewAndOldArgs() {

        final SettingsPreferenceFragment caller = mock(SettingsPreferenceFragment.class);

        final SettingsActivity sa = mock (SettingsActivity.class);

        when(caller.getActivity()).thenReturn(sa);

        when(caller.getContext()).thenReturn(sa);

        final AppEntry appEntry = mock(AppEntry.class);

        appEntry.info = mock(ApplicationInfo.class);
@@ -348,7 +347,7 @@ public final class AppInfoDashboardFragmentTest { 


        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);



        verify(sa).startActivityForResult(intent.capture(), any(Integer.class));

        verify(caller).startActivityForResult(intent.capture(), any(Integer.class));

        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)

            .containsKey("test"))

            .isTrue();

tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class AppInfoPreferenceControllerBaseTest { 
        mController.handlePreferenceTreeClick(mPreference);

        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);



        verify(mActivity).startActivityForResult(intentCaptor.capture(), eq(SUB_INFO_FRAGMENT));

        verify(mFragment).startActivityForResult(intentCaptor.capture(), eq(SUB_INFO_FRAGMENT));

        assertThat(intentCaptor.getValue().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))

                .isEqualTo(mController.getDetailFragmentClass().getName());

    }

tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class SubSettingLauncherTest { 
                .setResultListener(mFragment, requestCode)

                .launch();



        verify(mActivity).startActivityForResult(any(Intent.class), eq(requestCode));

        verify(mFragment).startActivityForResult(any(Intent.class), eq(requestCode));

    }



    @Test