resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish (f514f207) · Commits · e / os / android_packages_apps_Trebuchet

AndroidManifest-common.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,8 @@

		<service android:name="com.android.launcher3.dynamicui.ColorExtractionService"
		android:exported="false"
		android:process=":wallpaper_chooser">
		android:process=":wallpaper_chooser"
		android:permission="android.permission.BIND_JOB_SERVICE">
		</service>

		<service

src/com/android/launcher3/Utilities.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

src/com/android/launcher3/dynamicui/ColorExtractionService.java

+69 −36

Original line number	Diff line number	Diff line
		@@ -17,9 +17,9 @@
		package com.android.launcher3.dynamicui;

		import android.annotation.TargetApi;
		import android.app.IntentService;
		import android.app.WallpaperManager;
		import android.content.Intent;
		import android.app.job.JobParameters;
		import android.app.job.JobService;
		import android.graphics.Bitmap;
		import android.graphics.BitmapFactory;
		import android.graphics.BitmapRegionDecoder;
		@@ -27,6 +27,8 @@ import android.graphics.Rect;
		import android.graphics.drawable.BitmapDrawable;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.HandlerThread;
		import android.os.ParcelFileDescriptor;
		import android.support.v7.graphics.Palette;
		import android.util.Log;
		@@ -42,25 +44,44 @@ import java.io.IOException;
		/**
		* Extracts colors from the wallpaper, and saves results to {@link LauncherProvider}.
		*/
		public class ColorExtractionService extends IntentService {
		public class ColorExtractionService extends JobService {

		private static final String TAG = "ColorExtractionService";
		private static final boolean DEBUG = false;

		/** The fraction of the wallpaper to extract colors for use on the hotseat. */
		private static final float HOTSEAT_FRACTION = 1f / 4;

		public ColorExtractionService() {
		super("ColorExtractionService");
		private HandlerThread mWorkerThread;
		private Handler mWorkerHandler;

		@Override
		public void onCreate() {
		super.onCreate();
		mWorkerThread = new HandlerThread("ColorExtractionService");
		mWorkerThread.start();
		mWorkerHandler = new Handler(mWorkerThread.getLooper());
		}

		@Override
		protected void onHandleIntent(Intent intent) {
		WallpaperManager wallpaperManager = WallpaperManager.getInstance(this);
		public void onDestroy() {
		super.onDestroy();
		mWorkerThread.quit();
		}

		@Override
		public boolean onStartJob(final JobParameters jobParameters) {
		if (DEBUG) Log.d(TAG, "onStartJob");
		mWorkerHandler.post(new Runnable() {
		@Override
		public void run() {
		WallpaperManager wallpaperManager = WallpaperManager.getInstance(
		ColorExtractionService.this);
		int wallpaperId = ExtractionUtils.getWallpaperId(wallpaperManager);

		ExtractedColors extractedColors = new ExtractedColors();
		if (wallpaperManager.getWallpaperInfo() != null) {
		// We can't extract colors from live wallpapers, so just use the default color always.
		// We can't extract colors from live wallpapers; always use the default color.
		extractedColors.updateHotseatPalette(null);

		if (FeatureFlags.QSB_IN_HOTSEAT \|\| FeatureFlags.LAUNCHER3_GRADIENT_ALL_APPS) {
		@@ -89,6 +110,18 @@ public class ColorExtractionService extends IntentService {
		LauncherSettings.Settings.CONTENT_URI,
		LauncherSettings.Settings.METHOD_SET_EXTRACTED_COLORS_AND_WALLPAPER_ID,
		null, extras);
		jobFinished(jobParameters, false /* needsReschedule */);
		if (DEBUG) Log.d(TAG, "job finished!");
		}
		});
		return true;
		}

		@Override
		public boolean onStopJob(JobParameters jobParameters) {
		if (DEBUG) Log.d(TAG, "onStopJob");
		mWorkerHandler.removeCallbacksAndMessages(null);
		return true;
		}

		@TargetApi(Build.VERSION_CODES.N)

src/com/android/launcher3/dynamicui/ExtractionUtils.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,10 @@ package com.android.launcher3.dynamicui;

		import android.annotation.TargetApi;
		import android.app.WallpaperManager;
		import android.app.job.JobInfo;
		import android.app.job.JobScheduler;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.graphics.Color;
		import android.os.Build;
		@@ -58,7 +60,11 @@ public class ExtractionUtils {

		/** Starts the {@link ColorExtractionService} without checking the wallpaper id */
		public static void startColorExtractionService(Context context) {
		context.startService(new Intent(context, ColorExtractionService.class));
		JobScheduler jobScheduler = (JobScheduler) context.getSystemService(
		Context.JOB_SCHEDULER_SERVICE);
		jobScheduler.schedule(new JobInfo.Builder(Utilities.COLOR_EXTRACTION_JOB_ID,
		new ComponentName(context, ColorExtractionService.class))
		.setMinimumLatency(0).build());
		}

		private static boolean hasWallpaperIdChanged(Context context) {