summaryrefslogtreecommitdiff
path: root/android/testData/dom
diff options
context:
space:
mode:
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>2013-12-18 19:12:39 +0400
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>2013-12-18 19:12:39 +0400
commit7e5432df46ed1293df23fe9fa398e14b67bcd06f (patch)
treeb7aab85ee872cfb95164a6fe717f06532434c749 /android/testData/dom
parenta0dab86e163e0c6059bb892968a9e2774b2f2d3f (diff)
parent25b756a1778968ac8bab97f48a06fb2e87ab68e5 (diff)
downloadidea-7e5432df46ed1293df23fe9fa398e14b67bcd06f.tar.gz
Merge branch 'master' of https://android.googlesource.com/platform/tools/adt/idea into android-tmp
Diffstat (limited to 'android/testData/dom')
-rw-r--r--android/testData/dom/manifest/ParentActivityCompletion1.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/android/testData/dom/manifest/ParentActivityCompletion1.xml b/android/testData/dom/manifest/ParentActivityCompletion1.xml
new file mode 100644
index 00000000000..ea68c32e1f0
--- /dev/null
+++ b/android/testData/dom/manifest/ParentActivityCompletion1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="p1.p2">
+ <application android:icon="@drawable/picture1">
+ <activity android:name="p1.p2.MyActivity"
+ android:parentActivityName="<caret>"
+ />
+ </application>
+</manifest>