Bug 764638: Find in page can better use LinearLayout. [r=margaret]

--HG--
extra : rebase_source : d1d0527d408ce8b36bbe7c0799fe4020c34047fb
This commit is contained in:
Sriram Ramasubramanian 2012-06-14 12:12:18 -07:00
parent 0fad80b255
commit 5e112e83cb
3 changed files with 12 additions and 19 deletions

View File

@ -13,10 +13,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.RelativeLayout.LayoutParams;
import android.widget.LinearLayout;
public class FindInPageBar extends RelativeLayout implements TextWatcher, View.OnClickListener {
public class FindInPageBar extends LinearLayout implements TextWatcher, View.OnClickListener {
private static final String LOGTAG = "GeckoFindInPagePopup";
private final Context mContext;

View File

@ -2,42 +2,36 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<EditText android:id="@+id/find_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:contentDescription="@string/find_text"
android:background="@drawable/address_bar_url"
android:singleLine="true"
android:textColor="#000000"
android:inputType="text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:paddingLeft="15dip"
android:paddingRight="15dip"
android:textColorHighlight="@color/url_bar_text_highlight"
android:imeOptions="actionSearch"
android:selectAllOnFocus="true"
android:gravity="center_vertical|left"
android:layout_toLeftOf="@+id/find_prev"/>
android:gravity="center_vertical|left"/>
<ImageButton android:id="@+id/find_prev"
style="@style/FindBar.ImageButton"
android:contentDescription="@string/find_prev"
android:src="@drawable/find_prev"
android:layout_toLeftOf="@+id/find_next"
android:background="@drawable/action_bar_button"/>
android:src="@drawable/find_prev"/>
<ImageButton android:id="@+id/find_next"
style="@style/FindBar.ImageButton"
android:contentDescription="@string/find_next"
android:src="@drawable/find_next"
android:layout_toLeftOf="@+id/find_close"
android:background="@drawable/action_bar_button"/>
android:src="@drawable/find_next"/>
<ImageButton android:id="@+id/find_close"
style="@style/FindBar.ImageButton"
android:contentDescription="@string/find_close"
android:src="@drawable/find_close"
android:layout_alignParentRight="true"
android:background="@drawable/action_bar_button"/>
android:src="@drawable/find_close"/>
</merge>

View File

@ -124,7 +124,7 @@
<item name="android:layout_marginRight">5dip</item>
<item name="android:scaleType">fitCenter</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:background">@drawable/action_bar_button</item>
</style>
</resources>