diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-02 16:44:52 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-02 16:44:52 -0700 |
| commit | 8a7d44e8248cf7078da6094068b039dacc0a3971 (patch) | |
| tree | dbb6847bc8af2033321069e3ff1a2e0506f0ba14 /tools | |
| parent | 0e5e16a656b0002f377f1bcda2e43a97206e4046 (diff) | |
| parent | 54cb63e26e41b80c013b8665878b9c7c7fb328c1 (diff) | |
| download | frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.zip frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.tar.gz frameworks_base-8a7d44e8248cf7078da6094068b039dacc0a3971.tar.bz2 | |
resolved conflicts for merge of 54cb63e2 to master
Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/AaptAssets.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/aapt/AaptAssets.cpp b/tools/aapt/AaptAssets.cpp index 4894196..29d2b87 100644 --- a/tools/aapt/AaptAssets.cpp +++ b/tools/aapt/AaptAssets.cpp @@ -969,6 +969,11 @@ bool AaptGroupEntry::getDensityName(const char* name, return true; } + if (strcmp(name, "tvdpi") == 0) { + if (out) out->density = ResTable_config::DENSITY_TV; + return true; + } + if (strcmp(name, "hdpi") == 0) { if (out) out->density = ResTable_config::DENSITY_HIGH; return true; |