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

am 12c84b5d: Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev

Browse Source 
* commit '12c84b5d9f30f3d31ab18fee719f3a1bf00ab957':
  Minor resource notation/compatibility fixes
This commit is contained in:
Adam Lesinski
2014-10-17 19:21:43 +00:00
committed by Android Git Automerger
parent 3e732ab205 12c84b5d9f
commit 87a529c899
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/res/Configuration.java
View File

@@ -1365,9 +1365,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration
ArrayList<String> parts = new ArrayList<String>();
if (config.mcc != 0) {
parts.add(config.mcc + "mcc");
parts.add("mcc" + config.mcc);
if (config.mnc != 0) {
parts.add(config.mnc + "mnc");
parts.add("mnc" + config.mnc);
}
}

6
tools/aapt/AaptConfig.cpp
View File

@@ -240,7 +240,9 @@ void applyVersionForCompatibility(ConfigDescription* config) {
}
uint16_t minSdk = 0;
if (config->smallestScreenWidthDp != ResTable_config::SCREENWIDTH_ANY
if (config->density == ResTable_config::DENSITY_ANY) {
minSdk = SDK_L;
} else if (config->smallestScreenWidthDp != ResTable_config::SCREENWIDTH_ANY
|| config->screenWidthDp != ResTable_config::SCREENWIDTH_ANY
|| config->screenHeightDp != ResTable_config::SCREENHEIGHT_ANY) {
minSdk = SDK_HONEYCOMB_MR2;
@@ -255,8 +257,6 @@ void applyVersionForCompatibility(ConfigDescription* config) {
!= ResTable_config::SCREENLONG_ANY
|| config->density != ResTable_config::DENSITY_DEFAULT) {
minSdk = SDK_DONUT;
} else if ((config->density == ResTable_config::DENSITY_ANY)) {
minSdk = SDK_L;
}
if (minSdk > config->sdkVersion) {