wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 750707 - Pack URL bar buttons in same layout to allow showing multiple icons (r=mfinkle)

Browse Source
This commit is contained in:
Lucas Rocha 2012-06-02 14:23:45 -04:00
parent 42f3eda168
commit a749df423d
5 changed files with 85 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/BrowserToolbar.java
View File

@ -31,9 +31,9 @@ import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.PopupWindow;
import android.widget.RelativeLayout;
import android.widget.RelativeLayout.LayoutParams;
import android.widget.TextView;
import android.widget.TextSwitcher;
import android.widget.ViewSwitcher;

38
mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
View File

@ -86,24 +86,28 @@
android:src="@drawable/favicon"
android:layout_alignLeft="@id/awesome_bar"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="20dip"
android:layout_height="20dip"
android:layout_marginRight="7dip"
android:layout_centerVertical="true"
android:src="@drawable/urlbar_stop"
android:layout_alignRight="@id/awesome_bar"
android:visibility="gone"/>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesome_bar"
android:orientation="horizontal">
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="20dip"
android:layout_height="20dip"
android:layout_marginRight="7dip"
android:layout_centerVertical="true"
android:src="@drawable/site_security_level"
android:layout_alignRight="@id/awesome_bar"/>
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/site_security_level"
android:visibility="gone"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/urlbar_stop"
android:visibility="gone"/>
</LinearLayout>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"

38
mobile/android/base/resources/layout-sw600dp/browser_toolbar.xml
View File

@ -96,24 +96,28 @@
android:src="@drawable/favicon"
android:layout_toRightOf="@id/forward"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="28dip"
android:layout_height="28dip"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:src="@drawable/urlbar_stop"
android:layout_alignRight="@id/awesome_bar"
android:visibility="gone"/>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesome_bar"
android:orientation="horizontal">
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:src="@drawable/site_security_level"
android:layout_alignRight="@id/awesome_bar"/>
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/site_security_level"
android:visibility="gone"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/urlbar_stop"
android:visibility="gone"/>
</LinearLayout>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"

38
mobile/android/base/resources/layout-xlarge/browser_toolbar.xml
View File

@ -96,24 +96,28 @@
android:src="@drawable/favicon"
android:layout_toRightOf="@id/forward"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="28dip"
android:layout_height="28dip"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:src="@drawable/urlbar_stop"
android:layout_alignRight="@id/awesome_bar"
android:visibility="gone"/>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesome_bar"
android:orientation="horizontal">
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:src="@drawable/site_security_level"
android:layout_alignRight="@id/awesome_bar"/>
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/site_security_level"
android:visibility="gone"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/urlbar_stop"
android:visibility="gone"/>
</LinearLayout>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"

38
mobile/android/base/resources/layout/browser_toolbar.xml
View File

@ -86,24 +86,28 @@
android:src="@drawable/favicon"
android:layout_alignLeft="@id/awesome_bar"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:src="@drawable/urlbar_stop"
android:layout_alignRight="@id/awesome_bar"
android:visibility="gone"/>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:layout_alignRight="@id/awesome_bar"
android:orientation="horizontal">
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:layout_marginRight="10dip"
android:layout_centerVertical="true"
android:src="@drawable/site_security_level"
android:layout_alignRight="@id/awesome_bar"/>
<ImageButton android:id="@+id/site_security"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/site_security_level"
android:visibility="gone"/>
<ImageButton android:id="@+id/stop"
style="@style/AddressBar.ImageButton"
android:layout_width="24dip"
android:layout_height="24dip"
android:src="@drawable/urlbar_stop"
android:visibility="gone"/>
</LinearLayout>
<ImageView android:id="@+id/shadow"
android:layout_width="fill_parent"