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

Commit 3b7ae6e7 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Public API setSplashScreenStyle(3/N)"

parents ff5e679c 651d22c9

quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 
            ActivityOptionsCompat.setLauncherSourceInfo(

                    activityOptions.options, mLastTouchUpTime);

        }

        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

        activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

        addLaunchCookie(item, activityOptions.options);

        return activityOptions;

    }

quickstep/src/com/android/launcher3/uioverrides/QuickstepInteractionHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class QuickstepInteractionHandler implements RemoteViews.InteractionHandler { 
            }

        }

        activityOptions.options.setPendingIntentLaunchFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_EMPTY);

        activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_EMPTY);

        Object itemInfo = hostView.getTag();

        if (itemInfo instanceof ItemInfo) {

            mLauncher.addLaunchCookie((ItemInfo) itemInfo, activityOptions.options);

quickstep/src/com/android/quickstep/RecentsActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
        final ActivityOptionsWrapper activityOptions = new ActivityOptionsWrapper(

                ActivityOptionsCompat.makeRemoteAnimation(adapterCompat),

                onEndCallback);

        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

        activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

        return activityOptions;

    }

quickstep/src/com/android/quickstep/TaskShortcutFactory.java

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ public interface TaskShortcutFactory { 


            ActivityOptions options = mFactory.makeLaunchOptions(mTarget);

            if (options != null) {

                options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

                options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

            }

            if (options != null

                    && ActivityManagerWrapper.getInstance().startActivityFromRecents(taskId,