LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 99314f43: Merge "Fix old style edit text drawable display error."

Browse Source 
* commit '99314f432e024720ffb88431ca8535cec5e4ff58':
  Fix old style edit text drawable display error.
This commit is contained in:
Jean-Baptiste Queru
2012-05-23 15:04:39 -07:00
committed by Android Git Automerger
parent 91ab8ff826 99314f432e
commit 34baff19d8
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/ApiDemos/res/layout/linear_layout_5.xml
View File

@@ -35,16 +35,10 @@
<!-- <!--
Followed by the EditText field... 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 <EditText
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"/>
android:background="@android:drawable/editbox_background"/>
<!-- <!--
Use a horizontal layout to hold the two buttons. Use a horizontal layout to hold the two buttons.

5
samples/ApiDemos/res/layout/relative_layout_2.xml
View File

@@ -33,16 +33,11 @@
<!-- <!--
Put the EditText field under the TextView 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 <EditText
android:id="@+id/entry" android:id="@+id/entry"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:drawable/editbox_background"
android:layout_below="@id/label"/> android:layout_below="@id/label"/>
<!-- <!--