diff options
| author | John Spurlock <jspurlock@google.com> | 2014-04-04 19:28:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 19:28:09 +0000 |
| commit | 642421aa7f284817cc1a972a7f9c7a64696a0116 (patch) | |
| tree | e51a5b2c212bd95c4a052fcbd6b0bb0f0fce4976 /libs/androidfw | |
| parent | 8f81d29558bb0c97187d5ae3a7ee696ec13b264a (diff) | |
| parent | 5c31e487c4577e1c47ee7c949325d6a13f0d462e (diff) | |
| download | frameworks_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 'libs/androidfw')
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 1ffe665..9e59a13 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -2517,6 +2517,9 @@ String8 ResTable_config::toString() const { case ResTable_config::UI_MODE_TYPE_APPLIANCE: res.append("appliance"); break; + case ResTable_config::UI_MODE_TYPE_WATCH: + res.append("watch"); + break; default: res.appendFormat("uiModeType=%d", dtohs(screenLayout&ResTable_config::MASK_UI_MODE_TYPE)); |