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

Commit 627147ac authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of bbca8133 to master"

parents 4120eaaa 3ae00fab

include/utils/ResourceTypes.h

+1 −0
Original line number Diff line number Diff line
@@ -953,6 +953,7 @@ struct ResTable_config 
        UI_MODE_TYPE_NORMAL = ACONFIGURATION_UI_MODE_TYPE_NORMAL,

        UI_MODE_TYPE_DESK = ACONFIGURATION_UI_MODE_TYPE_DESK,

        UI_MODE_TYPE_CAR = ACONFIGURATION_UI_MODE_TYPE_CAR,

        UI_MODE_TYPE_TELEVISION = ACONFIGURATION_UI_MODE_TYPE_TELEVISION,



        // uiMode bits for the night switch.

        MASK_UI_MODE_NIGHT = 0x30,