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

Commit 89eed125 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change... 

am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."

* commit 'c7322005':
  Don't include flags in configuration change if their value hasn't changed.
parents 959b9b39 c7322005

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

+5 −3
Original line number Diff line number Diff line
@@ -853,11 +853,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;

        }