openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
platform_packages_apps_Laun.../res
History
Ryan Mitchell 01b8b68db7 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
 		2019-04-24 16:22:51 +00:00
..
anim Updating the all-apps discovery bounce animation 2017-08-29 10:17:51 -07:00
animator Updating the all-apps discovery bounce animation 2017-08-29 10:17:51 -07:00
animator-v23 Tune discovery bounce to be more gentle when bouncing. 2018-05-09 23:18:44 +00:00
color Ditch work profile orange and use the accent color instead 2018-02-01 17:16:58 +00:00
color-v24 Fixing dark tint for ShadowDrawable. 2017-06-20 09:03:30 -07:00
drawable Change default icons for launcher [3/3] 2019-04-13 00:51:33 -07:00
drawable-hdpi Retiring some feature flags 2018-07-10 13:52:17 -07:00
drawable-mdpi Retiring some feature flags 2018-07-10 13:52:17 -07:00
drawable-v24 Adding support for hiding widgets from the widget tray and reconfiguring widgets 2018-03-02 13:20:09 -08:00
drawable-v26 Create iconloader library 2018-11-02 14:18:45 -07:00
drawable-v28 Change task view / all apps/ widgets / folder radius to dialogCornerRadius 2019-04-09 00:27:07 +00:00
drawable-xhdpi Retiring some feature flags 2018-07-10 13:52:17 -07:00
drawable-xxhdpi Retiring some feature flags 2018-07-10 13:52:17 -07:00
drawable-xxxhdpi Merging ScrimView into GradientView 2017-07-26 14:33:22 -07:00
interpolator Updating the all-apps discovery bounce animation 2017-08-29 10:17:51 -07:00
layout Merge "Remove obsolete ChipsContainer" into ub-launcher3-qt-dev 2019-04-19 18:35:21 +00:00
mipmap-hdpi Change application launcher icons to adaptive icons 2017-03-03 12:48:05 -08:00
mipmap-mdpi Change application launcher icons to adaptive icons 2017-03-03 12:48:05 -08:00
mipmap-xhdpi Change application launcher icons to adaptive icons 2017-03-03 12:48:05 -08:00
mipmap-xxhdpi Change application launcher icons to adaptive icons 2017-03-03 12:48:05 -08:00
raw Bye bye workspace screens table 2018-12-10 11:43:35 -08:00
values Rename launcher:iconSize attribute to prevent overriding material 2019-04-24 16:22:51 +00:00
values-af Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-am Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ar Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-as Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-az Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-b+sr+Latn Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-be Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-bg Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-bn Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-bs Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ca Import translations. DO NOT MERGE 2019-03-26 22:14:07 -07:00
values-cs Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-da Import translations. DO NOT MERGE 2019-04-05 19:10:38 -07:00
values-de Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-el Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-en-rAU Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-en-rGB Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-en-rIN Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-es Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-es-rUS Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-et Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-eu Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-fa Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-fi Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-fr Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-fr-rCA Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-gl Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-gu Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-hi Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-hr Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-hu Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-hy Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-in Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-is Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-it Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-iw Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ja Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ka Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-kk Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-km Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-kn Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ko Import translations. DO NOT MERGE 2019-03-26 22:14:07 -07:00
values-ky Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-land Removing some redundant resource definitions 2019-03-22 16:24:16 -07:00
values-lo Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-lt Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-lv Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-mk Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ml Import translations. DO NOT MERGE 2019-04-05 19:10:38 -07:00
values-mn Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-mr Import translations. DO NOT MERGE 2019-04-05 19:10:38 -07:00
values-ms Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-my Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-nb Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ne Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-night-v26 Adding dark theme for AddItemActivity 2018-10-17 11:25:40 -07:00
values-nl Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-or Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-pa Import translations. DO NOT MERGE 2019-04-05 19:10:38 -07:00
values-pl Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-pt Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-pt-rPT Import translations. DO NOT MERGE 2019-03-26 22:14:07 -07:00
values-rm Removing obsolete strings with no default translation 2015-05-12 14:03:15 -07:00
values-ro Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ru Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-si Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-sk Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-sl Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-sq Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-sr Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-sv Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-sw Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-sw340dp Some resource fixes for drop target 2014-10-23 11:41:34 -07:00
values-sw600dp Revert "Fixing string not correctly marked as non-translatable" 2017-05-25 16:42:18 +00:00
values-sw720dp Retiring some feature flags 2018-07-10 13:52:17 -07:00
values-ta Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-te Import translations. DO NOT MERGE 2019-04-05 19:10:38 -07:00
values-th Import translations. DO NOT MERGE 2019-04-05 19:10:38 -07:00
values-tl Import translations. DO NOT MERGE 2019-04-05 19:10:38 -07:00
values-tr Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-uk Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-ur Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-uz Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-v22 Adding dark theme for AddItemActivity 2018-10-17 11:25:40 -07:00
values-v26 Set colorPrimaryDark to the value assigned in P release 2019-01-02 11:24:05 -08:00
values-vi Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-zh-rCN Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-zh-rHK Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-zh-rTW Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
values-zu Import translations. DO NOT MERGE 2019-02-21 08:23:37 -08:00
xml Rename launcher:iconSize attribute to prevent overriding material 2019-04-24 16:22:51 +00:00