aboutsummaryrefslogtreecommitdiff
path: root/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/sample8-expected-extract7.diff
blob: 8228b597e7499d2d717b38f9a004cf6d924ca265 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
@@ -2 +2
- <LinearLayout android:id="@+id/LinearLayout2"
-     xmlns:android="http://schemas.android.com/apk/res/android"
-     android:layout_width="match_parent" android:layout_height="match_parent"
-     android:orientation="vertical">
-     <Button android:text="FirstButton" android:id="@+id/button1"
-         android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
-     <FrameLayout android:id="@+id/outer"
-         android:layout_width="match_parent" android:layout_height="wrap_content">
-         <LinearLayout android:layout_height="wrap_content"
-             android:id="@+id/linearLayout4" android:layout_width="match_parent">
-             <LinearLayout android:layout_height="match_parent"
-                 android:layout_width="wrap_content" android:id="@+id/linearLayout5">
-                 <LinearLayout android:layout_height="match_parent"
-                     android:id="@+id/linearLayout6"
-                     android:layout_width="wrap_content">
-                     <Button android:text="Button" android:id="@+id/button6"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"></Button>
-                 </LinearLayout>
-             </LinearLayout>
-         </LinearLayout>
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+     android:id="@+id/LinearLayout2"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent"
+     android:orientation="vertical" >
+
+     <Button
+         android:id="@+id/button1"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:text="FirstButton" >
+     </Button>
+
+     <FrameLayout
+         android:id="@+id/outer"
+         android:layout_width="match_parent"
+         android:layout_height="wrap_content" >
+
+         <include
+             android:id="@+id/linearLayout4_ref"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             layout="@layout/newlayout6" />
@@ -24 +26
-     <FrameLayout android:id="@+id/outer"
-         android:layout_width="match_parent" android:layout_height="wrap_content">
-         <LinearLayout android:layout_height="wrap_content"
-             android:id="@+id/linearLayout4" android:layout_width="match_parent">
-             <LinearLayout android:layout_height="match_parent"
-                 android:layout_width="wrap_content" android:id="@+id/linearLayout5">
-                 <LinearLayout android:layout_height="match_parent"
+
+     <FrameLayout
+         android:id="@+id/outer"
+         android:layout_width="match_parent"
+         android:layout_height="wrap_content" >
+
+         <LinearLayout
+             android:id="@+id/linearLayout4"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content" >
+
+             <LinearLayout
+                 android:id="@+id/linearLayout5"
+                 android:layout_width="wrap_content"
+                 android:layout_height="match_parent" >
+
+                 <LinearLayout
@@ -32 +44
-                     android:layout_width="wrap_content">
-                     <Button android:text="Button" android:id="@+id/button6"
+                     android:layout_width="wrap_content"
+                     android:layout_height="match_parent" >
+
+                     <Button
+                         android:id="@+id/button6"
@@ -35 +50
-                         android:layout_height="wrap_content"></Button>
+                         android:layout_height="wrap_content"
+                         android:text="Button" >
+                     </Button>
@@ -40 +57
+