Make FirstRunActivity extend AsyncInitializationActivity.

chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.firstrun;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
@@ skipping 13 matching lines @@
 
 /**
  * The First Run Experience fragment that allows the user to accept Terms of Service ("ToS") and
  * Privacy Notice, and to opt-in to the usage statistics and crash reports collection ("UMA",
  * User Metrics Analysis) as defined in the Chrome Privacy Notice.
  */
 public class ToSAndUMAFirstRunFragment extends FirstRunPage {
     private Button mAcceptButton;
     private CheckBox mSendReportCheckBox;
     private TextView mTosAndPrivacy;
+    private View mTitle;
+    private View mProgressSpinner;
+    private boolean mNativeInitialized;
+    private boolean mTriggerAcceptAfterNativeInit;
 
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fre_tosanduma, container, false);
     }
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        mTitle = view.findViewById(R.id.title);
+        mProgressSpinner = view.findViewById(R.id.progress_spinner);
+        mProgressSpinner.setVisibility(View.GONE);
         mAcceptButton = (Button) view.findViewById(R.id.terms_accept);
         mSendReportCheckBox = (CheckBox) view.findViewById(R.id.send_report_checkbox);
         mTosAndPrivacy = (TextView) view.findViewById(R.id.tos_and_privacy);
 
         mAcceptButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                getPageDelegate().acceptTermsOfService(mSendReportCheckBox.isChecked());
+                acceptTermsOfService();
             }
         });
 
         if (ChromeVersionInfo.isOfficialBuild()) {
             int paddingStart = getResources().getDimensionPixelSize(
                     R.dimen.fre_tos_checkbox_padding);
             ApiCompatibilityUtils.setPaddingRelative(mSendReportCheckBox,
                     ApiCompatibilityUtils.getPaddingStart(mSendReportCheckBox) + paddingStart,
                     mSendReportCheckBox.getPaddingTop(),
                     ApiCompatibilityUtils.getPaddingEnd(mSendReportCheckBox),
@@ skipping 17 matching lines @@
         NoUnderlineClickableSpan clickablePrivacySpan = new NoUnderlineClickableSpan() {
             @Override
             public void onClick(View widget) {
                 if (!isAdded()) return;
                 getPageDelegate().showInfoPage(R.string.chrome_privacy_notice_url);
             }
         };
         mTosAndPrivacy.setText(SpanApplier.applySpans(getString(R.string.fre_tos_and_privacy),
                 new SpanInfo("<LINK1>", "</LINK1>", clickableTermsSpan),
                 new SpanInfo("<LINK2>", "</LINK2>", clickablePrivacySpan)));
+
+        // If this page should be skipped, hide all the UI elements except for the
+        // Chrome logo and the spinner.
+        if (FirstRunStatus.shouldSkipWelcomePage()) {
+            setSpinnerVisible(true);
+        }
     }
 
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser && mSendReportCheckBox != null) {
+
+        if (!isVisibleToUser) {
+            // Restore original enabled & visibility states, in case the user returns to the page.
+            setSpinnerVisible(false);
+        } else if (mSendReportCheckBox != null) {
             // On certain versions of Android, the checkbox will appear unchecked upon revisiting
             // the page.  Force it to the end state of the drawable animation as a work around.
             // crbug.com/666258
             mSendReportCheckBox.jumpDrawablesToCurrentState();
         }
     }
 
     @Override
     public boolean shouldSkipPageOnCreate(Context appContext) {
         return FirstRunStatus.shouldSkipWelcomePage();
     }
+
+    @Override
+    public boolean shouldRecreatePageOnDataChange() {
+        // Specify that this page shouldn't be re-created on notifyDataSetChanged(), so
+        // that state like mTriggerAcceptAfterNativeInit can be preserved on the instance
+        // when native is initialized.
+        return false;
+    }
+
+    @Override
+    protected void onNativeInitialized() {
+        assert !mNativeInitialized;
+
+        mNativeInitialized = true;
+        if (mTriggerAcceptAfterNativeInit) acceptTermsOfService();
+    }
+
+    private void acceptTermsOfService() {
+        if (!mNativeInitialized) {
+            mTriggerAcceptAfterNativeInit = true;
+            setSpinnerVisible(true);
+            return;
+        }
+
+        mTriggerAcceptAfterNativeInit = false;
+        getPageDelegate().acceptTermsOfService(mSendReportCheckBox.isChecked());
+    }
+
+    private void setSpinnerVisible(boolean spinnerVisible) {
+        // When the progress spinner is visibile, we hide the other UI elements so that
+        // the user can't interact with them.
+        int otherElementsVisible = spinnerVisible ? View.INVISIBLE : View.VISIBLE;
+        mTitle.setVisibility(otherElementsVisible);
+        mAcceptButton.setVisibility(otherElementsVisible);
+        mTosAndPrivacy.setVisibility(otherElementsVisible);
+        mSendReportCheckBox.setVisibility(otherElementsVisible);
+        mProgressSpinner.setVisibility(spinnerVisible ? View.VISIBLE : View.GONE);
+    }
 }