Rearranging the code structure to allow replacing state logic.

Change-Id: I6f83d0f77045ba189f02dd465bf70ffc2a239aa1
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 63c232d..bb09a9f 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -21,9 +21,9 @@
 
 import android.view.View;
 
-import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.states.AllAppsState;
 import com.android.launcher3.states.SpringLoadedState;
+import com.android.launcher3.uioverrides.OverviewState;
 import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType;
 
 import java.util.Arrays;
@@ -49,7 +49,7 @@
 
     public static final LauncherState SPRING_LOADED = new SpringLoadedState(2);
 
-    public static final LauncherState OVERVIEW = FeatureFlags.createOverviewState(3);
+    public static final LauncherState OVERVIEW = new OverviewState(3);
 
     public final int ordinal;