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

Commit 7ad5d91e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Add navigation type"

parents bdbe65de 3b84124e

tools/aapt2/Resource.cpp

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ StringPiece ToString(ResourceType type) { 
      return "menu";

    case ResourceType::kMipmap:

      return "mipmap";

    case ResourceType::kNavigation:

      return "navigation";

    case ResourceType::kPlurals:

      return "plurals";

    case ResourceType::kRaw:
@@ -98,6 +100,7 @@ static const std::map<StringPiece, ResourceType> sResourceTypeMap{ 
    {"layout", ResourceType::kLayout},

    {"menu", ResourceType::kMenu},

    {"mipmap", ResourceType::kMipmap},

    {"navigation", ResourceType::kNavigation},

    {"plurals", ResourceType::kPlurals},

    {"raw", ResourceType::kRaw},

    {"string", ResourceType::kString},

tools/aapt2/Resource.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum class ResourceType { 
  kLayout,

  kMenu,

  kMipmap,

  kNavigation,

  kPlurals,

  kRaw,

  kString,

tools/aapt2/Resource_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ TEST(ResourceTypeTest, ParseResourceTypes) { 
  ASSERT_NE(type, nullptr);

  EXPECT_EQ(*type, ResourceType::kMipmap);



  type = ParseResourceType("navigation");

  ASSERT_NE(type, nullptr);

  EXPECT_EQ(*type, ResourceType::kNavigation);



  type = ParseResourceType("plurals");

  ASSERT_NE(type, nullptr);

  EXPECT_EQ(*type, ResourceType::kPlurals);

tools/aapt2/integration-tests/AppOne/res/navigation/home.xml

0 → 100644
+2 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<navigation />

tools/aapt2/readme.md

+3 −0
Original line number Diff line number Diff line 
# Android Asset Packaging Tool 2.0 (AAPT2) release notes



## Version 2.19

- Added navigation resource type.



## Version 2.18

### `aapt2 ...`

- Fixed issue where enum values were interpreted as integers and range checked. (bug 62358540)