PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix lint error in errorprone target (only in tm-qpr-dev)" into tm-qpr-dev am: ec6c2591c5 am: a9934f00d3 am: f296b3421d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22293181

Change-Id: Id276de7b242b9e9ffdaa1e18dabb824bc58e1455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hyunyoung Song
2023-03-28 00:01:23 +00:00
committed by Automerger Merge Worker
parent 215a29a724 f296b3421d
commit 16d72696ba
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/views/ActivityContext.java
+3 -2
View File
@@ -324,8 +324,9 @@ public interface ActivityContext {
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) {
} else if (android.os.Build.VERSION.SDK_INT >= 33
&& item != null
&& item.animationType == LauncherSettings.Animation.DEFAULT_NO_ICON) {
optsBundle = ActivityOptions.makeBasic()
.setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR).toBundle();
}