Commit 4911a13e authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot

Revert "[ShareButtonInToolbar] Minimum width driven via finch config."

This reverts commit 4d265fc5.

Reason for revert:
ShareButtonControllerTest starts fail on a couple of builders
See https://ci.chromium.org/p/chromium/builders/ci/Lollipop%20Phone%20Tester/24669
https://ci.chromium.org/p/chromium/builders/ci/android-lollipop-arm-rel/799
https://ci.chromium.org/p/chromium/builders/ci/android-pie-x86-fyi-rel/774

Original change's description:
> [ShareButtonInToolbar] Minimum width driven via finch config.
> 
> Add a requirement for devices to have a min width, and use finch param.
> 
> Bug: 1036023
> Change-Id: I75e15afc4ddd646f6d3f8577dae792160d13f215
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2088635
> Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
> Reviewed-by: Jeffrey Cohen <jeffreycohen@chromium.org>
> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
> Reviewed-by: Theresa  <twellington@chromium.org>
> Reviewed-by: David Trainor <dtrainor@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#751751}

TBR=dtrainor@chromium.org,twellington@chromium.org,hnakashima@chromium.org,jeffreycohen@chromium.org

Change-Id: I1d4b97f65ec9a8b5d16c552b5a286549a1eaf6d8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1036023
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2111756Reviewed-by: default avatarHaiyang Pan <hypan@google.com>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#751860}
parent c74d9e5b
...@@ -57,6 +57,7 @@ public class ChromeCachedFlags { ...@@ -57,6 +57,7 @@ public class ChromeCachedFlags {
ChromeFeatureList.PAINT_PREVIEW_DEMO, ChromeFeatureList.PAINT_PREVIEW_DEMO,
ChromeFeatureList.PRIORITIZE_BOOTSTRAP_TASKS, ChromeFeatureList.PRIORITIZE_BOOTSTRAP_TASKS,
ChromeFeatureList.INSTANT_START, ChromeFeatureList.INSTANT_START,
ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR,
ChromeFeatureList.START_SURFACE_ANDROID, ChromeFeatureList.START_SURFACE_ANDROID,
ChromeFeatureList.SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT, ChromeFeatureList.SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT,
ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID,
......
...@@ -14,6 +14,7 @@ import org.chromium.base.metrics.RecordUserAction; ...@@ -14,6 +14,7 @@ import org.chromium.base.metrics.RecordUserAction;
import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.toolbar.ButtonData; import org.chromium.chrome.browser.toolbar.ButtonData;
...@@ -25,11 +26,6 @@ import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; ...@@ -25,11 +26,6 @@ import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager;
* whether NTP is shown). * whether NTP is shown).
*/ */
public class ShareButtonController implements ButtonDataProvider { public class ShareButtonController implements ButtonDataProvider {
/**
* Default minimum width to show share button.
*/
private static final int MIN_WIDTH = 360;
// Context is used for fetching resources and launching preferences page. // Context is used for fetching resources and launching preferences page.
private final Context mContext; private final Context mContext;
...@@ -45,8 +41,6 @@ public class ShareButtonController implements ButtonDataProvider { ...@@ -45,8 +41,6 @@ public class ShareButtonController implements ButtonDataProvider {
private final ObservableSupplier<Boolean> mBottomToolbarVisibilitySupplier; private final ObservableSupplier<Boolean> mBottomToolbarVisibilitySupplier;
private OnClickListener mOnClickListener; private OnClickListener mOnClickListener;
private Integer mMinimumWidthDp;
/** /**
* Creates ShareButtonController object. * Creates ShareButtonController object.
* @param context The Context for retrieving resources, etc. * @param context The Context for retrieving resources, etc.
...@@ -105,26 +99,11 @@ public class ShareButtonController implements ButtonDataProvider { ...@@ -105,26 +99,11 @@ public class ShareButtonController implements ButtonDataProvider {
} }
private void updateButtonState(Tab tab) { private void updateButtonState(Tab tab) {
if (tab == null || tab.getWebContents() == null // TODO(crbug.com/1036023) add width constraints.
|| !ChromeFeatureList.isEnabled(ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR)) { if (!CachedFeatureFlags.isEnabled(ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR)
mButtonData.canShow = false; || (mBottomToolbarVisibilitySupplier.get()
return; && BottomToolbarVariationManager.isShareButtonOnBottom())
} || mShareDelegateSupplier.get() == null) {
if (mMinimumWidthDp == null) {
mMinimumWidthDp = ChromeFeatureList.getFieldTrialParamByFeatureAsInt(
ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR, "minimum_width", MIN_WIDTH);
}
float deviceWidthPX = mContext.getResources().getDisplayMetrics().widthPixels;
int deviceWidth =
(int) (deviceWidthPX / (mContext.getResources().getDisplayMetrics().density));
boolean isDeviceWideEnough = deviceWidth > mMinimumWidthDp;
if ((mBottomToolbarVisibilitySupplier.get()
&& BottomToolbarVariationManager.isShareButtonOnBottom())
|| mShareDelegateSupplier.get() == null || !isDeviceWideEnough) {
mButtonData.canShow = false; mButtonData.canShow = false;
return; return;
} }
......
...@@ -65,6 +65,7 @@ public class CachedFeatureFlags { ...@@ -65,6 +65,7 @@ public class CachedFeatureFlags {
put(ChromeFeatureList.TAB_GROUPS_ANDROID, false); put(ChromeFeatureList.TAB_GROUPS_ANDROID, false);
put(ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, false); put(ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, false);
put(ChromeFeatureList.DUET_TABSTRIP_INTEGRATION_ANDROID, false); put(ChromeFeatureList.DUET_TABSTRIP_INTEGRATION_ANDROID, false);
put(ChromeFeatureList.SHARE_BUTTON_IN_TOP_TOOLBAR, false);
put(ChromeFeatureList.CLOSE_TAB_SUGGESTIONS, false); put(ChromeFeatureList.CLOSE_TAB_SUGGESTIONS, false);
put(ChromeFeatureList.INSTANT_START, false); put(ChromeFeatureList.INSTANT_START, false);
put(ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, false); put(ChromeFeatureList.TAB_GROUPS_CONTINUATION_ANDROID, false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment