drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev

Browse Source 
* commit '38e847004978031c2b914714e92bc5407ba3ce65':
  Fix issue #7585876: When changing the font settings, the movie...
This commit is contained in:
Dianne Hackborn
2012-11-29 12:08:41 -08:00
committed by Android Git Automerger
parent 43658bae9c 38e8470049
commit ed8c323a6c
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Presentation.java
View File

@ -281,7 +281,7 @@ public class Presentation extends Dialog {
private boolean isConfigurationStillValid() { private boolean isConfigurationStillValid() {
DisplayMetrics dm = new DisplayMetrics(); DisplayMetrics dm = new DisplayMetrics();
mDisplay.getMetrics(dm); mDisplay.getMetrics(dm);
return dm.equals(getResources().getDisplayMetrics()); return dm.equalsPhysical(getResources().getDisplayMetrics());
} }
private static Context createPresentationContext( private static Context createPresentationContext(

17
core/java/android/util/DisplayMetrics.java
View File

@ -232,19 +232,32 @@ public class DisplayMetrics {
* @return True if the display metrics are equal. * @return True if the display metrics are equal.
*/ */
public boolean equals(DisplayMetrics other) { public boolean equals(DisplayMetrics other) {
return equalsPhysical(other)
&& scaledDensity == other.scaledDensity
&& noncompatScaledDensity == other.noncompatScaledDensity;
}
/**
* Returns true if the physical aspects of the two display metrics
* are equal. This ignores the scaled density, which is a logical
* attribute based on the current desired font size.
*
* @param other The display metrics with which to compare.
* @return True if the display metrics are equal.
* @hide
*/
public boolean equalsPhysical(DisplayMetrics other) {
return other != null return other != null
&& widthPixels == other.widthPixels && widthPixels == other.widthPixels
&& heightPixels == other.heightPixels && heightPixels == other.heightPixels
&& density == other.density && density == other.density
&& densityDpi == other.densityDpi && densityDpi == other.densityDpi
&& scaledDensity == other.scaledDensity
&& xdpi == other.xdpi && xdpi == other.xdpi
&& ydpi == other.ydpi && ydpi == other.ydpi
&& noncompatWidthPixels == other.noncompatWidthPixels && noncompatWidthPixels == other.noncompatWidthPixels
&& noncompatHeightPixels == other.noncompatHeightPixels && noncompatHeightPixels == other.noncompatHeightPixels
&& noncompatDensity == other.noncompatDensity && noncompatDensity == other.noncompatDensity
&& noncompatDensityDpi == other.noncompatDensityDpi && noncompatDensityDpi == other.noncompatDensityDpi
&& noncompatScaledDensity == other.noncompatScaledDensity
&& noncompatXdpi == other.noncompatXdpi && noncompatXdpi == other.noncompatXdpi
&& noncompatYdpi == other.noncompatYdpi; && noncompatYdpi == other.noncompatYdpi;
} }