Fix "Most visited" history group flicker
Bug: 3374382
Change-Id: Idedf9804fa2010c91ac163965fb1d7a0617d438e
diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 6ea2bff..44c26ec 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -557,13 +557,13 @@
@Override
public int getGroupCount() {
- return super.getGroupCount() + (mMostVisited != null ? 1 : 0);
+ return super.getGroupCount() + (!isMostVisitedEmpty() ? 1 : 0);
}
@Override
public int getChildrenCount(int groupPosition) {
if (groupPosition >= super.getGroupCount()) {
- if (mMostVisited == null) {
+ if (isMostVisitedEmpty()) {
return 0;
}
return mMostVisited.getCount();
@@ -576,6 +576,10 @@
if (!super.isEmpty()) {
return false;
}
+ return isMostVisitedEmpty();
+ }
+
+ private boolean isMostVisitedEmpty() {
return mMostVisited == null
|| mMostVisited.isClosed()
|| mMostVisited.getCount() == 0;