commit c0c366394c658e3787b12e65833b520c9a9a34d9
author Adam Lesinski <adamlesinski@google.com> Wed Oct 19 18:37:53 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Oct 27 18:09:00 2016 -0700
tree 0f8edb0b05d1d2899100fd114053ba1b8baa39a0
parent 9212fc742ff4fc92561c8055388d119d8ef195ae

Add font type to AAPT2

Test: make libaapt2_tests AaptTestAppOne
Change-Id: I8fbf01675a218cc3c0b59598b6b1ec173851e946

tools/aapt2/Resource.cpp

diff --git a/tools/aapt2/Resource.cpp b/tools/aapt2/Resource.cpp
index 1d414743..3eef7aa7 100644
--- a/tools/aapt2/Resource.cpp
+++ b/tools/aapt2/Resource.cpp
@@ -41,6 +41,8 @@
       return "dimen";
     case ResourceType::kDrawable:
       return "drawable";
+    case ResourceType::kFont:
+      return "font";
     case ResourceType::kFraction:
       return "fraction";
     case ResourceType::kId:
@@ -83,6 +85,7 @@
     {"color", ResourceType::kColor},
     {"dimen", ResourceType::kDimen},
     {"drawable", ResourceType::kDrawable},
+    {"font", ResourceType::kFont},
     {"fraction", ResourceType::kFraction},
     {"id", ResourceType::kId},
     {"integer", ResourceType::kInteger},