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 /native | |
| 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 'native')
| -rw-r--r-- | native/include/android/configuration.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/native/include/android/configuration.h b/native/include/android/configuration.h index 91533c8..39fef21 100644 --- a/native/include/android/configuration.h +++ b/native/include/android/configuration.h @@ -77,6 +77,7 @@ enum { ACONFIGURATION_UI_MODE_TYPE_NORMAL = 0x01, ACONFIGURATION_UI_MODE_TYPE_DESK = 0x02, ACONFIGURATION_UI_MODE_TYPE_CAR = 0x03, + ACONFIGURATION_UI_MODE_TYPE_TELEVISION = 0x04, ACONFIGURATION_UI_MODE_NIGHT_ANY = 0x00, ACONFIGURATION_UI_MODE_NIGHT_NO = 0x1, |