summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/states/SpringLoadedState.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-10-20 17:05:27 -0700
committerSunny Goyal <sunnygoyal@google.com>2017-10-23 16:33:58 -0700
commitbe93f264d74eed6d43d6c75694624d53d6877357 (patch)
tree03ea942af82c095f7efc95fe654e3b0c5f18c708 /src/com/android/launcher3/states/SpringLoadedState.java
parent2104c3025a3c5987164c7cf625168705ee018f55 (diff)
downloadandroid_packages_apps_Trebuchet-be93f264d74eed6d43d6c75694624d53d6877357.tar.gz
android_packages_apps_Trebuchet-be93f264d74eed6d43d6c75694624d53d6877357.tar.bz2
android_packages_apps_Trebuchet-be93f264d74eed6d43d6c75694624d53d6877357.zip
Moving all-apps state logic to an independent class
Unifying all the paths for state change to a single flow Bug: 67678570 Change-Id: I0773c0f59ae1ef324c507bc1aae188d8c059dea4
Diffstat (limited to 'src/com/android/launcher3/states/SpringLoadedState.java')
-rw-r--r--src/com/android/launcher3/states/SpringLoadedState.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher3/states/SpringLoadedState.java b/src/com/android/launcher3/states/SpringLoadedState.java
index f60ef0ca1..3864e3a85 100644
--- a/src/com/android/launcher3/states/SpringLoadedState.java
+++ b/src/com/android/launcher3/states/SpringLoadedState.java
@@ -20,6 +20,7 @@ import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_TRANSITION_M
import android.content.pm.ActivityInfo;
import android.graphics.Rect;
import android.os.Handler;
+import android.view.View;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.InstallShortcutReceiver;
@@ -41,7 +42,7 @@ public class SpringLoadedState extends LauncherState {
private static final int RESTORE_SCREEN_ORIENTATION_DELAY = 500;
public SpringLoadedState(int id) {
- super(id, ContainerType.OVERVIEW, SPRING_LOADED_TRANSITION_MS, STATE_FLAGS);
+ super(id, ContainerType.OVERVIEW, SPRING_LOADED_TRANSITION_MS, 1f, STATE_FLAGS);
}
@Override
@@ -105,4 +106,9 @@ public class SpringLoadedState extends LauncherState {
InstallShortcutReceiver.disableAndFlushInstallQueue(
InstallShortcutReceiver.FLAG_DRAG_AND_DROP, launcher);
}
+
+ @Override
+ public View getFinalFocus(Launcher launcher) {
+ return null;
+ }
}