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

Commit 527679d2 authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android (Google) Code Review
Browse files

Merge "Disable splash icon when launching a search result." into tm-qpr-dev

parents ab04ffb4 3be74496

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

+7 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED; 
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_DEEP_SHORTCUT;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SEARCH_ACTION;

import static com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT;

import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.NORMAL;
@@ -997,7 +998,12 @@ public class QuickstepLauncher extends Launcher { 
            activityOptions.options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_LAUNCHER,

                    mLastTouchUpTime);

        }

        if (item != null && item.itemType == ITEM_TYPE_SEARCH_ACTION) {

            activityOptions.options.setSplashScreenStyle(

                    SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);

        } else {

            activityOptions.options.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);

        }

        activityOptions.options.setLaunchDisplayId(

                (v != null && v.getDisplay() != null) ? v.getDisplay().getDisplayId()

                        : Display.DEFAULT_DISPLAY);