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

Merge "Fix build breakage caused by redefining attrs" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-19 07:06:49 +00:00
committed by Android (Google) Code Review
parent c21f84dddb bd17d8c63b
commit fa020a8094
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>