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

Commit 5406db9d authored by George Lin's avatar George Lin
Browse files

Adding launch source info in the wallpaper picker intent (1/3) 

When launching Wallpaper & Style from the settings search, we should
also append the launch source information to the intent.

The major purpose if for logging. So that we know then entrypoint of the
Wallpaper & Style app.

Test: Manually tested that the intent contains the extra we need
Bug: 368052505
Flag: EXEMPT bugfix
Change-Id: I9af663dad7cb79bfe74431e6a61cd34393e60dbd
parent 133fcf3d

src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java

+7 −6
Original line number Diff line number Diff line
@@ -41,19 +41,20 @@ public class WallpaperSuggestionActivity extends StyleSuggestionActivityBase imp 
    private static final String WALLPAPER_FOCUS = "focus_wallpaper";

    private static final String WALLPAPER_ONLY = "wallpaper_only";

    private static final String LAUNCHED_SUW = "app_launched_suw";



    private String mWallpaperLaunchExtra;

    private static final String LAUNCH_SOURCE_SETTINGS_SEARCH = "app_launched_settings_search";



    @Override

    protected void addExtras(Intent intent) {

        String wallpaperLaunchExtra =

                getResources().getString(R.string.config_wallpaper_picker_launch_extra);;

        if (WizardManagerHelper.isAnySetupWizard(intent)) {

            intent.putExtra(WALLPAPER_FLAVOR_EXTRA, WALLPAPER_ONLY);



            mWallpaperLaunchExtra =

                    getResources().getString(R.string.config_wallpaper_picker_launch_extra);

            intent.putExtra(mWallpaperLaunchExtra, LAUNCHED_SUW);

            intent.putExtra(wallpaperLaunchExtra, LAUNCHED_SUW);

        } else {

            // This is the case when user enter the wallpaper picker from the search result entry

            // on the Settings app

            intent.putExtra(WALLPAPER_FLAVOR_EXTRA, WALLPAPER_FOCUS);

            intent.putExtra(wallpaperLaunchExtra, LAUNCH_SOURCE_SETTINGS_SEARCH);

        }

    }

tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java

+3 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class WallpaperSuggestionActivityTest { 
    }



    @Test

    public void addExtras_intentNotFromSetupWizard_extrasHasFocusWallpaper() {

    public void addExtras_intentNotFromSetupWizard_extrasHasFocusWallpaperAndLaunchedSettingsSearch() {

        WallpaperSuggestionActivity activity = Robolectric.buildActivity(

                WallpaperSuggestionActivity.class, new Intent(Intent.ACTION_MAIN).setComponent(

                        new ComponentName(RuntimeEnvironment.application,
@@ -127,6 +127,8 @@ public class WallpaperSuggestionActivityTest { 


        assertThat(intent).isNotNull();

        assertThat(intent.getStringExtra(WALLPAPER_FLAVOR)).isEqualTo("focus_wallpaper");

        assertThat(intent.getStringExtra(WALLPAPER_LAUNCH_SOURCE))

                .isEqualTo("app_launched_settings_search");

    }