tree 0ddddf8402cdc7ad1bd58282e628e3dca1602586
parent d89298d659da7f18bc39cae6844d271dd9542361
author Ryan Mitchell <rtmitchell@google.com> 1553817667 -0700
committer Ryan Mitchell <rtmitchell@google.com> 1556122934 +0000

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