Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java

Issue 2691373004: [Android History] Even more polish (Closed)
Patch Set: [Android History] Even more polish Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
index 824d8964b51bca918ed72fa3761b66d543a55d10..65dc9967c9b192e6201822eb7940e24579e4a26e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryAdapter.java
@@ -52,6 +52,7 @@ public class HistoryAdapter extends DateDividedAdapter implements BrowsingHistor
private final ArrayList<HistoryItemView> mItemViews;
private RecyclerView mRecyclerView;
+ private ViewGroup mPrivacyDisclaimers;
private TextView mSignedInNotSyncedTextView;
private TextView mSignedInSyncedTextView;
private TextView mOtherFormsOfBrowsingHistoryTextView;
@@ -313,6 +314,8 @@ public class HistoryAdapter extends DateDividedAdapter implements BrowsingHistor
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);
@@ -380,6 +383,10 @@ public class HistoryAdapter extends DateDividedAdapter implements BrowsingHistor
mSignedInSyncedTextView.setVisibility(mHasSyncedData ? View.VISIBLE : View.GONE);
mOtherFormsOfBrowsingHistoryTextView.setVisibility(
mHasOtherFormsOfBrowsingData ? View.VISIBLE : View.GONE);
+
+ boolean arePrivacyDisclaimersVisible =
+ isSignedIn || mHasSyncedData || mHasOtherFormsOfBrowsingData;
+ mPrivacyDisclaimers.setVisibility(arePrivacyDisclaimersVisible ? View.VISIBLE : View.GONE);
}
private void updateClearBrowsingDataButtonVisibility() {

Powered by Google App Engine
This is Rietveld 408576698