Merge "Revert "Remove unused project."" am: fc7cda06f5 am: d3c69fa48e am: d58f8ba3b1 am: f1a59c9833

Change-Id: I0d3fb69b92ad417802dd038bdf989a6b84cfc210

1 files changed, 69 insertions, 0 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/sample7-expected-extract7.diff b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/sample7-expected-extract7.diff
new file mode 100644
index 000000000..3de135d77
--- /dev/null
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/sample7-expected-extract7.diff
@@ -0,0 +1,69 @@
+@@ -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>
+-     <LinearLayout android:layout_height="wrap_content" android:id="@+id/linearLayout4" android:layout_width="match_parent">
+-         <LinearLayout android:layout_height="match_parent" android:id="@+id/linearLayout5" android:layout_width="wrap_content">
+-             <LinearLayout android:layout_height="match_parent" android:id="@+id/linearLayout6" android:layout_width="wrap_content">
+-                 <!-- Comment -->
+-                 <Button android:text="Button" android:id="@+id/button6" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
+-             </LinearLayout>
+-         </LinearLayout>
+-     </LinearLayout>
+-     <LinearLayout android:layout_width="match_parent" android:id="@+id/linearLayout9" android:layout_height="wrap_content">
+-         <Button android:text="SecondButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/button2"></Button>
+-         <Button android:text="ThirdButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/button3"></Button>
+-         <CheckBox android:id="@+id/checkBox1" android:text="CheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content"></CheckBox>
++ <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>
++
++     <include
++         android:id="@+id/linearLayout4_ref"
++         android:layout_width="match_parent"
++         android:layout_height="wrap_content"
++         layout="@layout/newlayout6" />
++
++     <LinearLayout
++         android:id="@+id/linearLayout9"
++         android:layout_width="match_parent"
++         android:layout_height="wrap_content" >
++
++         <Button
++             android:id="@+id/button2"
++             android:layout_width="wrap_content"
++             android:layout_height="wrap_content"
++             android:text="SecondButton" >
++         </Button>
++
++         <Button
++             android:id="@+id/button3"
++             android:layout_width="wrap_content"
++             android:layout_height="wrap_content"
++             android:text="ThirdButton" >
++         </Button>
++
++         <CheckBox
++             android:id="@+id/checkBox1"
++             android:layout_width="wrap_content"
++             android:layout_height="wrap_content"
++             android:text="CheckBox" >
++         </CheckBox>
+@@ -17 +47
+-     <Button android:layout_height="wrap_content" android:text="FourthButton" android:id="@+id/button4" android:layout_width="match_parent"></Button>
++
++     <Button
++         android:id="@+id/button4"
++         android:layout_width="match_parent"
++         android:layout_height="wrap_content"
++         android:text="FourthButton" >
++     </Button>
++