summaryrefslogtreecommitdiff
path: root/tools/aapt2/integration-tests
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-06-02 12:55:24 -0700
committerAdam Lesinski <adamlesinski@google.com>2017-06-06 18:14:48 +0000
commit7a917a27ef1dae63e7747c9d00b4ff71b1a502e2 (patch)
treeddf11d9444665c174c3cfd629117b4b3def42495 /tools/aapt2/integration-tests
parentd034fec9cfd7521dc0edd315e7d8aef88496f9b3 (diff)
AAPT2: Allow <layout> in <activity> tag in AndroidManifest.xml
Bug: 62189611 Test: make AaptTestAppOne Change-Id: Ic090e4a002b24f2289f47dfba7439638e5848062
Diffstat (limited to 'tools/aapt2/integration-tests')
-rw-r--r--tools/aapt2/integration-tests/AppOne/AndroidManifest.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/aapt2/integration-tests/AppOne/AndroidManifest.xml b/tools/aapt2/integration-tests/AppOne/AndroidManifest.xml
index 1a4067fb0b22..a5f202dd22fc 100644
--- a/tools/aapt2/integration-tests/AppOne/AndroidManifest.xml
+++ b/tools/aapt2/integration-tests/AppOne/AndroidManifest.xml
@@ -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>