Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 865228 - Rename mAnimateSiteSecurity to mSwitchingTabs (r=mfinkle)

Browse Source
This commit is contained in:
Lucas Rocha 2013-05-01 17:32:02 +01:00
parent 6b97765201
commit e20c9c0e46
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
private GeckoTextView mTitle;
private int mTitlePadding;
private boolean mSiteSecurityVisible;
private boolean mAnimateSiteSecurity;
private boolean mSwitchingTabs;
private ShapedButton mTabs;
private int mTabsPaneWidth;
private ImageButton mBack;
@ -128,7 +128,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
sActionItems = new ArrayList<View>();
Tabs.registerOnTabsChangedListener(this);
mAnimateSiteSecurity = true;
mSwitchingTabs = true;
mAnimatingEntry = false;
mShowUrl = false;
@ -463,14 +463,14 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
updateTabCount(Tabs.getInstance().getDisplayCount());
break;
case SELECTED:
mAnimateSiteSecurity = false;
mSwitchingTabs = true;
// fall through
case LOCATION_CHANGE:
case LOAD_ERROR:
if (Tabs.getInstance().isSelectedTab(tab)) {
refresh();
}
mAnimateSiteSecurity = true;
mSwitchingTabs = false;
break;
case CLOSED:
case ADDED:
@ -910,7 +910,7 @@ public class BrowserToolbar implements Tabs.OnTabsChangedListener,
mSiteSecurityVisible = visible;
if (!mAnimateSiteSecurity) {
if (mSwitchingTabs) {
mSiteSecurity.setVisibility(visible ? View.VISIBLE : View.GONE);
return;
}