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

Commit cc8dc1d6 authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge "Remove requirement for kiss emoji should have gender" into pi-dev 

am: 228bf4f3

Change-Id: I9168be274a5ced20d8ddbf1ef6475dfec82262ef
parents b3fb2627 228bf4f3

tools/fonts/fontchain_linter.py

+5 −2
Original line number Original line Diff line number Diff line
@@ -524,9 +524,12 @@ LEGACY_ANDROID_EMOJI = { 
    0xFE837: (ord('0'), COMBINING_KEYCAP),

    0xFE837: (ord('0'), COMBINING_KEYCAP),

}

}





# This is used to define the emoji that should have the same glyph.

# i.e. previously we had gender based Kiss (0x1F48F), which had the same glyph

# with Kiss: Woman, Man (0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468)

# in that case a valid row would be:

# (0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468): 0x1F48F,

ZWJ_IDENTICALS = {

ZWJ_IDENTICALS = {

    # KISS

    (0x1F469, 0x200D, 0x2764, 0x200D, 0x1F48B, 0x200D, 0x1F468): 0x1F48F,

}

}





SAME_FLAG_MAPPINGS = [

SAME_FLAG_MAPPINGS = [