diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-05-16 05:07:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-05-16 05:07:27 -0700 |
| commit | ab9f90cc32396c51d1ba1e8e9d7852a664936ff9 (patch) | |
| tree | 203720047d47b7bbcd5654429810da386e93b7d7 | |
| parent | cdd98977f5089eb829724579943dbe23480ea272 (diff) | |
| parent | 1431fd8d1befb5083b4f2eb7f22f5ee9c245b4f2 (diff) | |
| download | frameworks_base-ab9f90cc32396c51d1ba1e8e9d7852a664936ff9.zip frameworks_base-ab9f90cc32396c51d1ba1e8e9d7852a664936ff9.tar.gz frameworks_base-ab9f90cc32396c51d1ba1e8e9d7852a664936ff9.tar.bz2 | |
Merge "Don't include flags in configuration change if their value hasn't changed." into cm-10.1
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 3a6d307..19d7277 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -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; } |