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

Commit 293688a9 authored by Eddie Lan's avatar Eddie Lan Committed by Hyunyoung Song
Browse files

Revert "Hide the splash icon when launching with no view and no ..." 

Revert submission 21447384-no-splash

Reason for revert: build break
Bug: 272383391

Reverted changes: /q/submissionid:21447384-no-splash

Change-Id: I73565b1f4e5dd969237980b2b5dbeee7b563abcb
parent f295e3a8

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

+4 −4
Original line number Diff line number Diff line
@@ -20,11 +20,10 @@ import static android.os.Trace.TRACE_TAG_APP; 
import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_OPTIMIZE_MEASURE;

import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_FOCUSED;



import static com.android.launcher3.LauncherSettings.Animation.DEFAULT_NO_ICON;

import static com.android.launcher3.LauncherSettings.Animation.VIEW_BACKGROUND;

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;
@@ -170,6 +169,7 @@ import com.android.quickstep.views.FloatingTaskView; 
import com.android.quickstep.views.OverviewActionsView;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.unfold.RemoteUnfoldSharedComponent;

import com.android.systemui.unfold.UnfoldSharedComponent;
@@ -187,6 +187,7 @@ import java.io.PrintWriter; 
import java.util.ArrayList;

import java.util.List;

import java.util.Objects;

import java.util.function.Consumer;

import java.util.function.Predicate;

import java.util.stream.Stream;
@@ -1049,8 +1050,7 @@ public class QuickstepLauncher extends Launcher { 
            activityOptions.options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_LAUNCHER,

                    mLastTouchUpTime);

        }

        if (item != null && (item.animationType == DEFAULT_NO_ICON

                || item.animationType == VIEW_BACKGROUND)) {

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

            activityOptions.options.setSplashScreenStyle(

                    SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);

        } else {

src/com/android/launcher3/LauncherSettings.java

+0 −4
Original line number Diff line number Diff line
@@ -41,10 +41,6 @@ public class LauncherSettings { 
         * An animation using the view's background.

         */

        public static final int VIEW_BACKGROUND = 1;

        /**

         * The default animation for a given view/item info type, but without the splash icon.

         */

        public static final int DEFAULT_NO_ICON = 2;

    }



    /**

src/com/android/launcher3/views/ActivityContext.java

+1 −9
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.view.WindowInsets; 
import android.view.WindowInsetsController;

import android.view.inputmethod.InputMethodManager;

import android.widget.Toast;

import android.window.SplashScreen;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;
@@ -321,14 +320,7 @@ public interface ActivityContext { 
            return false;

        }



        Bundle optsBundle = null;

        if (v != null) {

            optsBundle = getActivityLaunchOptions(v, item).toBundle();

        } else if (item != null && item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON

                && Utilities.ATLEAST_T) {

            optsBundle = ActivityOptions.makeBasic()

                    .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR).toBundle();

        }

        Bundle optsBundle = (v != null) ? getActivityLaunchOptions(v, item).toBundle() : null;

        UserHandle user = item == null ? null : item.user;



        // Prepare intent