tejia-android.git

			@@ -29,12 +29,11 @@
			android:layout_weight="1">

			<AutoCompleteTextView
			android:textCursorDrawable="@drawable/shape_input_cursor"
			android:id="@+id/et_search"
			android:layout_width="match_parent"
			android:layout_height="35dp"
			android:layout_gravity="center_vertical"
			android:background="@drawable/shape_search"
			android:background="@drawable/shape_search_order"
			android:completionThreshold="1"
			android:hint=" 输入订单号或商品关键词"
			android:imeOptions="actionSearch"
			@@ -42,6 +41,8 @@
			android:paddingLeft="45dp"
			android:paddingRight="5dp"
			android:singleLine="true"
			android:textColor="#A1A1A1"
			android:textCursorDrawable="@drawable/shape_input_cursor"
			android:textSize="14sp" />

			<ImageView
			@@ -49,7 +50,7 @@
			android:layout_height="wrap_content"
			android:layout_gravity="center_vertical"
			android:layout_marginLeft="20dp"
			android:src="@drawable/ic_recommend_search" />
			android:src="@drawable/icon_search_gray" />
			</FrameLayout>

			<TextView
			@@ -64,9 +65,9 @@
			</LinearLayout>

			<View
			android:layout_marginTop="4dp"
			android:layout_width="match_parent"
			android:layout_height="1px"
			android:layout_marginTop="4dp"
			android:background="#dddddd"></View>

			<ScrollView
			@@ -92,7 +93,7 @@
			android:layout_height="wrap_content"
			android:layout_weight="1"
			android:text="历史搜索"
			android:textColor="@color/gray2" />
			android:textColor="@color/search_title_text_color" />

			<TextView
			android:id="@+id/tv_clear_history"
			@@ -110,16 +111,12 @@
			</LinearLayout>


			<com.wpc.library.widget.MyListView
			android:id="@+id/lv_search_history"
			<com.tejia.lijin.app.util.FlowLayout
			android:id="@+id/fl_search_history"
			android:layout_width="match_parent"
			android:layout_height="match_parent"
			android:layout_marginTop="16dp"
			android:layout_marginRight="15dp"
			android:layout_marginBottom="8dp"
			android:background="@color/white"
			android:divider="@color/white"
			android:dividerHeight="1dp"></com.wpc.library.widget.MyListView>
			android:layout_height="wrap_content"
			android:layout_marginLeft="8dp"
			android:layout_marginRight="8dp"></com.tejia.lijin.app.util.FlowLayout>

			</LinearLayout>
			</ScrollView>