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

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

Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev

parents 77afcf32 0fe23424

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

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.Bundle; 
import android.os.CancellationSignal;

import android.os.IBinder;

import android.view.View;

import android.window.SplashScreen;



import androidx.annotation.Nullable;
@@ -435,6 +436,7 @@ public abstract class BaseQuickstepLauncher extends Launcher 
            ActivityOptionsCompat.setLauncherSourceInfo(

                    activityOptions.options, mLastTouchUpTime);

        }

        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

        addLaunchCookie(item, activityOptions.options);

        return activityOptions;

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.view.SurfaceControl.Transaction;

import android.view.View;

import android.window.SplashScreen;



import androidx.annotation.Nullable;
@@ -222,9 +223,11 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> { 
                wrapper, RECENTS_LAUNCH_DURATION,

                RECENTS_LAUNCH_DURATION - STATUS_BAR_TRANSITION_DURATION

                        - STATUS_BAR_TRANSITION_PRE_DELAY);

        return new ActivityOptionsWrapper(

        final ActivityOptionsWrapper activityOptions = new ActivityOptionsWrapper(

                ActivityOptionsCompat.makeRemoteAnimation(adapterCompat),

                onEndCallback);

        activityOptions.options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

        return activityOptions;

    }



    /**

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

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.graphics.Rect; 
import android.os.Handler;

import android.os.Looper;

import android.view.View;

import android.window.SplashScreen;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.DeviceProfile;
@@ -165,6 +166,9 @@ public interface TaskShortcutFactory { 
            dismissTaskMenuView(mTarget);



            ActivityOptions options = mFactory.makeLaunchOptions(mTarget);

            if (options != null) {

                options.setSplashscreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

            }

            if (options != null

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

                            options)) {