diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2019-03-28 17:01:07 -0700 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2019-04-24 16:22:51 +0000 |
| commit | 01b8b68db77a22004168dd302ea1a4b2a5043b78 (patch) | |
| tree | 98a2d21028f9dc482a78ddb29905ea2d168eac10 /res/xml | |
| parent | 5caa017236ffab583fbe47c57d0256ee68a3faba (diff) | |
| download | android_packages_apps_Trebuchet-01b8b68db77a22004168dd302ea1a4b2a5043b78.tar.gz android_packages_apps_Trebuchet-01b8b68db77a22004168dd302ea1a4b2a5043b78.tar.bz2 android_packages_apps_Trebuchet-01b8b68db77a22004168dd302ea1a4b2a5043b78.zip | |
Rename launcher:iconSize attribute to prevent overriding material
A previous change [1] introduced the material library as a static library
for the SecondaryDisplayLauncher. The material library defines a
resource "attr/iconSize" with format="dimension" while Launcher3 defines
a resource of the same name with format="float". The material resource
is being overriden by the Launcher3 resource and is preventing aapt2
from disallowing multiple definitions of the same attribute with
different formats.
This change renames the Launcher3 iconSize so it will not collide with
the material resource.
[1] If183dd35a1d197c4a9a8225a021e36c4f1662587
Bug: 129146717
Test: build success and inspection of generated apk
Change-Id: I5eb54ea606ddcfb47d5150b44906a8707203e905
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/device_profiles.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml index 88b1bc95a..82547d521 100644 --- a/res/xml/device_profiles.xml +++ b/res/xml/device_profiles.xml @@ -30,7 +30,7 @@ launcher:name="Super Short Stubby" launcher:minWidthDps="255" launcher:minHeightDps="300" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -38,7 +38,7 @@ launcher:name="Shorter Stubby" launcher:minWidthDps="255" launcher:minHeightDps="400" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -57,7 +57,7 @@ launcher:name="Short Stubby" launcher:minWidthDps="275" launcher:minHeightDps="420" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -65,7 +65,7 @@ launcher:name="Stubby" launcher:minWidthDps="255" launcher:minHeightDps="450" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -73,7 +73,7 @@ launcher:name="Nexus S" launcher:minWidthDps="296" launcher:minHeightDps="491.33" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -81,7 +81,7 @@ launcher:name="Nexus 4" launcher:minWidthDps="359" launcher:minHeightDps="567" - launcher:iconSize="54" + launcher:iconImageSize="54" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -89,7 +89,7 @@ launcher:name="Nexus 5" launcher:minWidthDps="335" launcher:minHeightDps="567" - launcher:iconSize="54" + launcher:iconImageSize="54" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -108,7 +108,7 @@ launcher:name="Large Phone" launcher:minWidthDps="406" launcher:minHeightDps="694" - launcher:iconSize="56" + launcher:iconImageSize="56" launcher:iconTextSize="14.4" launcher:canBeDefault="true" /> @@ -116,7 +116,7 @@ launcher:name="Shorter Stubby" launcher:minWidthDps="255" launcher:minHeightDps="400" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> |