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

Commit 4ebd17cc authored by Mark Punzalan's avatar Mark Punzalan Committed by Android (Google) Code Review
Browse files

Merge "Consider flags when merging with overlay semantics" into main

parents c3eda4cd 0b6c39f4

tools/aapt2/link/TableMerger.cpp

+7 −8
Original line number Diff line number Diff line
@@ -207,14 +207,13 @@ static ResourceTable::CollisionResult MergeConfigValue( 
  Value* dst_value = dst_config_value->value.get();

  Value* src_value = src_config_value->value.get();



  CollisionResult collision_result;

  CollisionResult collision_result =

      ResourceTable::ResolveFlagCollision(dst_value->GetFlagStatus(), src_value->GetFlagStatus());

  if (collision_result == CollisionResult::kConflict) {

    if (overlay) {

      collision_result =

          ResolveMergeCollision(override_styles_instead_of_overlaying, dst_value, src_value, pool);

    } else {

    collision_result =

        ResourceTable::ResolveFlagCollision(dst_value->GetFlagStatus(), src_value->GetFlagStatus());

    if (collision_result == CollisionResult::kConflict) {

      collision_result = ResourceTable::ResolveValueCollision(dst_value, src_value);

    }

  }