Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd17d8c6 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Fix build breakage caused by redefining attrs 

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
parent 13778161

core/res/res/values/attrs_manifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>