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

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

Merge "AAPT2: Fix typo in BinaryPrimitives oneofs"

parents 397c38d0 22ed4122

tools/aapt2/Resources.proto

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ message Primitive { 
    float dimension_value = 4;

    float fraction_value = 5;

    int32 int_decimal_value = 6;

    uint32 int_hexidecimal_value = 7;

    uint32 int_hexadecimal_value = 7;

    bool boolean_value = 8;

    uint32 color_argb8_value = 9;

    uint32 color_rgb8_value = 10;

tools/aapt2/format/proto/ProtoDeserialize.cpp

+2 −2
Original line number Diff line number Diff line
@@ -792,9 +792,9 @@ std::unique_ptr<Item> DeserializeItemFromPb(const pb::Item& pb_item, 
          val.dataType = android::Res_value::TYPE_INT_DEC;

          val.data = static_cast<uint32_t>(pb_prim.int_decimal_value());

        } break;

        case pb::Primitive::kIntHexidecimalValue: {

        case pb::Primitive::kIntHexadecimalValue: {

          val.dataType = android::Res_value::TYPE_INT_HEX;

          val.data = pb_prim.int_hexidecimal_value();

          val.data = pb_prim.int_hexadecimal_value();

        } break;

        case pb::Primitive::kBooleanValue: {

          val.dataType = android::Res_value::TYPE_INT_BOOLEAN;

tools/aapt2/format/proto/ProtoSerialize.cpp

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ class ValueSerializer : public ConstValueVisitor { 
        pb_prim->set_int_decimal_value(static_cast<int32_t>(val.data));

      } break;

      case android::Res_value::TYPE_INT_HEX: {

        pb_prim->set_int_hexidecimal_value(val.data);

        pb_prim->set_int_hexadecimal_value(val.data);

      } break;

      case android::Res_value::TYPE_INT_BOOLEAN: {

        pb_prim->set_boolean_value(static_cast<bool>(val.data));