Commit 55ae16c8 authored by spdonghao's avatar spdonghao Committed by Commit Bot

Revert "[Instant Start] Show Sign-in box for Feed articles pre-native."

Reason for revert: The SignInManager is created post-native,
which is necessary for the visibility of Sign-in box.

Original change's description:
> [Instant Start] Show Sign-in box for Feed articles pre-native.
>
> Bug: 1086961
> Change-Id: If811181513eced84a7c92960520a5f8e5f398398
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218849
> Commit-Queue: Hao Dong <spdonghao@chromium.org>
> Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
> Reviewed-by: Xi Han <hanxi@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#776558}

Bug: 1104851
Change-Id: Id83faa05fd29c6b98c760fcec6ee1c758c494b1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2296452Reviewed-by: default avatarWei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: default avatarXi Han <hanxi@chromium.org>
Commit-Queue: Hao Dong <spdonghao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788653}
parent 6a3cd037
......@@ -95,7 +95,6 @@ android_library("java") {
deps += [
"//chrome/browser/profiles/android:java",
"//components/signin/public/android:java",
"//content/public/android:content_java",
"//third_party/android_sdk/androidx_browser:androidx_browser_java",
"//ui/android:ui_utils_java",
......
......@@ -32,12 +32,6 @@
android:textAppearance="@style/TextAppearance.TextMedium.Blue" />
</LinearLayout>
<LinearLayout
android:id="@+id/sign_in_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"/>
<LinearLayout
android:id="@+id/placeholders_layout"
android:layout_width="match_parent"
......
......@@ -13,12 +13,7 @@ import android.view.ViewGroup;
import androidx.annotation.VisibleForTesting;
import org.chromium.chrome.browser.ntp.cards.SignInPromo;
import org.chromium.chrome.browser.signin.ProfileDataCache;
import org.chromium.chrome.browser.signin.SigninPromoController;
import org.chromium.chrome.browser.signin.SigninPromoUtil;
import org.chromium.chrome.start_surface.R;
import org.chromium.components.signin.metrics.SigninAccessPoint;
/** The coordinator to control the loading feed surface. */
public class FeedLoadingCoordinator {
......@@ -41,16 +36,6 @@ public class FeedLoadingCoordinator {
mFeedLoadingView = (FeedLoadingLayout) LayoutInflater.from(mContext).inflate(
R.layout.feed_loading_layout, null, false);
mParentView.addView(mFeedLoadingView);
if (SignInPromo.shouldCreatePromo()) {
SigninPromoController signinPromoController =
new SigninPromoController(SigninAccessPoint.NTP_CONTENT_SUGGESTIONS);
int imageSize =
mContext.getResources().getDimensionPixelSize(R.dimen.user_picture_size);
ProfileDataCache profileDataCache = new ProfileDataCache(mContext, imageSize);
SigninPromoUtil.setupPromoViewFromCache(signinPromoController, profileDataCache,
mFeedLoadingView.getSigninPromoView(), null);
}
}
void onOverviewShownAtLaunch(long activityCreationTimeMs) {
......
......@@ -12,14 +12,10 @@ import android.graphics.drawable.LayerDrawable;
import android.os.SystemClock;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import androidx.annotation.Nullable;
import org.chromium.chrome.browser.signin.PersonalizedSigninPromoView;
import org.chromium.chrome.start_surface.R;
import org.chromium.components.browser_ui.widget.displaystyle.HorizontalDisplayStyle;
import org.chromium.components.browser_ui.widget.displaystyle.UiConfig;
......@@ -42,7 +38,6 @@ public class FeedLoadingLayout extends LinearLayout {
private static final int TEXT_PLACEHOLDER_RADIUS_DP = 11;
private Context mContext;
private @Nullable PersonalizedSigninPromoView mSigninPromoView;
private Resources mResources;
private long mLayoutInflationCompleteMs;
......@@ -66,22 +61,6 @@ public class FeedLoadingLayout extends LinearLayout {
setPlaceholders();
}
/** @return The {@link PersonalizedSigninPromoView} for this class. */
PersonalizedSigninPromoView getSigninPromoView() {
if (mSigninPromoView == null) {
mSigninPromoView = (PersonalizedSigninPromoView) LayoutInflater.from(mContext).inflate(
R.layout.personalized_signin_promo_view_modern_content_suggestions, null,
false);
LinearLayout signView = findViewById(R.id.sign_in_box);
LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
signView.setLayoutParams(lp);
lp.setMargins(0, 0, 0, dpToPx(12));
signView.addView(mSigninPromoView);
}
return mSigninPromoView;
}
private void setPlaceholders() {
setPadding();
boolean isLandscape = getResources().getConfiguration().orientation
......
......@@ -63,7 +63,6 @@ import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.homepage.HomepageManager;
import org.chromium.chrome.browser.ntp.cards.SignInPromo;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.TabState;
......@@ -657,7 +656,6 @@ public class InstantStartTest {
createThumbnailBitmapAndWriteToFile(0);
TabAttributeCache.setTitleForTesting(0, "Google");
SignInPromo.setDisablePromoForTests(true);
startMainActivityFromLauncher();
CriteriaHelper.pollUiThread(
() -> mActivityTestRule.getActivity().getLayoutManager().overviewVisible());
......
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