diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-24 11:27:11 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-05-24 11:27:11 -0700 |
| commit | e2c7715c772d5121397591b532d04a31b3ffcc99 (patch) | |
| tree | a528b89349ba2b367aeae8b442b5c696a7c8c99e /include | |
| parent | 6895c4994350bc10a06481ecf42c4ba8abb3eedb (diff) | |
| parent | bbca81334e3603c7328dc526bd63032b23d5261d (diff) | |
| download | frameworks_base-e2c7715c772d5121397591b532d04a31b3ffcc99.zip frameworks_base-e2c7715c772d5121397591b532d04a31b3ffcc99.tar.gz frameworks_base-e2c7715c772d5121397591b532d04a31b3ffcc99.tar.bz2 | |
resolved conflicts for merge of bbca8133 to master
Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/ResourceTypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 9e4e132..2c7cf75 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -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, |