Merge remote-tracking branch 'origin/master'

# Conflicts:
#	code/DiaryBottleApp/app/src/main/res/layout/search.xml
master
Xyzjx 5 years ago
commit 4ef6b6b8ad

@ -4,16 +4,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_search"
android:paddingTop="8dp"
android:paddingLeft="10dp"
android:paddingTop="8dp"
android:paddingRight="10dp"
android:focusable="true"
android:focusableInTouchMode="true" >
<ImageView
android:layout_width="0dp"
android:layout_height="20dp"
android:layout_weight="1"
android:src="@drawable/search_icon_an" />
<EditText
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -28,11 +30,14 @@
android:maxLength="15"
android:singleLine="true"
android:imeOptions="actionSearch"/>
<ImageView
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_weight="1"
android:src="@drawable/cb_failed"
android:id="@+id/search_content_clear"
android:visibility="gone" />
android:visibility="gone"
/>
</LinearLayout>
Loading…
Cancel
Save