resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5aed3f0c978976c499b532c816d81196cb11e3a1
This commit is contained in:
Tony committed 2017-06-02 19:33:49 -07:00
commit f514f207c2
4 files changed
+81 -39

No files matched your search

+2
View File
@@ -110,6 +110,8 @@ public final class Utilities {
// An intent extra to indicate the horizontal scroll of the wallpaper.
public static final String EXTRA_WALLPAPER_OFFSET = "com.android.launcher3.WALLPAPER_OFFSET";
public static final int COLOR_EXTRACTION_JOB_ID = 1;
// These values are same as that in {@link AsyncTask}.
private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
private static final int CORE_POOL_SIZE = CPU_COUNT + 1;