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

Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."

Browse Source
This commit is contained in:
Narayan Kamath
2015-02-11 14:01:35 +00:00
committed by Android (Google) Code Review
parent 535809ab83 7f1a8957cc
commit 97a366f9d7
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt/AaptAssets.cpp
View File

@@ -345,7 +345,8 @@ int AaptLocaleValue::initFromDirName(const Vector<String8>& parts, const int sta
return ++currentIndex;
} else {
if ((part.length() == 2 || part.length() == 3) && isAlpha(part)) {
if ((part.length() == 2 || part.length() == 3)
&& isAlpha(part) && strcmp("car", part.string())) {
setLanguage(part);
if (++currentIndex == size) {
return size;

6
tools/aapt/tests/AaptConfig_test.cpp
View File

@@ -76,3 +76,9 @@ TEST(AaptConfigTest, ParseQualifierAddedInApi13) {
EXPECT_TRUE(TestParse("sw600dp-v8", &config));
EXPECT_EQ(String8("sw600dp-v13"), config.toString());
}
TEST(AaptConfigTest, TestParsingOfCarAttribute) {
ConfigDescription config;
EXPECT_TRUE(TestParse("car", &config));
EXPECT_EQ(android::ResTable_config::UI_MODE_TYPE_CAR, config.uiMode);
}