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

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

Issue 2654193002: [Android History] List item shadows and width constrained styling (Closed)
Patch Set: Fix some styling for supervised users Created 3 years, 11 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/HistoryItemView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryItemView.java b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryItemView.java
index bccddaa565b56bd880473635e32cbe44c78cc218..aed4cf4c9e12af1144e8bbf9c157c324d7ec1a7b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryItemView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/history/HistoryItemView.java
@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.widget.RoundedIconGenerator;
import org.chromium.chrome.browser.widget.TintedImageButton;
+import org.chromium.chrome.browser.widget.displaystyle.MarginResizer;
import org.chromium.chrome.browser.widget.selection.SelectableItemView;
/**
@@ -97,6 +98,9 @@ public class HistoryItemView extends SelectableItemView<HistoryItem> implements
mTitle.setTextColor(
ApiCompatibilityUtils.getColor(getResources(), R.color.default_text_color));
}
+
+ setBackgroundResource(
+ selectBackgroundResource(item.isLastInGroup(), item.isFirstInGroup()));
}
/**
@@ -108,6 +112,10 @@ public class HistoryItemView extends SelectableItemView<HistoryItem> implements
mHistoryManager = manager;
if (!getItem().wasBlockedVisit()) requestIcon();
+
+ MarginResizer.createWithViewAdapter(this,
+ mHistoryManager.getSelectableListLayout().getUiConfig(),
+ mHistoryManager.getDefaultLateralListItemMarginPx(), 0);
}
/**
@@ -168,4 +176,12 @@ public class HistoryItemView extends SelectableItemView<HistoryItem> implements
!PrefServiceBridge.getInstance().canDeleteBrowsingHistory() ? View.GONE :
mRemoveButtonVisible ? View.VISIBLE : View.INVISIBLE);
}
+
+ private int selectBackgroundResource(boolean isLastInGroup, boolean isFirstInGroup) {
Theresa 2017/01/27 00:57:35 The background needs to be reselected when other i
Theresa 2017/01/27 23:34:45 Done.
+ if (!isLastInGroup && !isFirstInGroup) return R.drawable.list_item_middle;
gone 2017/01/27 18:48:52 might be clearer to just structure it as if (bla
Theresa 2017/01/27 23:34:45 Done.
+ if (!isLastInGroup && isFirstInGroup) return R.drawable.list_item_top;
+ if (isLastInGroup && !isFirstInGroup) return R.drawable.list_item_bottom;
+
+ return R.drawable.list_item_single;
+ }
}

Powered by Google App Engine
This is Rietveld 408576698