Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab9f90cc authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Don't include flags in configuration change if their value hasn't changed." into cm-10.1

parents cdd98977 1431fd8d

core/java/android/content/res/Configuration.java

+5 −3
Original line number Diff line number Diff line
@@ -884,11 +884,13 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
            changed |= ActivityInfo.CONFIG_SCREEN_SIZE;

            screenHeightDp = delta.screenHeightDp;

        }

        if (delta.smallestScreenWidthDp != SMALLEST_SCREEN_WIDTH_DP_UNDEFINED) {

            changed |= ActivityInfo.CONFIG_SCREEN_SIZE;

        if (delta.smallestScreenWidthDp != SMALLEST_SCREEN_WIDTH_DP_UNDEFINED

                && smallestScreenWidthDp != delta.smallestScreenWidthDp) {

            changed |= ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE;

            smallestScreenWidthDp = delta.smallestScreenWidthDp;

        }

        if (delta.densityDpi != DENSITY_DPI_UNDEFINED) {

        if (delta.densityDpi != DENSITY_DPI_UNDEFINED &&

                densityDpi != delta.densityDpi) {

            changed |= ActivityInfo.CONFIG_DENSITY;

            densityDpi = delta.densityDpi;

        }