1 files changed, 0 insertions, 54 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 8bdd8836c..6fbbd52fd 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -368,10 +368,6 @@ public class Launcher extends BaseActivity
     private EditText mIconEditTitle;
     private IconsHandler mIconsHandler;
 
-    // Feed integration
-    private LauncherTab mLauncherTab;
-    private boolean mFeedIntegrationEnabled;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         if (DEBUG_STRICT_MODE) {
@@ -500,9 +496,6 @@ public class Launcher extends BaseActivity
         // we want the screen to auto-rotate based on the current orientation
         setOrientation();
 
-        mFeedIntegrationEnabled = isFeedIntegrationEnabled();
-        mLauncherTab = new LauncherTab(this, mFeedIntegrationEnabled);
-
         setContentView(mLauncherView);
 
         // Listen for broadcasts
@@ -1085,9 +1078,6 @@ public class Launcher extends BaseActivity
         if (shouldShowDiscoveryBounce()) {
             mAllAppsController.showDiscoveryBounce();
         }
-        if (mFeedIntegrationEnabled) {
-            mLauncherTab.getClient().onResume();
-        }
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onResume();
         }
@@ -1112,10 +1102,6 @@ public class Launcher extends BaseActivity
             mWorkspace.getCustomContentCallbacks().onHide();
         }
 
-        if (mFeedIntegrationEnabled) {
-            mLauncherTab.getClient().onPause();
-        }
-
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onPause();
         }
@@ -1627,11 +1613,6 @@ public class Launcher extends BaseActivity
         super.onAttachedToWindow();
 
         FirstFrameAnimatorHelper.initializeDrawListener(getWindow().getDecorView());
-
-        if (mFeedIntegrationEnabled) {
-            mLauncherTab.getClient().onAttachedToWindow();
-        }
-
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onAttachedToWindow();
         }
@@ -1641,11 +1622,6 @@ public class Launcher extends BaseActivity
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
 
-
-        if (mFeedIntegrationEnabled) {
-            mLauncherTab.getClient().onDetachedFromWindow();
-        }
-
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onDetachedFromWindow();
         }
@@ -1811,10 +1787,6 @@ public class Launcher extends BaseActivity
                 mIconEditDialog = null;
             }
 
-            if (mFeedIntegrationEnabled) {
-                mLauncherTab.getClient().hideOverlay(true);
-            }
-
             if (mLauncherCallbacks != null) {
                 mLauncherCallbacks.onHomeIntent();
             }
@@ -1926,10 +1898,6 @@ public class Launcher extends BaseActivity
 
         clearPendingBinds();
 
-        if (mFeedIntegrationEnabled) {
-            mLauncherTab.getClient().onDestroy();
-        }
-
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onDestroy();
         }
@@ -4179,10 +4147,6 @@ public class Launcher extends BaseActivity
         return super.onKeyShortcut(keyCode, event);
     }
 
-    private boolean isFeedIntegrationEnabled() {
-        return Utilities.hasFeedIntegration(this);
-    }
-
     public static CustomAppWidget getCustomAppWidget(String name) {
         return sCustomAppWidgets.get(name);
     }
@@ -4207,24 +4171,6 @@ public class Launcher extends BaseActivity
                 // Recreate the activity so that it initializes the rotation preference again.
                 recreate();
             }
-            if (SettingsActivity.KEY_FEED_INTEGRATION.equals(key)) {
-                if (mLauncherTab == null) {
-                    return;
-                }
-
-                mFeedIntegrationEnabled = isFeedIntegrationEnabled();
-                mLauncherTab.updateLauncherTab(mFeedIntegrationEnabled);
-
-                if (mLauncherTab.getClient() == null) {
-                    return;
-                }
-
-                if (mFeedIntegrationEnabled) {
-                    mLauncherTab.getClient().onAttachedToWindow();
-                } else {
-                    mLauncherTab.getClient().onDestroy();
-                }
-            }
         }
     }
 }