зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1209967 - review: Set menu buttons visible in xml & remove dynamic visibility. r=me
--HG-- extra : commitid : Adr5XQoRyOj extra : rebase_source : 8bbc8b9426fa10c0f71f8240761d39f7c1bea739
This commit is contained in:
Родитель
95ef1a16d3
Коммит
195fa6db5f
|
@ -124,8 +124,7 @@
|
||||||
android:layout_toLeftOf="@id/menu_margin"
|
android:layout_toLeftOf="@id/menu_margin"
|
||||||
android:layout_alignWithParentIfMissing="true"
|
android:layout_alignWithParentIfMissing="true"
|
||||||
android:contentDescription="@string/menu"
|
android:contentDescription="@string/menu"
|
||||||
android:background="@drawable/browser_toolbar_action_bar_button"
|
android:background="@drawable/browser_toolbar_action_bar_button">
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<org.mozilla.gecko.widget.themed.ThemedImageView
|
<org.mozilla.gecko.widget.themed.ThemedImageView
|
||||||
android:id="@+id/menu_icon"
|
android:id="@+id/menu_icon"
|
||||||
|
|
|
@ -41,8 +41,7 @@
|
||||||
style="@style/UrlBar.ImageButton"
|
style="@style/UrlBar.ImageButton"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:contentDescription="@string/menu"
|
android:contentDescription="@string/menu"
|
||||||
android:background="@drawable/shaped_button"
|
android:background="@drawable/shaped_button">
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<org.mozilla.gecko.widget.themed.ThemedImageView
|
<org.mozilla.gecko.widget.themed.ThemedImageView
|
||||||
android:id="@+id/menu_icon"
|
android:id="@+id/menu_icon"
|
||||||
|
|
|
@ -53,8 +53,7 @@
|
||||||
style="@style/UrlBar.ImageButton"
|
style="@style/UrlBar.ImageButton"
|
||||||
android:layout_width="@dimen/tabs_panel_button_width"
|
android:layout_width="@dimen/tabs_panel_button_width"
|
||||||
android:background="@drawable/action_bar_button_inverse"
|
android:background="@drawable/action_bar_button_inverse"
|
||||||
android:contentDescription="@string/menu"
|
android:contentDescription="@string/menu">
|
||||||
android:visibility="gone">
|
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
style="@style/UrlBar.ImageButton"
|
style="@style/UrlBar.ImageButton"
|
||||||
|
|
|
@ -367,7 +367,6 @@ public class TabsPanel extends LinearLayout
|
||||||
|
|
||||||
mAddTab.setVisibility(View.VISIBLE);
|
mAddTab.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
mMenuButton.setVisibility(View.VISIBLE);
|
|
||||||
mMenuButton.setEnabled(true);
|
mMenuButton.setEnabled(true);
|
||||||
mPopupMenu.setAnchor(mMenuButton);
|
mPopupMenu.setAnchor(mMenuButton);
|
||||||
}
|
}
|
||||||
|
|
|
@ -319,7 +319,6 @@ public abstract class BrowserToolbar extends ThemedRelativeLayout
|
||||||
});
|
});
|
||||||
tabsButton.setImageLevel(0);
|
tabsButton.setImageLevel(0);
|
||||||
|
|
||||||
menuButton.setVisibility(View.VISIBLE);
|
|
||||||
menuButton.setOnClickListener(new Button.OnClickListener() {
|
menuButton.setOnClickListener(new Button.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче