diff options
| author | John Spurlock <jspurlock@google.com> | 2014-04-04 19:34:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 19:34:11 +0000 |
| commit | 0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec (patch) | |
| tree | ee5502e236507ebf43a8b365bcf10466b49be61b /libs/androidfw | |
| parent | dd79334f7ecb39135058c2049cd933b4b930a3d1 (diff) | |
| parent | 642421aa7f284817cc1a972a7f9c7a64696a0116 (diff) | |
| download | frameworks_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 '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 7616ab0..098753b 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -2557,6 +2557,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)); |