diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-11-04 12:55:06 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-11-04 12:55:06 -0800 |
| commit | fc7a321da780a40f05ce3de67bb4b034914deab8 (patch) | |
| tree | fae9e0ceea74297e115f04bfc67acb5f4690f353 /android/testData/dom | |
| parent | 0eaeff326f208c47ffa1f1c0182abc39126d428b (diff) | |
| parent | 792a770119a02d8ef892364fc14e048844866196 (diff) | |
| download | idea-fc7a321da780a40f05ce3de67bb4b034914deab8.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge-upstream
Conflicts:
android-gradle-jps/src/com/android/tools/idea/jps/AndroidGradleJps.java
android/src/com/android/tools/idea/gradle/project/AndroidGradleProjectComponent.java
android/src/com/android/tools/idea/gradle/project/AndroidGradleProjectResolver.java
Change-Id: I0da1fde0e1fcae971d9c994eaadc5eea35baeb2c
Diffstat (limited to 'android/testData/dom')
| -rw-r--r-- | android/testData/dom/layout/ctn2_after.xml | 2 | ||||
| -rw-r--r-- | android/testData/dom/layout/floatAttributeValues.xml | 2 | ||||
| -rw-r--r-- | android/testData/dom/layout/myIntResource.xml | 3 | ||||
| -rw-r--r-- | android/testData/dom/layout/tn9_after.xml | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/android/testData/dom/layout/ctn2_after.xml b/android/testData/dom/layout/ctn2_after.xml index 70209a6280c..eed33137eb2 100644 --- a/android/testData/dom/layout/ctn2_after.xml +++ b/android/testData/dom/layout/ctn2_after.xml @@ -1,3 +1,3 @@ <LinearLayout> - <p1.p2.LabelView layout_height="" layout_width=""/> + <p1.p2.LabelView layout_width="" layout_height=""/> </LinearLayout>
\ No newline at end of file diff --git a/android/testData/dom/layout/floatAttributeValues.xml b/android/testData/dom/layout/floatAttributeValues.xml new file mode 100644 index 00000000000..d4ad120a644 --- /dev/null +++ b/android/testData/dom/layout/floatAttributeValues.xml @@ -0,0 +1,2 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_weight="<caret>"> +</LinearLayout> diff --git a/android/testData/dom/layout/myIntResource.xml b/android/testData/dom/layout/myIntResource.xml new file mode 100644 index 00000000000..45792ccebac --- /dev/null +++ b/android/testData/dom/layout/myIntResource.xml @@ -0,0 +1,3 @@ +<resources> + <integer name="my_integer">0</integer> +</resources>
\ No newline at end of file diff --git a/android/testData/dom/layout/tn9_after.xml b/android/testData/dom/layout/tn9_after.xml index 43142644af0..e5f12826935 100644 --- a/android/testData/dom/layout/tn9_after.xml +++ b/android/testData/dom/layout/tn9_after.xml @@ -1,3 +1,3 @@ <LinearLayout> - <RadioButton layout_height="" layout_width=""/> + <RadioButton layout_width="" layout_height=""/> </LinearLayout>
\ No newline at end of file |