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

Commit a38aab93 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by hyunyoungs
Browse files

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

Revert submission 21916962-revert-21447384-no-splash-UILAXIUPKJ

Reason for revert: Retry errorprone target

Reverted changes: /q/submissionid:21916962-revert-21447384-no-splash-UILAXIUPKJ
Flag: production issue. Not hidden behind flag
Bug: 269343536
Test: manual

Change-Id: Ia365f886d39d63472d72afc2033fc67e19109f57
parent 1c0a27a2

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

+4 −2
Original line number Diff line number Diff line
@@ -20,10 +20,11 @@ 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;
@@ -1068,7 +1069,8 @@ public class QuickstepLauncher extends Launcher { 
            activityOptions.options.setSourceInfo(ActivityOptions.SourceInfo.TYPE_LAUNCHER,

                    mLastTouchUpTime);

        }

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

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

                || item.animationType == VIEW_BACKGROUND)) {

            activityOptions.options.setSplashScreenStyle(

                    SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);

        } else {

src/com/android/launcher3/LauncherSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 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

+9 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 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;
@@ -320,7 +321,14 @@ public interface ActivityContext { 
            return false;

        }



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

        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();

        }

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



        // Prepare intent