зеркало из https://github.com/mozilla/gecko-dev.git
Bug 935543 - Remove unused members in BrowserToolbar (r=wesj)
This commit is contained in:
Родитель
e26ab6e0a3
Коммит
1a75e4e0f0
|
@ -115,7 +115,6 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
|||
public void onStopEditing();
|
||||
}
|
||||
|
||||
private LayoutParams mAwesomeBarParams;
|
||||
private View mUrlDisplayContainer;
|
||||
private View mUrlEditContainer;
|
||||
private CustomEditText mUrlEditText;
|
||||
|
@ -153,7 +152,6 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
|||
private boolean mHasSoftMenuButton;
|
||||
|
||||
private boolean mShowSiteSecurity;
|
||||
private boolean mShowReader;
|
||||
private boolean mSpinnerVisible;
|
||||
|
||||
private boolean mDelayRestartInput;
|
||||
|
@ -271,7 +269,6 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
|||
registerEventListener("Reader:LongClick");
|
||||
|
||||
mShowSiteSecurity = false;
|
||||
mShowReader = false;
|
||||
|
||||
mAnimatingEntry = false;
|
||||
|
||||
|
@ -981,17 +978,12 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
|||
|
||||
// Handle the viewing mode page actions
|
||||
setSiteSecurityVisibility(mShowSiteSecurity && !isLoading);
|
||||
|
||||
boolean inReaderMode = false;
|
||||
Tab tab = Tabs.getInstance().getSelectedTab();
|
||||
if (tab != null)
|
||||
inReaderMode = ReaderModeUtils.isAboutReader(tab.getURL());
|
||||
|
||||
mPageActionLayout.setVisibility(!isLoading ? View.VISIBLE : View.GONE);
|
||||
|
||||
// We want title to fill the whole space available for it when there are icons
|
||||
// being shown on the right side of the toolbar as the icons already have some
|
||||
// padding in them. This is just to avoid wasting space when icons are shown.
|
||||
mTitle.setPadding(0, 0, (!isLoading && !(mShowReader || inReaderMode) ? mTitlePadding : 0), 0);
|
||||
mTitle.setPadding(0, 0, (!isLoading ? mTitlePadding : 0), 0);
|
||||
updateFocusOrder();
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче