resolved conflicts for merge of a3e22d6a to master

Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
This commit is contained in:
Andrew Flynn
2012-03-01 16:26:50 -08:00
51 changed files with 326 additions and 193 deletions

View File

@@ -27,6 +27,8 @@ import android.database.ContentObserver;
import android.os.Handler;
import android.view.MotionEvent;
import com.android.launcher.R;
import java.lang.ref.WeakReference;
public class LauncherApplication extends Application {
@@ -42,10 +44,7 @@ public class LauncherApplication extends Application {
super.onCreate();
// set sIsScreenXLarge and sScreenDensity *before* creating icon cache
final int screenSize = getResources().getConfiguration().screenLayout &
Configuration.SCREENLAYOUT_SIZE_MASK;
sIsScreenLarge = screenSize == Configuration.SCREENLAYOUT_SIZE_LARGE ||
screenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE;
sIsScreenLarge = getResources().getBoolean(R.bool.is_large_screen);
sScreenDensity = getResources().getDisplayMetrics().density;
mIconCache = new IconCache(this);