diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:01 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
| commit | ae6b7551e4c92fa942b11788f401842aedc24d91 (patch) | |
| tree | 3d21cbb26808a4be80119ae76f3869f4bcac6a2c /src/com/android/launcher3/Launcher.java | |
| parent | 506b0b660d7e8ee198c5f1052191bfea8968addf (diff) | |
| download | android_packages_apps_Trebuchet-ae6b7551e4c92fa942b11788f401842aedc24d91.tar.gz android_packages_apps_Trebuchet-ae6b7551e4c92fa942b11788f401842aedc24d91.tar.bz2 android_packages_apps_Trebuchet-ae6b7551e4c92fa942b11788f401842aedc24d91.zip | |
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
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 1 insertions, 5 deletions
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); |