Projects >> ADWLauncher2 >>e90cc3ba6c6ccd383f31b539367c2cccea278fed

Chunk
Conflicting content 
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
<<<<<<< HEAD
import android.os.Handler;
import android.os.HandlerThread;
=======
import android.os.Environment;
>>>>>>> 35e79e32808456a7f5f21126ed2fa7badf8dc0bc
import android.os.Parcelable;
import android.os.RemoteException;
import android.util.Log;
Solution content 
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Parcelable;
import android.os.RemoteException;
import android.util.Log;
File
LauncherModel.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                
                            ? Process.THREAD_PRIORITY_DEFAULT : Process.THREAD_PRIORITY_BACKGROUND);
                }

<<<<<<< HEAD
=======
                if (PROFILE_LOADERS) {
                    android.os.Debug.startMethodTracing(
                            Environment.getExternalStorageDirectory() + "/launcher-loaders");
                }
>>>>>>> 35e79e32808456a7f5f21126ed2fa7badf8dc0bc
                if (loadWorkspaceFirst) {
                    if (DEBUG_LOADERS) Log.d(TAG, "step 1: loading workspace");
                    loadAndBindWorkspace();
Solution content 
                            ? Process.THREAD_PRIORITY_DEFAULT : Process.THREAD_PRIORITY_BACKGROUND);
                }

                if (loadWorkspaceFirst) {
                    if (DEBUG_LOADERS) Log.d(TAG, "step 1: loading workspace");
                    loadAndBindWorkspace();
File
LauncherModel.java
Developer's decision
Version 1
Kind of conflict
If statement