Projects information

Chunk

Conflicting content
com.android.internal.R.styleable.AndroidManifestActivity_configChanges, 0); if (owner.applicationInfo.targetSdkVersion <<<<<<< HEAD < android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) { ======= < android.os.Build.VERSION_CODES.HONEYCOMB_MR2) { >>>>>>> 2e4a3236a7634d17f89288e9739a438ecbea0471 a.info.configChanges \|= ActivityInfo.CONFIG_SCREEN_SIZE; } a.info.softInputMode = sa.getInt(

Conflicting content

                    com.android.internal.R.styleable.AndroidManifestActivity_configChanges,
                    0);
            if (owner.applicationInfo.targetSdkVersion
<<<<<<< HEAD
                        < android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
=======
                        < android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
>>>>>>> 2e4a3236a7634d17f89288e9739a438ecbea0471
                a.info.configChanges |= ActivityInfo.CONFIG_SCREEN_SIZE;
            }
            a.info.softInputMode = sa.getInt(

Solution content
com.android.internal.R.styleable.AndroidManifestActivity_configChanges, 0); if (owner.applicationInfo.targetSdkVersion < android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) { a.info.configChanges \|= ActivityInfo.CONFIG_SCREEN_SIZE; } a.info.softInputMode = sa.getInt(

Solution content

                    com.android.internal.R.styleable.AndroidManifestActivity_configChanges,
                    0);
            if (owner.applicationInfo.targetSdkVersion
                        < android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
                a.info.configChanges |= ActivityInfo.CONFIG_SCREEN_SIZE;
            }
            a.info.softInputMode = sa.getInt(

File
PackageParser.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content
} sb.append(mcc); sb.append("/"); sb.append(mnc); <<<<<<< HEAD if (locale != null) { sb.append(" "); sb.append(locale); } else { sb.append(" (no locale)"); } switch (touchscreen) { case TOUCHSCREEN_UNDEFINED: sb.append(" ?touch"); break; case TOUCHSCREEN_NOTOUCH: sb.append(" -touch"); break; case TOUCHSCREEN_STYLUS: sb.append(" stylus"); break; case TOUCHSCREEN_FINGER: sb.append(" finger"); break; default: sb.append(" touch="); sb.append(touchscreen); break; } switch (keyboard) { case KEYBOARD_UNDEFINED: sb.append(" ?keyb"); break; case KEYBOARD_NOKEYS: sb.append(" -keyb"); break; case KEYBOARD_QWERTY: sb.append(" qwerty"); break; case KEYBOARD_12KEY: sb.append(" 12key"); break; default: sb.append(" keys="); sb.append(keyboard); break; } switch (keyboardHidden) { case KEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break; case KEYBOARDHIDDEN_NO: sb.append("/v"); break; case KEYBOARDHIDDEN_YES: sb.append("/h"); break; case KEYBOARDHIDDEN_SOFT: sb.append("/s"); break; default: sb.append("/"); sb.append(keyboardHidden); break; } switch (hardKeyboardHidden) { case HARDKEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break; case HARDKEYBOARDHIDDEN_NO: sb.append("/v"); break; case HARDKEYBOARDHIDDEN_YES: sb.append("/h"); break; default: sb.append("/"); sb.append(hardKeyboardHidden); break; } switch (navigation) { case NAVIGATION_UNDEFINED: sb.append(" ?nav"); break; case NAVIGATION_NONAV: sb.append(" -nav"); break; case NAVIGATION_DPAD: sb.append(" dpad"); break; case NAVIGATION_TRACKBALL: sb.append(" tball"); break; case NAVIGATION_WHEEL: sb.append(" wheel"); break; default: sb.append(" nav="); sb.append(navigation); break; } switch (navigationHidden) { case NAVIGATIONHIDDEN_UNDEFINED: sb.append("/?"); break; case NAVIGATIONHIDDEN_NO: sb.append("/v"); break; case NAVIGATIONHIDDEN_YES: sb.append("/h"); break; default: sb.append("/"); sb.append(navigationHidden); break; } switch (orientation) { case ORIENTATION_UNDEFINED: sb.append(" ?orien"); break; case ORIENTATION_LANDSCAPE: sb.append(" land"); break; case ORIENTATION_PORTRAIT: sb.append(" port"); break; default: sb.append(" orien="); sb.append(orientation); break; } switch ((screenLayout&SCREENLAYOUT_SIZE_MASK)) { case SCREENLAYOUT_SIZE_UNDEFINED: sb.append(" ?lsize"); break; case SCREENLAYOUT_SIZE_SMALL: sb.append(" smll"); break; case SCREENLAYOUT_SIZE_NORMAL: sb.append(" nrml"); break; case SCREENLAYOUT_SIZE_LARGE: sb.append(" lrg"); break; case SCREENLAYOUT_SIZE_XLARGE: sb.append(" xlrg"); break; default: sb.append(" layoutSize="); sb.append(screenLayout&SCREENLAYOUT_SIZE_MASK); break; } switch ((screenLayout&SCREENLAYOUT_LONG_MASK)) { case SCREENLAYOUT_LONG_UNDEFINED: sb.append(" ?long"); break; case SCREENLAYOUT_LONG_NO: /* not-long is not interesting to print / break; case SCREENLAYOUT_LONG_YES: sb.append(" long"); break; default: sb.append(" layoutLong="); sb.append(screenLayout&SCREENLAYOUT_LONG_MASK); break; } switch ((uiMode&UI_MODE_TYPE_MASK)) { case UI_MODE_TYPE_UNDEFINED: sb.append(" ?uimode"); break; case UI_MODE_TYPE_NORMAL: / normal is not interesting to print / break; case UI_MODE_TYPE_DESK: sb.append(" desk"); break; case UI_MODE_TYPE_CAR: sb.append(" car"); break; default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break; } switch ((uiMode&UI_MODE_NIGHT_MASK)) { case UI_MODE_NIGHT_UNDEFINED: sb.append(" ?night"); break; case UI_MODE_NIGHT_NO: / not-night is not interesting to print */ break; case UI_MODE_NIGHT_YES: sb.append(" night"); break; default: sb.append(" night="); sb.append(uiMode&UI_MODE_NIGHT_MASK); break; } if (screenWidthDp != SCREEN_WIDTH_DP_UNDEFINED) { sb.append(" w"); sb.append(screenWidthDp); sb.append("dp"); } else { sb.append("?wdp"); } if (screenHeightDp != SCREEN_HEIGHT_DP_UNDEFINED) { sb.append(" h"); sb.append(screenHeightDp); sb.append("dp"); } else { sb.append("?hdp"); } ======= sb.append(" loc="); sb.append(locale); sb.append(" touch="); sb.append(touchscreen); sb.append(" keys="); sb.append(keyboard); sb.append("/"); sb.append(keyboardHidden); sb.append("/"); sb.append(hardKeyboardHidden); sb.append(" nav="); sb.append(navigation); sb.append("/"); sb.append(navigationHidden); sb.append(" orien="); switch(orientation) { case ORIENTATION_LANDSCAPE: sb.append("L"); break; case ORIENTATION_PORTRAIT: sb.append("P"); break; default: sb.append(orientation); sb.append(" layout=0x"); sb.append(java.lang.Integer.toHexString(screenLayout)); sb.append(" uiMode=0x"); sb.append(java.lang.Integer.toHexString(uiMode)); sb.append(" wdp="); sb.append(screenWidthDp); sb.append(" hdp="); sb.append(screenHeightDp); >>>>>>> 2e4a3236a7634d17f89288e9739a438ecbea0471 if (seq != 0) { sb.append(" s."); sb.append(seq);

Conflicting content

        }
        sb.append(mcc);
        sb.append("/");
        sb.append(mnc);
<<<<<<< HEAD
        if (locale != null) {
            sb.append(" ");
            sb.append(locale);
        } else {
            sb.append(" (no locale)");
        }
        switch (touchscreen) {
            case TOUCHSCREEN_UNDEFINED: sb.append(" ?touch"); break;
            case TOUCHSCREEN_NOTOUCH: sb.append(" -touch"); break;
            case TOUCHSCREEN_STYLUS: sb.append(" stylus"); break;
            case TOUCHSCREEN_FINGER: sb.append(" finger"); break;
            default: sb.append(" touch="); sb.append(touchscreen); break;
        }
        switch (keyboard) {
            case KEYBOARD_UNDEFINED: sb.append(" ?keyb"); break;
            case KEYBOARD_NOKEYS: sb.append(" -keyb"); break;
            case KEYBOARD_QWERTY: sb.append(" qwerty"); break;
            case KEYBOARD_12KEY: sb.append(" 12key"); break;
            default: sb.append(" keys="); sb.append(keyboard); break;
        }
        switch (keyboardHidden) {
            case KEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break;
            case KEYBOARDHIDDEN_NO: sb.append("/v"); break;
            case KEYBOARDHIDDEN_YES: sb.append("/h"); break;
            case KEYBOARDHIDDEN_SOFT: sb.append("/s"); break;
            default: sb.append("/"); sb.append(keyboardHidden); break;
        }
        switch (hardKeyboardHidden) {
            case HARDKEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break;
            case HARDKEYBOARDHIDDEN_NO: sb.append("/v"); break;
            case HARDKEYBOARDHIDDEN_YES: sb.append("/h"); break;
            default: sb.append("/"); sb.append(hardKeyboardHidden); break;
        }
        switch (navigation) {
            case NAVIGATION_UNDEFINED: sb.append(" ?nav"); break;
            case NAVIGATION_NONAV: sb.append(" -nav"); break;
            case NAVIGATION_DPAD: sb.append(" dpad"); break;
            case NAVIGATION_TRACKBALL: sb.append(" tball"); break;
            case NAVIGATION_WHEEL: sb.append(" wheel"); break;
            default: sb.append(" nav="); sb.append(navigation); break;
        }
        switch (navigationHidden) {
            case NAVIGATIONHIDDEN_UNDEFINED: sb.append("/?"); break;
            case NAVIGATIONHIDDEN_NO: sb.append("/v"); break;
            case NAVIGATIONHIDDEN_YES: sb.append("/h"); break;
            default: sb.append("/"); sb.append(navigationHidden); break;
        }
        switch (orientation) {
            case ORIENTATION_UNDEFINED: sb.append(" ?orien"); break;
            case ORIENTATION_LANDSCAPE: sb.append(" land"); break;
            case ORIENTATION_PORTRAIT: sb.append(" port"); break;
            default: sb.append(" orien="); sb.append(orientation); break;
        }
        switch ((screenLayout&SCREENLAYOUT_SIZE_MASK)) {
            case SCREENLAYOUT_SIZE_UNDEFINED: sb.append(" ?lsize"); break;
            case SCREENLAYOUT_SIZE_SMALL: sb.append(" smll"); break;
            case SCREENLAYOUT_SIZE_NORMAL: sb.append(" nrml"); break;
            case SCREENLAYOUT_SIZE_LARGE: sb.append(" lrg"); break;
            case SCREENLAYOUT_SIZE_XLARGE: sb.append(" xlrg"); break;
            default: sb.append(" layoutSize=");
                    sb.append(screenLayout&SCREENLAYOUT_SIZE_MASK); break;
        }
        switch ((screenLayout&SCREENLAYOUT_LONG_MASK)) {
            case SCREENLAYOUT_LONG_UNDEFINED: sb.append(" ?long"); break;
            case SCREENLAYOUT_LONG_NO: /* not-long is not interesting to print */ break;
            case SCREENLAYOUT_LONG_YES: sb.append(" long"); break;
            default: sb.append(" layoutLong=");
                    sb.append(screenLayout&SCREENLAYOUT_LONG_MASK); break;
        }
        switch ((uiMode&UI_MODE_TYPE_MASK)) {
            case UI_MODE_TYPE_UNDEFINED: sb.append(" ?uimode"); break;
            case UI_MODE_TYPE_NORMAL: /* normal is not interesting to print */ break;
            case UI_MODE_TYPE_DESK: sb.append(" desk"); break;
            case UI_MODE_TYPE_CAR: sb.append(" car"); break;
            default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break;
        }
        switch ((uiMode&UI_MODE_NIGHT_MASK)) {
            case UI_MODE_NIGHT_UNDEFINED: sb.append(" ?night"); break;
            case UI_MODE_NIGHT_NO: /* not-night is not interesting to print */ break;
            case UI_MODE_NIGHT_YES: sb.append(" night"); break;
            default: sb.append(" night="); sb.append(uiMode&UI_MODE_NIGHT_MASK); break;
        }
        if (screenWidthDp != SCREEN_WIDTH_DP_UNDEFINED) {
            sb.append(" w"); sb.append(screenWidthDp); sb.append("dp");
        } else {
            sb.append("?wdp");
        }
        if (screenHeightDp != SCREEN_HEIGHT_DP_UNDEFINED) {
            sb.append(" h"); sb.append(screenHeightDp); sb.append("dp");
        } else {
            sb.append("?hdp");
        }
=======
        sb.append(" loc=");
        sb.append(locale);
        sb.append(" touch=");
        sb.append(touchscreen);
        sb.append(" keys=");
        sb.append(keyboard);
        sb.append("/");
        sb.append(keyboardHidden);
        sb.append("/");
        sb.append(hardKeyboardHidden);
        sb.append(" nav=");
        sb.append(navigation);
        sb.append("/");
        sb.append(navigationHidden);
        sb.append(" orien=");
        switch(orientation) {
            case ORIENTATION_LANDSCAPE:
                sb.append("L"); break;
            case ORIENTATION_PORTRAIT:
                sb.append("P"); break;
            default:
                sb.append(orientation);
        sb.append(" layout=0x");
        sb.append(java.lang.Integer.toHexString(screenLayout));
        sb.append(" uiMode=0x");
        sb.append(java.lang.Integer.toHexString(uiMode));
        sb.append(" wdp=");
        sb.append(screenWidthDp);
        sb.append(" hdp=");
        sb.append(screenHeightDp);
>>>>>>> 2e4a3236a7634d17f89288e9739a438ecbea0471
        if (seq != 0) {
            sb.append(" s.");
            sb.append(seq);

Solution content
sb.append(mcc); sb.append("/"); sb.append(mnc); if (locale != null) { sb.append(" "); sb.append(locale); } else { sb.append(" (no locale)"); } switch (touchscreen) { case TOUCHSCREEN_UNDEFINED: sb.append(" ?touch"); break; case TOUCHSCREEN_NOTOUCH: sb.append(" -touch"); break; case TOUCHSCREEN_STYLUS: sb.append(" stylus"); break; case TOUCHSCREEN_FINGER: sb.append(" finger"); break; default: sb.append(" touch="); sb.append(touchscreen); break; } switch (keyboard) { case KEYBOARD_UNDEFINED: sb.append(" ?keyb"); break; case KEYBOARD_NOKEYS: sb.append(" -keyb"); break; case KEYBOARD_QWERTY: sb.append(" qwerty"); break; case KEYBOARD_12KEY: sb.append(" 12key"); break; default: sb.append(" keys="); sb.append(keyboard); break; } switch (keyboardHidden) { case KEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break; case KEYBOARDHIDDEN_NO: sb.append("/v"); break; case KEYBOARDHIDDEN_YES: sb.append("/h"); break; case KEYBOARDHIDDEN_SOFT: sb.append("/s"); break; default: sb.append("/"); sb.append(keyboardHidden); break; } switch (hardKeyboardHidden) { case HARDKEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break; case HARDKEYBOARDHIDDEN_NO: sb.append("/v"); break; case HARDKEYBOARDHIDDEN_YES: sb.append("/h"); break; default: sb.append("/"); sb.append(hardKeyboardHidden); break; } switch (navigation) { case NAVIGATION_UNDEFINED: sb.append(" ?nav"); break; case NAVIGATION_NONAV: sb.append(" -nav"); break; case NAVIGATION_DPAD: sb.append(" dpad"); break; case NAVIGATION_TRACKBALL: sb.append(" tball"); break; case NAVIGATION_WHEEL: sb.append(" wheel"); break; default: sb.append(" nav="); sb.append(navigation); break; } switch (navigationHidden) { case NAVIGATIONHIDDEN_UNDEFINED: sb.append("/?"); break; case NAVIGATIONHIDDEN_NO: sb.append("/v"); break; case NAVIGATIONHIDDEN_YES: sb.append("/h"); break; default: sb.append("/"); sb.append(navigationHidden); break; } switch (orientation) { case ORIENTATION_UNDEFINED: sb.append(" ?orien"); break; case ORIENTATION_LANDSCAPE: sb.append(" land"); break; case ORIENTATION_PORTRAIT: sb.append(" port"); break; default: sb.append(" orien="); sb.append(orientation); break; } switch ((screenLayout&SCREENLAYOUT_SIZE_MASK)) { case SCREENLAYOUT_SIZE_UNDEFINED: sb.append(" ?lsize"); break; case SCREENLAYOUT_SIZE_SMALL: sb.append(" smll"); break; case SCREENLAYOUT_SIZE_NORMAL: sb.append(" nrml"); break; case SCREENLAYOUT_SIZE_LARGE: sb.append(" lrg"); break; case SCREENLAYOUT_SIZE_XLARGE: sb.append(" xlrg"); break; default: sb.append(" layoutSize="); sb.append(screenLayout&SCREENLAYOUT_SIZE_MASK); break; } switch ((screenLayout&SCREENLAYOUT_LONG_MASK)) { case SCREENLAYOUT_LONG_UNDEFINED: sb.append(" ?long"); break; case SCREENLAYOUT_LONG_NO: /* not-long is not interesting to print / break; case SCREENLAYOUT_LONG_YES: sb.append(" long"); break; default: sb.append(" layoutLong="); sb.append(screenLayout&SCREENLAYOUT_LONG_MASK); break; } switch ((uiMode&UI_MODE_TYPE_MASK)) { case UI_MODE_TYPE_UNDEFINED: sb.append(" ?uimode"); break; case UI_MODE_TYPE_NORMAL: / normal is not interesting to print / break; case UI_MODE_TYPE_DESK: sb.append(" desk"); break; case UI_MODE_TYPE_CAR: sb.append(" car"); break; default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break; } switch ((uiMode&UI_MODE_NIGHT_MASK)) { case UI_MODE_NIGHT_UNDEFINED: sb.append(" ?night"); break; case UI_MODE_NIGHT_NO: / not-night is not interesting to print */ break; case UI_MODE_NIGHT_YES: sb.append(" night"); break; default: sb.append(" night="); sb.append(uiMode&UI_MODE_NIGHT_MASK); break; } if (screenWidthDp != SCREEN_WIDTH_DP_UNDEFINED) { sb.append(" w"); sb.append(screenWidthDp); sb.append("dp"); } else { sb.append("?wdp"); } if (screenHeightDp != SCREEN_HEIGHT_DP_UNDEFINED) { sb.append(" h"); sb.append(screenHeightDp); sb.append("dp"); } else { sb.append("?hdp"); } if (seq != 0) { sb.append(" s."); sb.append(seq);

Solution content

        sb.append(mcc);
        sb.append("/");
        sb.append(mnc);
        if (locale != null) {
            sb.append(" ");
            sb.append(locale);
        } else {
            sb.append(" (no locale)");
        }
        switch (touchscreen) {
            case TOUCHSCREEN_UNDEFINED: sb.append(" ?touch"); break;
            case TOUCHSCREEN_NOTOUCH: sb.append(" -touch"); break;
            case TOUCHSCREEN_STYLUS: sb.append(" stylus"); break;
            case TOUCHSCREEN_FINGER: sb.append(" finger"); break;
            default: sb.append(" touch="); sb.append(touchscreen); break;
        }
        switch (keyboard) {
            case KEYBOARD_UNDEFINED: sb.append(" ?keyb"); break;
            case KEYBOARD_NOKEYS: sb.append(" -keyb"); break;
            case KEYBOARD_QWERTY: sb.append(" qwerty"); break;
            case KEYBOARD_12KEY: sb.append(" 12key"); break;
            default: sb.append(" keys="); sb.append(keyboard); break;
        }
        switch (keyboardHidden) {
            case KEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break;
            case KEYBOARDHIDDEN_NO: sb.append("/v"); break;
            case KEYBOARDHIDDEN_YES: sb.append("/h"); break;
            case KEYBOARDHIDDEN_SOFT: sb.append("/s"); break;
            default: sb.append("/"); sb.append(keyboardHidden); break;
        }
        switch (hardKeyboardHidden) {
            case HARDKEYBOARDHIDDEN_UNDEFINED: sb.append("/?"); break;
            case HARDKEYBOARDHIDDEN_NO: sb.append("/v"); break;
            case HARDKEYBOARDHIDDEN_YES: sb.append("/h"); break;
            default: sb.append("/"); sb.append(hardKeyboardHidden); break;
        }
        switch (navigation) {
            case NAVIGATION_UNDEFINED: sb.append(" ?nav"); break;
            case NAVIGATION_NONAV: sb.append(" -nav"); break;
            case NAVIGATION_DPAD: sb.append(" dpad"); break;
            case NAVIGATION_TRACKBALL: sb.append(" tball"); break;
            case NAVIGATION_WHEEL: sb.append(" wheel"); break;
            default: sb.append(" nav="); sb.append(navigation); break;
        }
        switch (navigationHidden) {
            case NAVIGATIONHIDDEN_UNDEFINED: sb.append("/?"); break;
            case NAVIGATIONHIDDEN_NO: sb.append("/v"); break;
            case NAVIGATIONHIDDEN_YES: sb.append("/h"); break;
            default: sb.append("/"); sb.append(navigationHidden); break;
        }
        switch (orientation) {
            case ORIENTATION_UNDEFINED: sb.append(" ?orien"); break;
            case ORIENTATION_LANDSCAPE: sb.append(" land"); break;
            case ORIENTATION_PORTRAIT: sb.append(" port"); break;
            default: sb.append(" orien="); sb.append(orientation); break;
        }
        switch ((screenLayout&SCREENLAYOUT_SIZE_MASK)) {
            case SCREENLAYOUT_SIZE_UNDEFINED: sb.append(" ?lsize"); break;
            case SCREENLAYOUT_SIZE_SMALL: sb.append(" smll"); break;
            case SCREENLAYOUT_SIZE_NORMAL: sb.append(" nrml"); break;
            case SCREENLAYOUT_SIZE_LARGE: sb.append(" lrg"); break;
            case SCREENLAYOUT_SIZE_XLARGE: sb.append(" xlrg"); break;
            default: sb.append(" layoutSize=");
                    sb.append(screenLayout&SCREENLAYOUT_SIZE_MASK); break;
        }
        switch ((screenLayout&SCREENLAYOUT_LONG_MASK)) {
            case SCREENLAYOUT_LONG_UNDEFINED: sb.append(" ?long"); break;
            case SCREENLAYOUT_LONG_NO: /* not-long is not interesting to print */ break;
            case SCREENLAYOUT_LONG_YES: sb.append(" long"); break;
            default: sb.append(" layoutLong=");
                    sb.append(screenLayout&SCREENLAYOUT_LONG_MASK); break;
        }
        switch ((uiMode&UI_MODE_TYPE_MASK)) {
            case UI_MODE_TYPE_UNDEFINED: sb.append(" ?uimode"); break;
            case UI_MODE_TYPE_NORMAL: /* normal is not interesting to print */ break;
            case UI_MODE_TYPE_DESK: sb.append(" desk"); break;
            case UI_MODE_TYPE_CAR: sb.append(" car"); break;
            default: sb.append(" uimode="); sb.append(uiMode&UI_MODE_TYPE_MASK); break;
        }
        switch ((uiMode&UI_MODE_NIGHT_MASK)) {
            case UI_MODE_NIGHT_UNDEFINED: sb.append(" ?night"); break;
            case UI_MODE_NIGHT_NO: /* not-night is not interesting to print */ break;
            case UI_MODE_NIGHT_YES: sb.append(" night"); break;
            default: sb.append(" night="); sb.append(uiMode&UI_MODE_NIGHT_MASK); break;
        }
        if (screenWidthDp != SCREEN_WIDTH_DP_UNDEFINED) {
            sb.append(" w"); sb.append(screenWidthDp); sb.append("dp");
        } else {
            sb.append("?wdp");
        }
        if (screenHeightDp != SCREEN_HEIGHT_DP_UNDEFINED) {
            sb.append(" h"); sb.append(screenHeightDp); sb.append("dp");
        } else {
            sb.append("?hdp");
        }
        if (seq != 0) {
            sb.append(" s.");
            sb.append(seq);

File
Configuration.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation
Switch statement

Chunk

Conflicting content
} config.screenWidthDp = (int)(dm.widthPixels / dm.density); config.screenHeightDp = (int)(dm.heightPixels / dm.density); <<<<<<< HEAD // Compute the screen layout size class. int screenLayout; int longSize = dw; int shortSize = dh; if (longSize < shortSize) { int tmp = longSize; longSize = shortSize; shortSize = tmp; } longSize = (int)(longSize/dm.density); shortSize = (int)(shortSize/dm.density); // These semi-magic numbers define our compatibility modes for // applications with different screens. These are guarantees to // app developers about the space they can expect for a particular // configuration. DO NOT CHANGE! if (longSize < 470) { // This is shorter than an HVGA normal density screen (which // is 480 pixels on its long side). screenLayout = Configuration.SCREENLAYOUT_SIZE_SMALL \| Configuration.SCREENLAYOUT_LONG_NO; } else { // What size is this screen screen? if (longSize >= 960 && shortSize >= 720) { // 1.5xVGA or larger screens at medium density are the point // at which we consider it to be an extra large screen. screenLayout = Configuration.SCREENLAYOUT_SIZE_XLARGE; } else if (longSize >= 640 && shortSize >= 480) { // VGA or larger screens at medium density are the point // at which we consider it to be a large screen. screenLayout = Configuration.SCREENLAYOUT_SIZE_LARGE; ======= if (mScreenLayout == Configuration.SCREENLAYOUT_SIZE_UNDEFINED) { // Note we only do this once because at this point we don't // expect the screen to change in this way at runtime, and want // to avoid all of this computation for every config change. int longSize = dw; int shortSize = dh; if (longSize < shortSize) { int tmp = longSize; longSize = shortSize; shortSize = tmp; } longSize = (int)(longSize/dm.density); shortSize = (int)(shortSize/dm.density); // These semi-magic numbers define our compatibility modes for // applications with different screens. These are guarantees to // app developers about the space they can expect for a particular // configuration. DO NOT CHANGE! if (longSize < 470) { // This is shorter than an HVGA normal density screen (which // is 480 pixels on its long side). mScreenLayout = Configuration.SCREENLAYOUT_SIZE_SMALL \| Configuration.SCREENLAYOUT_LONG_NO; >>>>>>> 2e4a3236a7634d17f89288e9739a438ecbea0471 } else { screenLayout = Configuration.SCREENLAYOUT_SIZE_NORMAL;

Conflicting content

            }
        config.screenWidthDp = (int)(dm.widthPixels / dm.density);
        config.screenHeightDp = (int)(dm.heightPixels / dm.density);

<<<<<<< HEAD
        // Compute the screen layout size class.
        int screenLayout;
        int longSize = dw;
        int shortSize = dh;
        if (longSize < shortSize) {
            int tmp = longSize;
            longSize = shortSize;
            shortSize = tmp;
        }
        longSize = (int)(longSize/dm.density);
        shortSize = (int)(shortSize/dm.density);

        // These semi-magic numbers define our compatibility modes for
        // applications with different screens.  These are guarantees to
        // app developers about the space they can expect for a particular
        // configuration.  DO NOT CHANGE!
        if (longSize < 470) {
            // This is shorter than an HVGA normal density screen (which
            // is 480 pixels on its long side).
            screenLayout = Configuration.SCREENLAYOUT_SIZE_SMALL
                    | Configuration.SCREENLAYOUT_LONG_NO;
        } else {
            // What size is this screen screen?
            if (longSize >= 960 && shortSize >= 720) {
                // 1.5xVGA or larger screens at medium density are the point
                // at which we consider it to be an extra large screen.
                screenLayout = Configuration.SCREENLAYOUT_SIZE_XLARGE;
            } else if (longSize >= 640 && shortSize >= 480) {
                // VGA or larger screens at medium density are the point
                // at which we consider it to be a large screen.
                screenLayout = Configuration.SCREENLAYOUT_SIZE_LARGE;
=======
        if (mScreenLayout == Configuration.SCREENLAYOUT_SIZE_UNDEFINED) {
            // Note we only do this once because at this point we don't
            // expect the screen to change in this way at runtime, and want
            // to avoid all of this computation for every config change.
            int longSize = dw;
            int shortSize = dh;
            if (longSize < shortSize) {
                int tmp = longSize;
                longSize = shortSize;
                shortSize = tmp;
            }
            longSize = (int)(longSize/dm.density);
            shortSize = (int)(shortSize/dm.density);

            // These semi-magic numbers define our compatibility modes for
            // applications with different screens.  These are guarantees to
            // app developers about the space they can expect for a particular
            // configuration.  DO NOT CHANGE!
            if (longSize < 470) {
                // This is shorter than an HVGA normal density screen (which
                // is 480 pixels on its long side).
                mScreenLayout = Configuration.SCREENLAYOUT_SIZE_SMALL
                        | Configuration.SCREENLAYOUT_LONG_NO;
>>>>>>> 2e4a3236a7634d17f89288e9739a438ecbea0471
            } else {
                screenLayout = Configuration.SCREENLAYOUT_SIZE_NORMAL;

Solution content
config.screenWidthDp = (int)(dm.widthPixels / dm.density); config.screenHeightDp = (int)(dm.heightPixels / dm.density); // Compute the screen layout size class. int screenLayout; int longSize = dw; int shortSize = dh; if (longSize < shortSize) { int tmp = longSize; longSize = shortSize; shortSize = tmp; } longSize = (int)(longSize/dm.density); shortSize = (int)(shortSize/dm.density); // These semi-magic numbers define our compatibility modes for // applications with different screens. These are guarantees to // app developers about the space they can expect for a particular // configuration. DO NOT CHANGE! if (longSize < 470) { // This is shorter than an HVGA normal density screen (which // is 480 pixels on its long side). screenLayout = Configuration.SCREENLAYOUT_SIZE_SMALL \| Configuration.SCREENLAYOUT_LONG_NO; } else { // What size is this screen screen? if (longSize >= 960 && shortSize >= 720) { // 1.5xVGA or larger screens at medium density are the point // at which we consider it to be an extra large screen. screenLayout = Configuration.SCREENLAYOUT_SIZE_XLARGE; } else if (longSize >= 640 && shortSize >= 480) { // VGA or larger screens at medium density are the point // at which we consider it to be a large screen. screenLayout = Configuration.SCREENLAYOUT_SIZE_LARGE; } else { screenLayout = Configuration.SCREENLAYOUT_SIZE_NORMAL; }

Solution content

        config.screenWidthDp = (int)(dm.widthPixels / dm.density);
        config.screenHeightDp = (int)(dm.heightPixels / dm.density);

        // Compute the screen layout size class.
        int screenLayout;
        int longSize = dw;
        int shortSize = dh;
        if (longSize < shortSize) {
            int tmp = longSize;
            longSize = shortSize;
            shortSize = tmp;
        }
        longSize = (int)(longSize/dm.density);
        shortSize = (int)(shortSize/dm.density);

        // These semi-magic numbers define our compatibility modes for
        // applications with different screens.  These are guarantees to
        // app developers about the space they can expect for a particular
        // configuration.  DO NOT CHANGE!
        if (longSize < 470) {
            // This is shorter than an HVGA normal density screen (which
            // is 480 pixels on its long side).
            screenLayout = Configuration.SCREENLAYOUT_SIZE_SMALL
                    | Configuration.SCREENLAYOUT_LONG_NO;
        } else {
            // What size is this screen screen?
            if (longSize >= 960 && shortSize >= 720) {
                // 1.5xVGA or larger screens at medium density are the point
                // at which we consider it to be an extra large screen.
                screenLayout = Configuration.SCREENLAYOUT_SIZE_XLARGE;
            } else if (longSize >= 640 && shortSize >= 480) {
                // VGA or larger screens at medium density are the point
                // at which we consider it to be a large screen.
                screenLayout = Configuration.SCREENLAYOUT_SIZE_LARGE;
            } else {
                screenLayout = Configuration.SCREENLAYOUT_SIZE_NORMAL;
            }

File
WindowManagerService.java

Developer's decision
Version 1

Kind of conflict
Attribute
Cast expression
Comment
If statement
Variable

Projects >> android-frameworks-base-with-screenshot-tweaks >>dce3e2e120e029bd0f88e5e5cd760cd787b580e1