summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-04-04 19:34:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-04 19:34:11 +0000
commit0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec (patch)
treeee5502e236507ebf43a8b365bcf10466b49be61b /include
parentdd79334f7ecb39135058c2049cd933b4b930a3d1 (diff)
parent642421aa7f284817cc1a972a7f9c7a64696a0116 (diff)
downloadframeworks_base-0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec.zip
frameworks_base-0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec.tar.gz
frameworks_base-0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec.tar.bz2
am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116': Introduce new UI_MODE_TYPE_WATCH and qualifier.
Diffstat (limited to 'include')
-rw-r--r--include/androidfw/ResourceTypes.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index 7cc10be..4d8e512 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1054,6 +1054,7 @@ struct ResTable_config
UI_MODE_TYPE_CAR = ACONFIGURATION_UI_MODE_TYPE_CAR,
UI_MODE_TYPE_TELEVISION = ACONFIGURATION_UI_MODE_TYPE_TELEVISION,
UI_MODE_TYPE_APPLIANCE = ACONFIGURATION_UI_MODE_TYPE_APPLIANCE,
+ UI_MODE_TYPE_WATCH = ACONFIGURATION_UI_MODE_TYPE_WATCH,
// uiMode bits for the night switch.
MASK_UI_MODE_NIGHT = 0x30,