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

Commit 3ae00fab authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of bbca8133 to master 

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
parents 30006daf 2f118cd3

include/utils/ResourceTypes.h

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

        UI_MODE_TYPE_NORMAL = ACONFIGURATION_UI_MODE_TYPE_NORMAL,

        UI_MODE_TYPE_DESK = ACONFIGURATION_UI_MODE_TYPE_DESK,

        UI_MODE_TYPE_DESK = ACONFIGURATION_UI_MODE_TYPE_DESK,

        UI_MODE_TYPE_CAR = ACONFIGURATION_UI_MODE_TYPE_CAR,

        UI_MODE_TYPE_CAR = ACONFIGURATION_UI_MODE_TYPE_CAR,

        UI_MODE_TYPE_TELEVISION = ACONFIGURATION_UI_MODE_TYPE_TELEVISION,





        // uiMode bits for the night switch.

        // uiMode bits for the night switch.

        MASK_UI_MODE_NIGHT = 0x30,

        MASK_UI_MODE_NIGHT = 0x30,