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

split-select: Fix rules generated for anydpi density

Browse Source 
Change-Id: I9de569ca9a76eb22df4d0e178df847ba1c7d0b01
This commit is contained in:
Adam Lesinski
2014-11-06 12:54:36 -08:00
parent d12b69518d
commit dcdfe9fef4
12 changed files with 341 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/split-select/RuleGenerator.cpp
View File

@@ -15,6 +15,7 @@
*/
#include "RuleGenerator.h"
#include "aapt/SdkConstants.h"
#include <algorithm>
#include <cmath>
@@ -32,18 +33,21 @@ static inline int findMid(int l, int h) {
}
sp<Rule> RuleGenerator::generateDensity(const Vector<int>& allDensities, size_t index) {
sp<Rule> densityRule = new Rule();
densityRule->op = Rule::AND_SUBRULES;
if (allDensities[index] != ResTable_config::DENSITY_ANY) {
sp<Rule> densityRule = new Rule();
densityRule->op = Rule::AND_SUBRULES;
const bool anyDensity = allDensities[index] == ResTable_config::DENSITY_ANY;
sp<Rule> any = new Rule();
any->op = Rule::EQUALS;
any->key = Rule::SCREEN_DENSITY;
any->longArgs.add((int)ResTable_config::DENSITY_ANY);
any->negate = !anyDensity;
densityRule->subrules.add(any);
const bool hasAnyDensity = std::find(allDensities.begin(),
allDensities.end(), ResTable_config::DENSITY_ANY) != allDensities.end();
if (hasAnyDensity) {
sp<Rule> version = new Rule();
version->op = Rule::LESS_THAN;
version->key = Rule::SDK_VERSION;
version->longArgs.add((long) SDK_LOLLIPOP);
densityRule->subrules.add(version);
}
if (!anyDensity) {
if (index > 0) {
sp<Rule> gt = new Rule();
gt->op = Rule::GREATER_THAN;
@@ -59,8 +63,14 @@ sp<Rule> RuleGenerator::generateDensity(const Vector<int>& allDensities, size_t
lt->longArgs.add(findMid(allDensities[index], allDensities[index + 1]));
densityRule->subrules.add(lt);
}
return densityRule;
} else {
// SDK_VERSION is handled elsewhere, so we always pick DENSITY_ANY if it's
// available.
sp<Rule> always = new Rule();
always->op = Rule::ALWAYS_TRUE;
return always;
}
return densityRule;
}
sp<Rule> RuleGenerator::generateAbi(const Vector<abi::Variant>& splitAbis, size_t index) {