Bug 1251362 - Part 18 - Migrate (customised) home panel configurations. r=liuche

For people with customised home panels, we need to explicitly remove the Recent Tabs panel. We also unhide the Combined History panel if it was previously hidden and additionally turn it into the default panel if the Recent Tabs panel was the previous default panel.

MozReview-Commit-ID: 5CSJUTRysQU

--HG--
extra : transplant_source : A.%23%F5%5D%CE%09%E4%F1%BE%24%7E%13Q%1B%0Bx%15e%91
This commit is contained in:
Jan Henning 2016-05-21 14:39:15 +02:00
parent b3e0d8a8bb
commit 17fe927454

View File

@ -35,7 +35,7 @@ public class HomeConfigPrefsBackend implements HomeConfigBackend {
private static final String LOGTAG = "GeckoHomeConfigBackend";
// Increment this to trigger a migration.
private static final int VERSION = 6;
private static final int VERSION = 7;
// This key was originally used to store only an array of panel configs.
public static final String PREFS_CONFIG_KEY_OLD = "home_panels";
@ -403,6 +403,11 @@ public class HomeConfigPrefsBackend implements HomeConfigBackend {
jsonPanels = removePanel(context, jsonPanels,
PanelType.DEPRECATED_READING_LIST, PanelType.BOOKMARKS, false);
break;
case 7:
jsonPanels = removePanel(context, jsonPanels,
PanelType.RECENT_TABS, PanelType.COMBINED_HISTORY, true);
break;
}
}