1 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index e4ba5da7a..0daf14267 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -71,7 +71,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
 
         if (title.equals(res
                 .getString(R.string.home_screen_search_text))) {
-            boolean current = mLauncher.shouldShowSearchBar();
+            boolean current = mLauncher.isSearchBarEnabled();
             String state = current ? res.getString(
                     R.string.setting_state_on) : res.getString(
                     R.string.setting_state_off);
@@ -232,7 +232,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                         v,
                         SettingsProvider.SETTINGS_UI_HOMESCREEN_SEARCH,
                         R.bool.preferences_interface_homescreen_search_default);
-                mLauncher.updateDynamicGrid();
+                mLauncher.setUpdateDynamicGrid();
             } else if (value.equals(res
                     .getString(R.string.drawer_sorting_text))) {
                 onClickTransitionEffectButton();
@@ -250,7 +250,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                         v,
                         SettingsProvider.SETTINGS_UI_GENERAL_ICONS_LARGE,
                         R.bool.preferences_interface_general_icons_large_default);
-                mLauncher.updateDynamicGrid();
+                mLauncher.setUpdateDynamicGrid();
             } else if (value.equals(res
                     .getString(R.string.icon_labels)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.HOME_SETTINGS_POSITION)) {
@@ -258,7 +258,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                         v,
                         SettingsProvider.SETTINGS_UI_HOMESCREEN_HIDE_ICON_LABELS,
                         R.bool.preferences_interface_homescreen_hide_icon_labels_default);
-                mLauncher.updateDynamicGrid();
+                mLauncher.setUpdateDynamicGrid();
             } else if (value.equals(res
                     .getString(R.string.icon_labels)) &&
                     ((Integer)v.getTag() == OverviewSettingsPanel.DRAWER_SETTINGS_POSITION)) {
@@ -266,21 +266,19 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
                         v,
                         SettingsProvider.SETTINGS_UI_DRAWER_HIDE_ICON_LABELS,
                         R.bool.preferences_interface_drawer_hide_icon_labels_default);
-                mLauncher.updateDynamicGrid();
+                mLauncher.setUpdateDynamicGrid();
             } else if (value.equals(res.getString(R.string.protected_app_settings))) {
                 Intent intent = new Intent();
                 intent.setClassName(OverviewSettingsPanel.ANDROID_SETTINGS,
                         OverviewSettingsPanel.ANDROID_PROTECTED_APPS);
                 mLauncher.startActivity(intent);
-            } else if (value.equals(res.getString(R.string.protected_app_settings))) {
-
             } else if (value.equals(res
                     .getString(R.string.scrolling_wallpaper))) {
                 onSettingsBooleanChanged(
                         v,
                         SettingsProvider.SETTINGS_UI_HOMESCREEN_SCROLLING_WALLPAPER_SCROLL,
                         R.bool.preferences_interface_homescreen_scrolling_wallpaper_scroll_default);
-                mLauncher.updateDynamicGrid();
+                mLauncher.setUpdateDynamicGrid();
             } else if (value.equals(res
                     .getString(R.string.grid_size_text))) {
                 mLauncher.onClickDynamicGridSizeButton();