corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1066253 - Part 1: Remove favicon from BrowserToolbar. r=lucasr

Browse Source
This commit is contained in:
Michael Comella
2014-09-22 14:44:39 -07:00
parent 44dafc1ac7
commit 7dde7cd38f
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mobile/android/base/toolbar/ToolbarDisplayLayout.java
View File

@@ -12,6 +12,7 @@ import java.util.List;
import org.mozilla.gecko.AboutPages;
import org.mozilla.gecko.AppConstants.Versions;
import org.mozilla.gecko.BrowserApp;
import org.mozilla.gecko.NewTabletUI;
import org.mozilla.gecko.R;
import org.mozilla.gecko.SiteIdentity;
import org.mozilla.gecko.SiteIdentity.SecurityMode;
@@ -146,10 +147,16 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
mPrivateDomainColor = new ForegroundColorSpan(res.getColor(R.color.url_bar_domaintext_private));
mFavicon = (ImageButton) findViewById(R.id.favicon);
if (Versions.feature16Plus) {
mFavicon.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
if (NewTabletUI.isEnabled(context)) {
// We don't show favicons in the toolbar on new tablet.
// TODO: removeView(mFavicon);
mFavicon.setVisibility(View.GONE);
} else {
if (Versions.feature16Plus) {
mFavicon.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
}
mFaviconSize = Math.round(res.getDimension(R.dimen.browser_toolbar_favicon_size));
}
mFaviconSize = Math.round(res.getDimension(R.dimen.browser_toolbar_favicon_size));
mSiteSecurity = (ImageButton) findViewById(R.id.site_security);
mSiteSecurityVisible = (mSiteSecurity.getVisibility() == View.VISIBLE);
@@ -351,6 +358,11 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
}
private void updateFavicon(Tab tab) {
if (NewTabletUI.isEnabled(getContext())) {
// We don't display favicons in the toolbar for the new Tablet UI.
return;
}
if (tab == null) {
mFavicon.setImageDrawable(null);
return;
@@ -489,7 +501,11 @@ public class ToolbarDisplayLayout extends ThemedLinearLayout
}
View getDoorHangerAnchor() {
return mFavicon;
if (!NewTabletUI.isEnabled(getContext())) {
return mFavicon;
} else {
return mSiteSecurity;
}
}
void prepareForwardAnimation(PropertyAnimator anim, ForwardButtonAnimation animation, int width) {