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

Commit 63de208b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Passed an extra flag denoting whether assetId is present or not" into udc-qpr-dev

parents 6bcdc993 37c6c9d6

src/com/android/customization/model/theme/ThemeBundledWallpaperInfo.java

+3 −3
Original line number Diff line number Diff line
@@ -137,13 +137,13 @@ public class ThemeBundledWallpaperInfo extends WallpaperInfo { 


    @Override

    public void showPreview(Activity srcActivity, InlinePreviewIntentFactory factory,

            int requestCode) {

            int requestCode, boolean isAssetIdPresent) {

        try {

            srcActivity.startActivityForResult(factory.newIntent(srcActivity, this), requestCode);

            srcActivity.startActivityForResult(factory.newIntent(srcActivity, this,

                    isAssetIdPresent), requestCode);

        } catch (ActivityNotFoundException |SecurityException e) {

            Log.e(TAG, "App isn't installed or ThemePicker doesn't have permission to launch", e);

        }



    }



    @Override

src/com/android/customization/module/ThemePickerInjector.kt

+2 −1
Original line number Diff line number Diff line
@@ -181,7 +181,8 @@ internal constructor( 
        mode: Int,

        viewAsHome: Boolean,

        viewFullScreen: Boolean,

        testingModeEnabled: Boolean

        testingModeEnabled: Boolean,

        isAssetIdPresent: Boolean

    ): Fragment {

        return if (wallpaperInfo is LiveWallpaperInfo) LivePreviewFragment()

        else