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

Commit db0a92a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Make configs differing only in density siblings"

parents 56da2781 0a0bf365

libs/androidfw/include/androidfw/ConfigDescription.h

+2 −3
Original line number Diff line number Diff line
@@ -177,9 +177,8 @@ inline ConfigDescription& ConfigDescription::operator=(ConfigDescription&& o) no 
  return *this;

}



inline bool ConfigDescription::MatchWithDensity(

    const ConfigDescription& o) const {

  return match(o) && (density == 0 || density == o.density);

inline bool ConfigDescription::MatchWithDensity(const ConfigDescription& o) const {

  return match(o) && (density == 0 || o.density != 0);

}



inline bool ConfigDescription::operator<(const ConfigDescription& o) const {

tools/aapt2/DominatorTree_test.cpp

+26 −0
Original line number Diff line number Diff line
@@ -173,4 +173,30 @@ TEST(DominatorTreeTest, LocalesAreNeverDominated) { 
  EXPECT_EQ(expected, printer.ToString(&tree));

}



TEST(DominatorTreeTest, NonZeroDensitiesMatch) {

  const ConfigDescription sw600_config = test::ParseConfigOrDie("sw600dp");

  const ConfigDescription sw600_hdpi_config = test::ParseConfigOrDie("sw600dp-hdpi");

  const ConfigDescription sw800_hdpi_config = test::ParseConfigOrDie("sw800dp-hdpi");

  const ConfigDescription sw800_xxhdpi_config = test::ParseConfigOrDie("sw800dp-xxhdpi");



  std::vector<std::unique_ptr<ResourceConfigValue>> configs;

  configs.push_back(util::make_unique<ResourceConfigValue>(ConfigDescription::DefaultConfig(), ""));

  configs.push_back(util::make_unique<ResourceConfigValue>(sw600_config, ""));

  configs.push_back(util::make_unique<ResourceConfigValue>(sw600_hdpi_config, ""));

  configs.push_back(util::make_unique<ResourceConfigValue>(sw800_hdpi_config, ""));

  configs.push_back(util::make_unique<ResourceConfigValue>(sw800_xxhdpi_config, ""));



  DominatorTree tree(configs);

  PrettyPrinter printer;



  std::string expected =

      "<default>\n"

      "  sw600dp-v13\n"

      "    sw600dp-hdpi-v13\n"

      "      sw800dp-hdpi-v13\n"

      "      sw800dp-xxhdpi-v13\n";

  EXPECT_EQ(expected, printer.ToString(&tree));

}





}  // namespace aapt