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

Commit f43fb61a authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Fix issue with resource deduping"

parents 73114a40 5d94fb70

tools/aapt2/ConfigDescription.cpp

+0 −2
Original line number Diff line number Diff line
@@ -967,8 +967,6 @@ bool ConfigDescription::ConflictsWith(const ConfigDescription& o) const { 
               o.screenLayout & MASK_LAYOUTDIR) ||

         !pred(screenLayout & MASK_SCREENLONG,

               o.screenLayout & MASK_SCREENLONG) ||

         !pred(screenLayout & MASK_UI_MODE_TYPE,

               o.screenLayout & MASK_UI_MODE_TYPE) ||

         !pred(uiMode & MASK_UI_MODE_TYPE, o.uiMode & MASK_UI_MODE_TYPE) ||

         !pred(uiMode & MASK_UI_MODE_NIGHT, o.uiMode & MASK_UI_MODE_NIGHT) ||

         !pred(screenLayout2 & MASK_SCREENROUND,

tools/aapt2/ConfigDescription_test.cpp

+12 −0
Original line number Diff line number Diff line
@@ -140,4 +140,16 @@ TEST(ConfigDescriptionTest, ParseVrAttribute) { 
  EXPECT_EQ(std::string("vrheadset-v26"), config.toString().string());

}



TEST(ConfigDescriptionTest, RangeQualifiersDoNotConflict) {

  using test::ParseConfigOrDie;



  EXPECT_FALSE(ParseConfigOrDie("large").ConflictsWith(ParseConfigOrDie("normal-land")));

  EXPECT_FALSE(ParseConfigOrDie("long-hdpi").ConflictsWith(ParseConfigOrDie("xhdpi")));

  EXPECT_FALSE(ParseConfigOrDie("sw600dp").ConflictsWith(ParseConfigOrDie("sw700dp")));

  EXPECT_FALSE(ParseConfigOrDie("v11").ConflictsWith(ParseConfigOrDie("v21")));

  EXPECT_FALSE(ParseConfigOrDie("h600dp").ConflictsWith(ParseConfigOrDie("h300dp")));

  EXPECT_FALSE(ParseConfigOrDie("w400dp").ConflictsWith(ParseConfigOrDie("w300dp")));

  EXPECT_FALSE(ParseConfigOrDie("600x400").ConflictsWith(ParseConfigOrDie("300x200")));

}



}  // namespace aapt