Bug 1261760 - History tab empty state appears at incorrect times. r=sebastian
authorChenxia Liu <liuche@mozilla.com>
Thu, 07 Apr 2016 13:52:21 -0700
changeset 330229 91be573526b66a3117592fa8d9b9d0dec038ef5e
parent 330220 96dbbe35b47f6b6ff63d32fdac0895240fde458b
child 330230 870df3ae98535fdd19b0097667b5a0b3c1186cd1
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian
bugs1261760
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1261760 - History tab empty state appears at incorrect times. r=sebastian MozReview-Commit-ID: 6HtS53fuCHE
mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
--- a/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/CombinedHistoryPanel.java
@@ -336,21 +336,21 @@ public class CombinedHistoryPanel extend
                     emptyHint.setText(hintBuilder);
                     emptyHint.setMovementMethod(LinkMovementMethod.getInstance());
                     emptyHint.setVisibility(View.VISIBLE);
                 }
 
                 if (!Restrictions.isAllowed(getActivity(), Restrictable.PRIVATE_BROWSING)) {
                     emptyHint.setVisibility(View.GONE);
                 }
-                mEmptyView.setVisibility(View.VISIBLE);
-            } else {
-                if (mEmptyView != null) {
-                    mEmptyView.setVisibility(View.GONE);
-                }
+            }
+            mEmptyView.setVisibility(View.VISIBLE);
+        } else {
+            if (mEmptyView != null) {
+                mEmptyView.setVisibility(View.GONE);
             }
         }
     }
     /**
      * Make Span that is clickable, and underlined
      * between the string markers <code>FORMAT_S1</code> and
      * <code>FORMAT_S2</code>.
      *