diff options
| author | Dianne Hackborn <hackbod@android.com> | 2013-05-26 00:02:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-26 00:02:37 -0700 |
| commit | c73220050efa7420974850ee9a80a965d807c7ce (patch) | |
| tree | 75de95751e3bdf78ccde89c627a67cdb4ee5ac9f /core/java/android/content | |
| parent | fc09b326da5e35786530777f01cd132d7686a788 (diff) | |
| parent | f9b41efe17718a21df115d95c47a94d97a767076 (diff) | |
| download | frameworks_base-c73220050efa7420974850ee9a80a965d807c7ce.zip frameworks_base-c73220050efa7420974850ee9a80a965d807c7ce.tar.gz frameworks_base-c73220050efa7420974850ee9a80a965d807c7ce.tar.bz2 | |
am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
Don't include flags in configuration change if their value hasn't changed.
Diffstat (limited to 'core/java/android/content')
| -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 905ae0d..68db33a 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -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; } |