Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build breakage caused by redefining attrs

Browse Source 
minWidth and minHeight were already defined without format specified
and we need to have definition without format also. Otherwise they conflict.

Bug: 28775586
Change-Id: I0602bd70d03bdacfc604d884951a60871159ed92
This commit is contained in:
Andrii Kulian
2016-05-18 19:37:03 -07:00
parent 13778161ea
commit bd17d8c63b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/attrs_manifest.xml
View File

@@ -2281,7 +2281,7 @@
activities launched in the task. That is if the root activity of a task set minimal width,
then the system will set the same minimal width on all other activities in the task. It
will also ignore any other minimal width attributes of non-root activities. -->
<attr name="minWidth" format="dimension" />
<attr name="minWidth" />
<!-- @removed -->
<attr name="minimalWidth" format="dimension" />
<!-- Minimal height of the activity.
@@ -2290,7 +2290,7 @@
activities launched in the task. That is if the root activity of a task set minimal height,
then the system will set the same minimal height on all other activities in the task. It
will also ignore any other minimal height attributes of non-root activities. -->
<attr name="minHeight" format="dimension" />
<attr name="minHeight" />
<!-- @removed -->
<attr name="minimalHeight" format="dimension" />
</declare-styleable>