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

Commit ae2a0e09 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Fix build breakage caused by redefining attrs" into nyc-dev am: fa020a80 am: 1b9a930b 

am: 38e3b3ba

* commit '38e3b3ba':
  Fix build breakage caused by redefining attrs

Change-Id: If6fc6cae40fffcbd3d968efdea3715f7c7255030
parents f5e2e975 38e3b3ba

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>