From d74baf7dcdfad4df88c1c3279e5e205d736905ba Mon Sep 17 00:00:00 2001 From: Nevin Chen Date: Wed, 25 Jan 2017 12:10:55 +0800 Subject: [PATCH] Bug 1332955 - Consider restore data( for bookmark parent stack) when reloading home panels. r=ahunt MozReview-Commit-ID: 7m6HOnfPLK3 --HG-- extra : rebase_source : f7351689302d98aaa9c7ebfe15c4046e661d8c9e --- .../android/base/java/org/mozilla/gecko/home/HomePager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/HomePager.java b/mobile/android/base/java/org/mozilla/gecko/home/HomePager.java index 4811c4c1d496..d33080e2649f 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/HomePager.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/HomePager.java @@ -225,8 +225,9 @@ public class HomePager extends ViewPager implements HomeScreen { // list of panels in place. mTabStrip.setVisibility(View.INVISIBLE); - // If HomeConfigLoader already exist, force load to select the current item - if (lm.getLoader(LOADER_ID_CONFIG) != null) { + // If HomeConfigLoader already exist and there's no restoreData(for bookmark's parentStack), + // call forceLoad() to trigger updateUiFromConfigState() and reset HomePager's adapter. + if (lm.getLoader(LOADER_ID_CONFIG) != null && restoreData == null) { lm.getLoader(LOADER_ID_CONFIG).forceLoad(); } else { // Load list of panels from configuration