Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f1a8957 authored Feb 10, 2015 by Narayan Kamath

Parse res-car as resources for UI_MODE_TYPE_CAR..

.. and not a 3 letter language code.

bug: 19291216
Change-Id: I01bf76d89880693dcdb4384d5c239902fa3defa8

parent 3ec5f97a

tools/aapt/AaptAssets.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

tools/aapt/tests/AaptConfig_test.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}