Merge "Revert "Revert "Hide the splash icon when launching with no view..."" into tm-qpr-dev am: e8abfee5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22067827 Change-Id: I1d5e7b401cfb874a0f801cfc0b5b76b53a608c64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user