diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-11 14:01:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-11 14:01:36 +0000 |
| commit | 97a366f9d7d7a089195794b86e78fee782828607 (patch) | |
| tree | a3d2f6eab7dc7630fe4a53753577ac4f28c39c42 /tools/aapt | |
| parent | 535809ab83f0f57ddf3dba7429f2513d8d943ce3 (diff) | |
| parent | 7f1a8957cca420d525719836069b7f6d5ee04718 (diff) | |
| download | frameworks_base-97a366f9d7d7a089195794b86e78fee782828607.zip frameworks_base-97a366f9d7d7a089195794b86e78fee782828607.tar.gz frameworks_base-97a366f9d7d7a089195794b86e78fee782828607.tar.bz2 | |
Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 3 | ||||
| -rw-r--r-- | tools/aapt/tests/AaptConfig_test.cpp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 2d35129..871e04f 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -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; diff --git a/tools/aapt/tests/AaptConfig_test.cpp b/tools/aapt/tests/AaptConfig_test.cpp index e795d81..ef3860c 100644 --- a/tools/aapt/tests/AaptConfig_test.cpp +++ b/tools/aapt/tests/AaptConfig_test.cpp @@ -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); +} |