diff options
| author | Tony <twickham@google.com> | 2017-06-02 19:33:49 -0700 |
|---|---|---|
| committer | Tony <twickham@google.com> | 2017-06-02 19:33:49 -0700 |
| commit | f514f207c2f2e22c4df179ce0d8eb16966e6b5dc (patch) | |
| tree | a6f24dd793e437135bb4624d15f75eae5a77e085 /src/com/android/launcher3/Utilities.java | |
| parent | d74633cbc559109e57b0f4531fb6556e79d7a453 (diff) | |
| parent | 629a67c5ac33409ebccf13284505a4cadc65656a (diff) | |
| download | android_packages_apps_Trebuchet-f514f207c2f2e22c4df179ce0d8eb16966e6b5dc.tar.gz android_packages_apps_Trebuchet-f514f207c2f2e22c4df179ce0d8eb16966e6b5dc.tar.bz2 android_packages_apps_Trebuchet-f514f207c2f2e22c4df179ce0d8eb16966e6b5dc.zip | |
resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5aed3f0c978976c499b532c816d81196cb11e3a1
Diffstat (limited to 'src/com/android/launcher3/Utilities.java')
| -rw-r--r-- | src/com/android/launcher3/Utilities.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index 61c970789..ffda67c38 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -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; |