Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ff5cbab5: Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev

Browse Source 
* commit 'ff5cbab50076baa06333b6ee05cc04c882a7ba13':
  Ensures that CompatibilityInfo is always set in Resources
This commit is contained in:
Adam Lesinski
2013-09-20 11:24:46 -07:00
committed by Android Git Automerger
parent 032de6c629 ff5cbab500
commit 2dc3c7398b
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/content/res/Resources.java
View File

@@ -195,7 +195,9 @@ public class Resources {
CompatibilityInfo compatInfo, IBinder token) {
mAssets = assets;
mMetrics.setToDefaults();
mCompatibilityInfo = compatInfo;
if (compatInfo != null) {
mCompatibilityInfo = compatInfo;
}
mToken = new WeakReference<IBinder>(token);
updateConfiguration(config, metrics);
assets.ensureStringBlocks();
@@ -1536,9 +1538,8 @@ public class Resources {
// it would be cleaner and more maintainble to just be
// consistently dealing with a compatible display everywhere in
// the framework.
if (mCompatibilityInfo != null) {
mCompatibilityInfo.applyToDisplayMetrics(mMetrics);
}
mCompatibilityInfo.applyToDisplayMetrics(mMetrics);
int configChanges = 0xfffffff;
if (config != null) {
mTmpConfig.setTo(config);
@@ -1546,9 +1547,9 @@ public class Resources {
if (density == Configuration.DENSITY_DPI_UNDEFINED) {
density = mMetrics.noncompatDensityDpi;
}
if (mCompatibilityInfo != null) {
mCompatibilityInfo.applyToConfiguration(density, mTmpConfig);
}
mCompatibilityInfo.applyToConfiguration(density, mTmpConfig);
if (mTmpConfig.locale == null) {
mTmpConfig.locale = Locale.getDefault();
mTmpConfig.setLayoutDirection(mTmpConfig.locale);
@@ -1697,8 +1698,7 @@ public class Resources {
* @hide
*/
public CompatibilityInfo getCompatibilityInfo() {
return mCompatibilityInfo != null ? mCompatibilityInfo
: CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;
return mCompatibilityInfo;
}
/**
@@ -1706,8 +1706,10 @@ public class Resources {
* @hide
*/
public void setCompatibilityInfo(CompatibilityInfo ci) {
mCompatibilityInfo = ci;
updateConfiguration(mConfiguration, mMetrics);
if (ci != null) {
mCompatibilityInfo = ci;
updateConfiguration(mConfiguration, mMetrics);
}
}
/**
@@ -2407,6 +2409,5 @@ public class Resources {
mMetrics.setToDefaults();
updateConfiguration(null, null);
mAssets.ensureStringBlocks();
mCompatibilityInfo = CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;
}
}