diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-08 18:46:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-08 18:46:56 +0000 |
| commit | 7532f1a99bc17a82ae8b6714025facb3095c08b1 (patch) | |
| tree | c4efb96abd28c58f6dc220fdcc8ee8ab69f7ca38 /eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/extractstyle1-expected-extract2.diff | |
| parent | c6f9015f6bf1b59f46d6bb87f5e48cbab3cb94de (diff) | |
| parent | 46a5c62c6763f054fce88ab6737983014de66226 (diff) | |
| download | sdk-7532f1a99bc17a82ae8b6714025facb3095c08b1.tar.gz | |
Merge "Remove all non-Apache2 licensed files from sdk" am: 106d12a4f8 am: 7cb6fc634a am: ccad5384d7 am: 18c1c14ad4 am: 46a5c62c67
Change-Id: Ib5a1e041abdbd5696d1b4467fa1581ae5d9c344c
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/extractstyle1-expected-extract2.diff')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/extractstyle1-expected-extract2.diff | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/extractstyle1-expected-extract2.diff b/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/extractstyle1-expected-extract2.diff deleted file mode 100644 index c819b09aa..000000000 --- a/eclipse/plugins/com.android.ide.eclipse.tests/src/com/android/ide/eclipse/adt/internal/editors/layout/refactoring/testdata/extractstyle1-expected-extract2.diff +++ /dev/null @@ -1,32 +0,0 @@ -@@ -2 +2 -- android:layout_width="wrap_content" android:layout_height="match_parent"> -- <Button android:text="Button" -- android:layout_width="wrap_content" android:layout_height="wrap_content" -- android:textColor="#FF0000" android:textSize="20pt" -- android:id="@+id/button1" android:layout_alignParentBottom="true"></Button> -- <Button android:text="Button" -- android:layout_width="wrap_content" android:layout_height="fill_parent" -- android:textColor="#FF00FF" android:textSize="20pt" -- android:id="@+id/button2" android:layout_alignParentBottom="true"></Button> -+ android:layout_width="wrap_content" -+ android:layout_height="match_parent" > -+ -+ <Button -+ android:id="@+id/button1" -+ android:layout_width="wrap_content" -+ android:layout_height="wrap_content" -+ android:layout_alignParentBottom="true" -+ android:text="Button" -+ android:textColor="#FF0000" -+ android:textSize="20pt" > -+ </Button> -+ -+ <Button -+ android:id="@+id/button2" -+ style="@style/newstyle" -+ android:layout_width="wrap_content" -+ android:layout_height="fill_parent" -+ android:layout_alignParentBottom="true" -+ android:text="Button" > -+ </Button> -+ |