diff --git a/mobile/android/base/BrowserToolbar.java b/mobile/android/base/BrowserToolbar.java index ccba64b730de..a89bc8c9382c 100644 --- a/mobile/android/base/BrowserToolbar.java +++ b/mobile/android/base/BrowserToolbar.java @@ -30,6 +30,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.RelativeLayout; @@ -47,6 +48,8 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory, private static final String LOGTAG = "GeckoToolbar"; private LinearLayout mLayout; private Button mAwesomeBar; + private TextView mTitle; + private int mTitlePadding; private ImageButton mTabs; private ImageView mBack; private ImageView mForward; @@ -65,7 +68,6 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory, final private BrowserApp mActivity; private LayoutInflater mInflater; private Handler mHandler; - private int[] mPadding; private boolean mHasSoftMenuButton; private boolean mShowSiteSecurity; @@ -99,6 +101,11 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory, mShowSiteSecurity = false; mShowReader = false; + mTitle = (TextView) mLayout.findViewById(R.id.awesome_bar_title); + mTitlePadding = mTitle.getPaddingRight(); + if (Build.VERSION.SDK_INT >= 16) + mTitle.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); + mAwesomeBar = (Button) mLayout.findViewById(R.id.awesome_bar); mAwesomeBar.setOnClickListener(new Button.OnClickListener() { public void onClick(View v) { @@ -134,11 +141,6 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory, } }); - mPadding = new int[] { mAwesomeBar.getPaddingLeft(), - mAwesomeBar.getPaddingTop(), - mAwesomeBar.getPaddingRight(), - mAwesomeBar.getPaddingBottom() }; - mTabs = (ImageButton) mLayout.findViewById(R.id.tabs); mTabs.setOnClickListener(new Button.OnClickListener() { public void onClick(View v) { @@ -178,21 +180,22 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory, } }); - mFavicon = (ImageButton) mLayout.findViewById(R.id.favicon); - mSiteSecurity = (ImageButton) mLayout.findViewById(R.id.site_security); - mSiteSecurity.setOnClickListener(new Button.OnClickListener() { + Button.OnClickListener faviconListener = new Button.OnClickListener() { public void onClick(View view) { - int[] lockLocation = new int[2]; - view.getLocationOnScreen(lockLocation); + if (mSiteSecurity.getVisibility() != View.VISIBLE) + return; - RelativeLayout.LayoutParams iconsLayoutParams = - (RelativeLayout.LayoutParams) ((View) view.getParent()).getLayoutParams(); - - // Calculate the left margin for the arrow based on the position of the lock icon. - int leftMargin = lockLocation[0] - iconsLayoutParams.rightMargin; - SiteIdentityPopup.getInstance().show(mSiteSecurity, leftMargin); + SiteIdentityPopup.getInstance().show(mSiteSecurity); } - }); + }; + + mFavicon = (ImageButton) mLayout.findViewById(R.id.favicon); + mFavicon.setOnClickListener(faviconListener); + if (Build.VERSION.SDK_INT >= 16) + mFavicon.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO); + + mSiteSecurity = (ImageButton) mLayout.findViewById(R.id.site_security); + mSiteSecurity.setOnClickListener(faviconListener); mProgressSpinner = (AnimationDrawable) mActivity.getResources().getDrawable(R.drawable.progress_spinner); @@ -439,13 +442,10 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory, mSiteSecurity.setVisibility(mShowSiteSecurity && !isLoading ? View.VISIBLE : View.GONE); mReader.setVisibility(mShowReader && !isLoading ? View.VISIBLE : View.GONE); - if (!isLoading && !mShowSiteSecurity && !mShowReader) { - // No visible page actions - mAwesomeBar.setPadding(mPadding[0], mPadding[1], mPadding[2], mPadding[3]); - } else { - // At least one visible page action - mAwesomeBar.setPadding(mPadding[0], mPadding[1], mPadding[0], mPadding[3]); - } + // 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, (!mShowReader && !isLoading ? mTitlePadding : 0), 0); updateFocusOrder(); } @@ -483,7 +483,8 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory, if (tab != null && "about:home".equals(tab.getURL())) title = null; - mAwesomeBar.setText(title); + mTitle.setText(title); + mAwesomeBar.setContentDescription(title != null ? title : mTitle.getHint()); } public void setFavicon(Drawable image) { diff --git a/mobile/android/base/SiteIdentityPopup.java b/mobile/android/base/SiteIdentityPopup.java index c5f33a928e15..c0086e37284b 100644 --- a/mobile/android/base/SiteIdentityPopup.java +++ b/mobile/android/base/SiteIdentityPopup.java @@ -78,7 +78,7 @@ public class SiteIdentityPopup extends PopupWindow { mInflated = true; } - public void show(View v, int leftMargin) { + public void show(View v) { Tab selectedTab = Tabs.getInstance().getSelectedTab(); if (selectedTab == null) { Log.e(LOGTAG, "Selected tab is null"); @@ -146,13 +146,15 @@ public class SiteIdentityPopup extends PopupWindow { mSupplemental.setTextColor(mResources.getColor(R.color.identity_identified)); } + int[] anchorLocation = new int[2]; + v.getLocationOnScreen(anchorLocation); + + int arrowWidth = mResources.getDimensionPixelSize(R.dimen.doorhanger_arrow_width); + int leftMargin = anchorLocation[0] + (v.getWidth() - arrowWidth) / 2; + int offset = 0; if (GeckoApp.mAppContext.isTablet()) { int popupWidth = mResources.getDimensionPixelSize(R.dimen.site_identity_popup_width); - int arrowWidth = mResources.getDimensionPixelSize(R.dimen.doorhanger_arrow_width); - - // Double arrowWidth to leave extra space on the right side of the arrow - leftMargin = popupWidth - arrowWidth*2; offset = 0 - popupWidth + arrowWidth*3/2 + v.getWidth()/2; } diff --git a/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_go.png index d0d66a912b9d..8e166b997201 100644 Binary files a/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_search.png index a756892579ab..fcbf13199df8 100644 Binary files a/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-hdpi/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/reader.png b/mobile/android/base/resources/drawable-hdpi/reader.png index 295c5768adec..423a20a62c54 100644 Binary files a/mobile/android/base/resources/drawable-hdpi/reader.png and b/mobile/android/base/resources/drawable-hdpi/reader.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/site_security_identified.png b/mobile/android/base/resources/drawable-hdpi/site_security_identified.png index 1581c6993cce..d64e3bdba84a 100644 Binary files a/mobile/android/base/resources/drawable-hdpi/site_security_identified.png and b/mobile/android/base/resources/drawable-hdpi/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/site_security_verified.png b/mobile/android/base/resources/drawable-hdpi/site_security_verified.png index 3ead437165e8..afdef0680a82 100644 Binary files a/mobile/android/base/resources/drawable-hdpi/site_security_verified.png and b/mobile/android/base/resources/drawable-hdpi/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png b/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png index 8f15c8edf2c4..d2167fa3a4bd 100644 Binary files a/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png and b/mobile/android/base/resources/drawable-hdpi/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_go.png index d959c90954d6..b59b289e0692 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_search.png index f928d5635f36..b64f56cc5e4a 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/reader.png b/mobile/android/base/resources/drawable-land-hdpi-v14/reader.png index b35fcf47c13f..638ef2813822 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/reader.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/reader.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_identified.png b/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_identified.png index fbb6f9dd9fe3..74f29cdbb68d 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_identified.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_verified.png b/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_verified.png index d2b933652f6a..ab83fcd6393d 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_verified.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-land-hdpi-v14/urlbar_stop.png b/mobile/android/base/resources/drawable-land-hdpi-v14/urlbar_stop.png index 664d7bc76296..b286cb8b6226 100644 Binary files a/mobile/android/base/resources/drawable-land-hdpi-v14/urlbar_stop.png and b/mobile/android/base/resources/drawable-land-hdpi-v14/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_go.png index cd83299baf23..8b1dd2969787 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_search.png index 0729383f53ab..880f12b8de70 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/reader.png b/mobile/android/base/resources/drawable-land-mdpi-v14/reader.png index af80eb36cf8e..70ed68b23b60 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/reader.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/reader.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_identified.png b/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_identified.png index fb36c4cad1db..a5efeb3c9b75 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_identified.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_verified.png b/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_verified.png index f257b0ba333e..332b48b7acf7 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_verified.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-land-mdpi-v14/urlbar_stop.png b/mobile/android/base/resources/drawable-land-mdpi-v14/urlbar_stop.png index ecbdca8527b2..8c7bcc64aedf 100644 Binary files a/mobile/android/base/resources/drawable-land-mdpi-v14/urlbar_stop.png and b/mobile/android/base/resources/drawable-land-mdpi-v14/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_go.png index f7033848e778..6f089287af54 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_search.png index 52d1d9696f38..8bf5222b536c 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/reader.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/reader.png index 0412fedd868c..9a9e5ec83d03 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/reader.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/reader.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_identified.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_identified.png index 98f8ac598859..8276c14431a3 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_identified.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_verified.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_verified.png index e75af3c277fa..9a3f25f2eac0 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_verified.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-land-xhdpi-v14/urlbar_stop.png b/mobile/android/base/resources/drawable-land-xhdpi-v14/urlbar_stop.png index eb3251c91526..db6269d513e3 100644 Binary files a/mobile/android/base/resources/drawable-land-xhdpi-v14/urlbar_stop.png and b/mobile/android/base/resources/drawable-land-xhdpi-v14/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_go.png index 3d88a5fb0648..63ab707141c2 100644 Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_search.png index 5d948d811979..e49d6f9d72c9 100644 Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-large-hdpi-v11/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/reader.png b/mobile/android/base/resources/drawable-large-hdpi-v11/reader.png index 63168d897da9..b1eea14d9609 100644 Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/reader.png and b/mobile/android/base/resources/drawable-large-hdpi-v11/reader.png differ diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_identified.png b/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_identified.png index ca4e2f4a378c..3e0e3f5da1e7 100644 Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_identified.png and b/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_verified.png b/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_verified.png index 462d78935ed4..b5e53ce84f20 100644 Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_verified.png and b/mobile/android/base/resources/drawable-large-hdpi-v11/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-large-hdpi-v11/urlbar_stop.png b/mobile/android/base/resources/drawable-large-hdpi-v11/urlbar_stop.png index f452c48b4273..096f08559f9d 100644 Binary files a/mobile/android/base/resources/drawable-large-hdpi-v11/urlbar_stop.png and b/mobile/android/base/resources/drawable-large-hdpi-v11/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_go.png index ff81c3b352be..ad7d29e5474b 100644 Binary files a/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_search.png index 2aa8bc614ca0..a2845afdfcb5 100644 Binary files a/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-large-mdpi-v11/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/reader.png b/mobile/android/base/resources/drawable-large-mdpi-v11/reader.png index 46471fb5a733..88f5f6a7c4e4 100644 Binary files a/mobile/android/base/resources/drawable-large-mdpi-v11/reader.png and b/mobile/android/base/resources/drawable-large-mdpi-v11/reader.png differ diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_identified.png b/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_identified.png index 07f74a1a3a82..094022b421ee 100644 Binary files a/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_identified.png and b/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_verified.png b/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_verified.png index feb3ddc32a1e..fdb9a78a75e8 100644 Binary files a/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_verified.png and b/mobile/android/base/resources/drawable-large-mdpi-v11/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-large-mdpi-v11/urlbar_stop.png b/mobile/android/base/resources/drawable-large-mdpi-v11/urlbar_stop.png index 35c7554f9d32..25833214a294 100644 Binary files a/mobile/android/base/resources/drawable-large-mdpi-v11/urlbar_stop.png and b/mobile/android/base/resources/drawable-large-mdpi-v11/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_go.png index 327eaa3b2854..6cf6b4bd1cec 100644 Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_search.png index 308d4b0ff135..2c69c449d9ad 100644 Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-large-xhdpi-v11/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/reader.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/reader.png index 776b95611417..c0f270201d17 100644 Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/reader.png and b/mobile/android/base/resources/drawable-large-xhdpi-v11/reader.png differ diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_identified.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_identified.png index aeb46215b166..b9fc07f91bac 100644 Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_identified.png and b/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_verified.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_verified.png index 84fbc7d8ebf3..978ebc8ec8a5 100644 Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_verified.png and b/mobile/android/base/resources/drawable-large-xhdpi-v11/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-large-xhdpi-v11/urlbar_stop.png b/mobile/android/base/resources/drawable-large-xhdpi-v11/urlbar_stop.png index 5d10b6a4eeba..89f481177dd5 100644 Binary files a/mobile/android/base/resources/drawable-large-xhdpi-v11/urlbar_stop.png and b/mobile/android/base/resources/drawable-large-xhdpi-v11/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_go.png b/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_go.png index 542c3fc514a5..76d1b56ba9ff 100644 Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_search.png b/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_search.png index 8fd572d91ff2..d0cd83eed2ee 100644 Binary files a/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable-xhdpi/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/reader.png b/mobile/android/base/resources/drawable-xhdpi/reader.png index c1db6cccd0ec..b64be5495d06 100644 Binary files a/mobile/android/base/resources/drawable-xhdpi/reader.png and b/mobile/android/base/resources/drawable-xhdpi/reader.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/site_security_identified.png b/mobile/android/base/resources/drawable-xhdpi/site_security_identified.png index 811bbcb7b596..eeca80eb3d67 100644 Binary files a/mobile/android/base/resources/drawable-xhdpi/site_security_identified.png and b/mobile/android/base/resources/drawable-xhdpi/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/site_security_verified.png b/mobile/android/base/resources/drawable-xhdpi/site_security_verified.png index d51d36df010d..cee0b162fbe7 100644 Binary files a/mobile/android/base/resources/drawable-xhdpi/site_security_verified.png and b/mobile/android/base/resources/drawable-xhdpi/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png b/mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png index 50985ec947f2..c52f1f03b51a 100644 Binary files a/mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png and b/mobile/android/base/resources/drawable-xhdpi/urlbar_stop.png differ diff --git a/mobile/android/base/resources/drawable/ic_awesomebar_go.png b/mobile/android/base/resources/drawable/ic_awesomebar_go.png index 610db35087e4..1146c963cd12 100644 Binary files a/mobile/android/base/resources/drawable/ic_awesomebar_go.png and b/mobile/android/base/resources/drawable/ic_awesomebar_go.png differ diff --git a/mobile/android/base/resources/drawable/ic_awesomebar_search.png b/mobile/android/base/resources/drawable/ic_awesomebar_search.png index ba907977b615..66d14738dd37 100644 Binary files a/mobile/android/base/resources/drawable/ic_awesomebar_search.png and b/mobile/android/base/resources/drawable/ic_awesomebar_search.png differ diff --git a/mobile/android/base/resources/drawable/reader.png b/mobile/android/base/resources/drawable/reader.png index d6ae017a97a0..8fc9457f4f28 100644 Binary files a/mobile/android/base/resources/drawable/reader.png and b/mobile/android/base/resources/drawable/reader.png differ diff --git a/mobile/android/base/resources/drawable/site_security_identified.png b/mobile/android/base/resources/drawable/site_security_identified.png index ee3230852c58..f42249ba4261 100644 Binary files a/mobile/android/base/resources/drawable/site_security_identified.png and b/mobile/android/base/resources/drawable/site_security_identified.png differ diff --git a/mobile/android/base/resources/drawable/site_security_verified.png b/mobile/android/base/resources/drawable/site_security_verified.png index fbb14f611dc0..973e01542e3a 100644 Binary files a/mobile/android/base/resources/drawable/site_security_verified.png and b/mobile/android/base/resources/drawable/site_security_verified.png differ diff --git a/mobile/android/base/resources/drawable/urlbar_stop.png b/mobile/android/base/resources/drawable/urlbar_stop.png index 351b795831c6..b089892e41aa 100644 Binary files a/mobile/android/base/resources/drawable/urlbar_stop.png and b/mobile/android/base/resources/drawable/urlbar_stop.png differ diff --git a/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml b/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml index 9f473230eb75..5dd64cd6bdbd 100644 --- a/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml +++ b/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml @@ -56,62 +56,71 @@ android:layout_marginTop="4.5dp" android:layout_alignRight="@id/tabs" android:gravity="center_horizontal"/> - -