summaryrefslogtreecommitdiffstats
path: root/include/utils
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-23 16:16:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-23 16:16:54 -0700
commitbbca81334e3603c7328dc526bd63032b23d5261d (patch)
treec29dd1ed7c2119cd50bbc4e56be9ee36d89891c7 /include/utils
parent98a8231e838d7d624c5862d81d1975ef4f8d0d57 (diff)
parent4bb78889d04594c01a6af7f6d38c1764e9f575f9 (diff)
downloadframeworks_base-bbca81334e3603c7328dc526bd63032b23d5261d.zip
frameworks_base-bbca81334e3603c7328dc526bd63032b23d5261d.tar.gz
frameworks_base-bbca81334e3603c7328dc526bd63032b23d5261d.tar.bz2
am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9': Add "television" mode.
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/ResourceTypes.h1
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,