am 34baff19: am 99314f43: Merge "Fix old style edit text drawable display error."
* commit '34baff19d88679254d82420f798387f92a7fb912':
Fix old style edit text drawable display error.
diff --git a/samples/ApiDemos/res/layout/linear_layout_5.xml b/samples/ApiDemos/res/layout/linear_layout_5.xml
index b5d45c0..a0ff63b 100644
--- a/samples/ApiDemos/res/layout/linear_layout_5.xml
+++ b/samples/ApiDemos/res/layout/linear_layout_5.xml
@@ -35,16 +35,10 @@
<!--
Followed by the EditText field...
-
- Also give it a standard background (the "android:"
- part in @android:drawable/editbox_background
- means it is system resource rather than
- an application resource.
-->
<EditText
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@android:drawable/editbox_background"/>
+ android:layout_height="wrap_content"/>
<!--
Use a horizontal layout to hold the two buttons.
diff --git a/samples/ApiDemos/res/layout/relative_layout_2.xml b/samples/ApiDemos/res/layout/relative_layout_2.xml
index 083953a..87a5377 100644
--- a/samples/ApiDemos/res/layout/relative_layout_2.xml
+++ b/samples/ApiDemos/res/layout/relative_layout_2.xml
@@ -33,16 +33,11 @@
<!--
Put the EditText field under the TextView
- Also give it a standard background (the "android:"
- part in @android:drawable/editbox_background
- means it is system resource rather than
- an application resource.
-->
<EditText
android:id="@+id/entry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@android:drawable/editbox_background"
android:layout_below="@id/label"/>
<!--