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

Commit 97a366f9 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

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

parents 535809ab 7f1a8957

tools/aapt/AaptAssets.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -345,7 +345,8 @@ int AaptLocaleValue::initFromDirName(const Vector<String8>& parts, const int sta 




        return ++currentIndex;

        return ++currentIndex;

    } else {

    } 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);

            setLanguage(part);

            if (++currentIndex == size) {

            if (++currentIndex == size) {

                return size;

                return size;

tools/aapt/tests/AaptConfig_test.cpp

+6 −0
Original line number Original line Diff line number Diff line
@@ -76,3 +76,9 @@ TEST(AaptConfigTest, ParseQualifierAddedInApi13) { 
    EXPECT_TRUE(TestParse("sw600dp-v8", &config));

    EXPECT_TRUE(TestParse("sw600dp-v8", &config));

    EXPECT_EQ(String8("sw600dp-v13"), config.toString());

    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);

}