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

Merge "AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-06 19:49:47 +00:00
committed by Android (Google) Code Review
parent 6e450e1a6e 7a917a27ef
commit 63c5c9462a
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/aapt2/integration-tests/AppOne/AndroidManifest.xml
View File

@@ -19,4 +19,11 @@
<uses-sdk android:minSdkVersion="21" />
<uses-permission-sdk-23 android:name="android.permission.TEST" android:maxSdkVersion="22" />
<application>
<activity android:name=".MyActivity">
<layout android:defaultHeight="500dp"
android:defaultWidth="600dp" />
</activity>
</application>
</manifest>

3
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -326,7 +326,10 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
uses_static_library_action.Action(RequiredAndroidAttribute("certDigest"));
application_action["meta-data"] = meta_data_action;
application_action["activity"] = component_action;
application_action["activity"]["layout"];
application_action["activity-alias"] = component_action;
application_action["service"] = component_action;
application_action["receiver"] = component_action;