Activision Blizzard and a California regulator filed a legal settlement in which the videogame company agreed to pay to resolve gender discrimination charges while the state withdrew sexual-harassment claims.

The settlement between Activision and the California Civil Rights Department, if approved by a judge, would end a legal battle that helped lead to the videogame company’s sale to Microsoft. Settlement documents that both sides said were filed in California Superior Court confirm an agreement from last week.