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

Merge "fix broken build on erorrprone" into tm-dev am: ad90ded7bc

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

Change-Id: If9d25c16a5014ea6616904955e1223413351042b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jonathan Scott
2022-04-14 18:06:18 +00:00
committed by Automerger Merge Worker
parent c19ce4bf3e ad90ded7bc
commit 1ff6d5fd4e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.bp
+1
View File
@@ -107,6 +107,7 @@ android_library {
"androidx.cardview_cardview", "androidx.cardview_cardview",
"com.google.android.material_material", "com.google.android.material_material",
"iconloader_base", "iconloader_base",
"modules-utils-build",
], ],
manifest: "AndroidManifest-common.xml", manifest: "AndroidManifest-common.xml",
sdk_version: "current", sdk_version: "current",
src/com/android/launcher3/Utilities.java
+4 -4
View File
@@ -74,7 +74,6 @@ import android.widget.LinearLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.graphics.ColorUtils; import androidx.core.graphics.ColorUtils;
import androidx.core.os.BuildCompat;
import com.android.launcher3.dragndrop.FolderAdaptiveIcon; import com.android.launcher3.dragndrop.FolderAdaptiveIcon;
import com.android.launcher3.graphics.GridCustomizationsProvider; import com.android.launcher3.graphics.GridCustomizationsProvider;
@@ -94,6 +93,7 @@ import com.android.launcher3.util.Themes;
import com.android.launcher3.views.ActivityContext; import com.android.launcher3.views.ActivityContext;
import com.android.launcher3.views.BaseDragLayer; import com.android.launcher3.views.BaseDragLayer;
import com.android.launcher3.widget.PendingAddShortcutInfo; import com.android.launcher3.widget.PendingAddShortcutInfo;
import com.android.modules.utils.build.SdkLevel;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
@@ -126,11 +126,11 @@ public final class Utilities {
public static final boolean ATLEAST_Q = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q; public static final boolean ATLEAST_Q = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
public static final boolean ATLEAST_R = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R; public static final boolean ATLEAST_R = SdkLevel.isAtLeastR();
public static final boolean ATLEAST_S = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S; public static final boolean ATLEAST_S = SdkLevel.isAtLeastS();
public static final boolean ATLEAST_T = BuildCompat.isAtLeastT(); public static final boolean ATLEAST_T = SdkLevel.isAtLeastT();
/** /**
* Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}. * Set on a motion event dispatched from the nav bar. See {@link MotionEvent#setEdgeFlags(int)}.