[Android History] Even more polish

chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java

 // Copyright 2016 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.history;
 
 import android.content.res.Resources;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.text.SpannableString;
@@ skipping 34 matching lines @@
             "https://support.google.com/chrome/?p=sync_history&hl="
                     + Locale.getDefault().toString();
     private static final String GOOGLE_HISTORY_LINK = "history.google.com";
 
     private final SelectionDelegate<HistoryItem> mSelectionDelegate;
     private final HistoryProvider mHistoryProvider;
     private final HistoryManager mHistoryManager;
     private final ArrayList<HistoryItemView> mItemViews;
     private RecyclerView mRecyclerView;
 
+    private ViewGroup mPrivacyDisclaimers;
     private TextView mSignedInNotSyncedTextView;
     private TextView mSignedInSyncedTextView;
     private TextView mOtherFormsOfBrowsingHistoryTextView;
     private Button mClearBrowsingDataButton;
     private FrameLayout mClearBrowsingDataButtonContainer;
 
     private boolean mHasOtherFormsOfBrowsingData;
     private boolean mHasSyncedData;
     private boolean mIsHeaderInflated;
     private boolean mIsDestroyed;
@@ skipping 241 matching lines @@
             public void onClick(View v) {
                 mHistoryManager.openClearBrowsingDataPreference();
             }
         });
         mClearBrowsingDataButtonContainer = (FrameLayout) mClearBrowsingDataButton.getParent();
         MarginResizer.createWithViewAdapter(mClearBrowsingDataButtonContainer,
                 mHistoryManager.getSelectableListLayout().getUiConfig(),
                 mHistoryManager.getDefaultLateralListItemMarginPx(), 0);
         updateClearBrowsingDataButtonVisibility();
 
+        mPrivacyDisclaimers = (ViewGroup) v.findViewById(R.id.privacy_disclaimers);
+
         mSignedInNotSyncedTextView = (TextView) v.findViewById(R.id.signed_in_not_synced);
         setPrivacyDisclaimerText(mSignedInNotSyncedTextView,
                 R.string.android_history_no_synced_results, LEARN_MORE_LINK);
         MarginResizer.createWithViewAdapter(mSignedInNotSyncedTextView,
                 mHistoryManager.getSelectableListLayout().getUiConfig(),
                 getDefaultTextMargin(resources), mHistoryManager.getListItemLateralShadowSizePx());
 
         mSignedInSyncedTextView = (TextView) v.findViewById(R.id.signed_in_synced);
         setPrivacyDisclaimerText(mSignedInSyncedTextView,
                 R.string.android_history_has_synced_results, LEARN_MORE_LINK);
@@ skipping 47 matching lines @@
     private void setPrivacyDisclaimerVisibility() {
         if (!mIsHeaderInflated) return;
 
         boolean isSignedIn =
                 ChromeSigninController.get(ContextUtils.getApplicationContext()).isSignedIn();
         mSignedInNotSyncedTextView.setVisibility(
                 !mHasSyncedData && isSignedIn ? View.VISIBLE : View.GONE);
         mSignedInSyncedTextView.setVisibility(mHasSyncedData ? View.VISIBLE : View.GONE);
         mOtherFormsOfBrowsingHistoryTextView.setVisibility(
                 mHasOtherFormsOfBrowsingData ? View.VISIBLE : View.GONE);
+
+        boolean privacyDisclaimersVisible =

[gone, 2017/02/16 19:29:16]

arePrivacyDisclaimersVisible?  This function already references is & has.

[Theresa, 2017/02/16 19:59:10]

Done.

+                isSignedIn || mHasSyncedData || mHasOtherFormsOfBrowsingData;
+        mPrivacyDisclaimers.setVisibility(privacyDisclaimersVisible ? View.VISIBLE : View.GONE);
     }
 
     private void updateClearBrowsingDataButtonVisibility() {
         mClearBrowsingDataButtonContainer.setVisibility(
                 !PrefServiceBridge.getInstance().canDeleteBrowsingHistory() ? View.GONE :
                     View.VISIBLE);
     }
 
     private int getDefaultTextMargin(Resources resources) {
         if (mDefaultTextMargin == 0) {
@@ skipping 11 matching lines @@
     @VisibleForTesting
     TextView getSignedInSyncedViewForTests() {
         return mSignedInSyncedTextView;
     }
 
     @VisibleForTesting
     TextView getOtherFormsOfBrowsingHistoryViewForTests() {
         return mOtherFormsOfBrowsingHistoryTextView;
     }
 }