Code drop from //branches/cupcake/...@124589
diff --git a/res/layout/browser_find.xml b/res/layout/browser_find.xml
index b1da8f1..7e587c1 100644
--- a/res/layout/browser_find.xml
+++ b/res/layout/browser_find.xml
@@ -18,111 +18,68 @@
android:id="@+id/findControls"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@android:drawable/menu_full_frame"
+ android:background="@android:drawable/bottom_bar"
android:paddingTop="12dip"
>
-
- <LinearLayout
- android:layout_width="wrap_content"
+ <ImageButton
+ android:src="@drawable/ic_btn_find_prev"
+ android:id="@+id/previous"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
+ <ImageButton
+ android:src="@drawable/ic_btn_find_next"
+ android:id="@+id/next"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="0dip"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginRight="6dip"
+ >
+ <EditText android:id="@+id/edit"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
+ android:scrollHorizontally="true"
+ android:autoText="false"
+ android:capitalize="none"
+ android:hint="@string/find_dot"
+ />
+ <LinearLayout android:id="@+id/matches_view"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:orientation="horizontal"
+ android:layout_gravity="right"
+ android:visibility="invisible"
>
- <ImageButton android:id="@+id/done"
+ <TextView android:id="@+id/matches"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_browser_done"
+ android:layout_gravity="right"
+ android:text="@string/zero"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondaryInverse"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/done"
- android:layout_gravity="center_horizontal"
- android:textColor="?android:attr/textColorPrimaryInverse"
+ android:layout_marginRight="3dip"
+ android:layout_gravity="right"
+ android:text="@string/matches_found"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorSecondaryInverse"
/>
</LinearLayout>
-
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:orientation="vertical"
- android:layout_marginRight="6dip"
- >
- <EditText android:id="@+id/edit"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:scrollHorizontally="true"
- android:autoText="false"
- android:capitalize="none"
- android:hint="@string/find_dot"
- />
- <LinearLayout
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="horizontal"
- android:layout_gravity="center_horizontal"
- android:paddingTop="1dip"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginRight="3dip"
- android:text="@string/matches_found"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- <TextView android:id="@+id/matches"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/zero"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- </LinearLayout>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginRight="6dip"
- >
- <ImageButton
- android:src="@drawable/ic_browser_up"
- android:id="@+id/previous"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/prev"
- android:layout_gravity="center_horizontal"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginRight="6dip"
- >
- <ImageButton
- android:src="@drawable/ic_browser_down"
- android:id="@+id/next"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/next"
- android:layout_gravity="center_horizontal"
- android:textColor="?android:attr/textColorPrimaryInverse"
- />
- </LinearLayout>
-
+ </LinearLayout>
+ <ImageButton android:id="@+id/done"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/ic_btn_close_panel"
+ />
</LinearLayout>