summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-04-04 19:28:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-04 19:28:09 +0000
commit642421aa7f284817cc1a972a7f9c7a64696a0116 (patch)
treee51a5b2c212bd95c4a052fcbd6b0bb0f0fce4976 /include
parent8f81d29558bb0c97187d5ae3a7ee696ec13b264a (diff)
parent5c31e487c4577e1c47ee7c949325d6a13f0d462e (diff)
downloadframeworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.zip
frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.tar.gz
frameworks_base-642421aa7f284817cc1a972a7f9c7a64696a0116.tar.bz2
am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e': 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 b334aab..2306a7a 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1044,6 +1044,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,