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

Commit 7e25e9c9 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by android-build-merger
Browse files

Merge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev 

am: 6a23deef

Change-Id: Iec9bec5ba7f58c5ef5ef283bac16e2a1d6ebee6d
parents aedff705 6a23deef

tools/aapt2/ResourceParser_test.cpp

+33 −0
Original line number Diff line number Diff line
@@ -164,6 +164,39 @@ TEST_F(ResourceParserTest, ParseStringWithWhitespace) { 
  EXPECT_THAT(*str, StrValueEq("  This is what  I think  "));

}



TEST_F(ResourceParserTest, ParseStringTruncateASCII) {

  // Tuncate leading and trailing whitespace

  EXPECT_TRUE(TestParse(R"(<string name="foo">&#32;Hello&#32;</string>)"));



  String* str = test::GetValue<String>(&table_, "string/foo");

  ASSERT_THAT(str, NotNull());

  EXPECT_THAT(*str->value, StrEq("Hello"));

  EXPECT_THAT(str->untranslatable_sections, IsEmpty());



  // AAPT does not truncate unicode whitespace

  EXPECT_TRUE(TestParse(R"(<string name="foo2">\u0020\Hello\u0020</string>)"));



  str = test::GetValue<String>(&table_, "string/foo2");

  ASSERT_THAT(str, NotNull());

  EXPECT_THAT(*str->value, StrEq(" Hello "));

  EXPECT_THAT(str->untranslatable_sections, IsEmpty());



  // Preserve non-ASCII whitespace including extended ASCII characters

  EXPECT_TRUE(TestParse(R"(<string name="foo3">&#160;Hello&#160;</string>)"));



  str = test::GetValue<String>(&table_, "string/foo3");

  ASSERT_THAT(str, NotNull());

  EXPECT_THAT(*str->value, StrEq("\xC2\xA0Hello\xC2\xA0"));

  EXPECT_THAT(str->untranslatable_sections, IsEmpty());



  EXPECT_TRUE(TestParse(R"(<string name="foo4">2005年6月1日</string>)"));



  str = test::GetValue<String>(&table_, "string/foo4");

  ASSERT_THAT(str, NotNull());

  EXPECT_THAT(*str->value, StrEq("2005年6月1日"));

  EXPECT_THAT(str->untranslatable_sections, IsEmpty());

}



TEST_F(ResourceParserTest, ParseStyledStringWithWhitespace) {

  std::string input = R"(<string name="foo">  <b> My <i> favorite</i> string </b>  </string>)";

  ASSERT_TRUE(TestParse(input));

tools/aapt2/ResourceUtils.cpp

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "util/Files.h"

#include "util/Util.h"



using ::aapt::text::IsWhitespace;

using ::aapt::text::Utf8Iterator;

using ::android::StringPiece;

using ::android::StringPiece16;
@@ -807,7 +806,7 @@ StringBuilder& StringBuilder::AppendText(const std::string& text) { 
  Utf8Iterator iter(text);

  while (iter.HasNext()) {

    char32_t codepoint = iter.Next();

    if (!quote_ && text::IsWhitespace(codepoint)) {

    if (!quote_ && iswspace(codepoint)) {

      if (!last_codepoint_was_space_) {

        // Emit a space if it's the first.

        xml_string_.text += ' ';