| Chunk |
|---|
| Conflicting content |
|---|
// set sIsScreenXLarge and sScreenDensity *before* creating icon cache
final int screenSize = getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK;
<<<<<<< HEAD
sIsScreenLarge = screenSize == Configuration.SCREENLAYOUT_SIZE_LARGE ||
=======
sIsScreenXLarge = screenSize == Configuration.SCREENLAYOUT_SIZE_LARGE ||
>>>>>>> 328acffd8b2ba73693da76ce85581661db45c5aa
screenSize == Configuration.SCREENLAYOUT_SIZE_XLARGE;
sScreenDensity = getResources().getDisplayMetrics().density;
|
| Solution content |
|---|
// 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;
sScreenDensity = getResources().getDisplayMetrics().density;
|
| File |
|---|
| LauncherApplication.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Variable |