From ae6b7551e4c92fa942b11788f401842aedc24d91 Mon Sep 17 00:00:00 2001
From: Raj Yengisetty <rajesh@cyngn.com>
Date: Mon, 10 Nov 2014 10:35:01 -0800
Subject: Settings adapter should use the position and partition values

Fixes:
https://jira.cyanogenmod.org/browse/BACON-587

Conflicts:
	src/com/android/launcher3/OverviewSettingsPanel.java
	src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java

Change-Id: Ie935c51ea1e68eaa7da64b23eaf2ae28a630a3bb
---
 src/com/android/launcher3/Launcher.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/com/android/launcher3/Launcher.java')

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c3f357c65..34a4533a0 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -299,7 +299,7 @@ public class Launcher extends Activity
 
     private View mAllAppsButton;
 
-    private SearchDropTargetBar mSearchDropTargetBar;
+    protected SearchDropTargetBar mSearchDropTargetBar;
     private AppsCustomizeTabHost mAppsCustomizeTabHost;
     private AppsCustomizePagedView mAppsCustomizeContent;
     private boolean mAutoAdvanceRunning = false;
@@ -1055,10 +1055,6 @@ public class Launcher extends Activity
 
         updateGridIfNeeded();
 
-        if(isGelIntegrationEnabled() && isGelIntegrationSupported()) {
-            GelIntegrationHelper.getInstance().handleGelResume();
-        }
-
         // Restore the previous launcher state
         if (mOnResumeState == State.WORKSPACE) {
             showWorkspace(false);
-- 
cgit v1.2.3