diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-06-16 18:05:41 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2016-06-21 17:55:58 -0700 |
| commit | 4ece3d6bb18a609afcd0e82f0340b7d36ba24eea (patch) | |
| tree | 5cdbf44c4ed33767fe334feca6add5d106f40714 /core/java/android/view/DisplayAdjustments.java | |
| parent | f184789ae9154059a2b74cab386a65b04cefc9c0 (diff) | |
ContextImpl: Keep DisplayAdjustments and Display in sync
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.
Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
Diffstat (limited to 'core/java/android/view/DisplayAdjustments.java')
| -rw-r--r-- | core/java/android/view/DisplayAdjustments.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/core/java/android/view/DisplayAdjustments.java b/core/java/android/view/DisplayAdjustments.java index 272740fb6c01..6cc0508b5832 100644 --- a/core/java/android/view/DisplayAdjustments.java +++ b/core/java/android/view/DisplayAdjustments.java @@ -23,8 +23,6 @@ import java.util.Objects; /** @hide */ public class DisplayAdjustments { - public static final boolean DEVELOPMENT_RESOURCES_DEPEND_ON_ACTIVITY_TOKEN = false; - public static final DisplayAdjustments DEFAULT_DISPLAY_ADJUSTMENTS = new DisplayAdjustments(); private volatile CompatibilityInfo mCompatInfo = CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO; @@ -74,10 +72,8 @@ public class DisplayAdjustments { @Override public int hashCode() { int hash = 17; - hash = hash * 31 + mCompatInfo.hashCode(); - if (DEVELOPMENT_RESOURCES_DEPEND_ON_ACTIVITY_TOKEN) { - hash = hash * 31 + (mConfiguration == null ? 0 : mConfiguration.hashCode()); - } + hash = hash * 31 + Objects.hashCode(mCompatInfo); + hash = hash * 31 + Objects.hashCode(mConfiguration); return hash; } |