diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2019-03-13 22:05:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-13 22:05:27 +0000 |
| commit | 1e6641fc74d3edf927d475e6fa9dce85d86af321 (patch) | |
| tree | 3ae6d45c56ce1a1c8ac5c67761152fa95330138a /go | |
| parent | da608461978526a4fc6a2fba6161d5443fd998ef (diff) | |
| parent | 58ddac1d09a05b3fc8359545285d363407883f37 (diff) | |
| download | android_packages_apps_Trebuchet-1e6641fc74d3edf927d475e6fa9dce85d86af321.tar.gz android_packages_apps_Trebuchet-1e6641fc74d3edf927d475e6fa9dce85d86af321.tar.bz2 android_packages_apps_Trebuchet-1e6641fc74d3edf927d475e6fa9dce85d86af321.zip | |
Merge "Removing fade animation on swipe up" into ub-launcher3-master
Diffstat (limited to 'go')
| -rw-r--r-- | go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java | 6 | ||||
| -rw-r--r-- | go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java index abb924224..bba08a40a 100644 --- a/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java +++ b/go/quickstep/src/com/android/quickstep/FallbackActivityControllerHelper.java @@ -26,7 +26,6 @@ import androidx.annotation.Nullable; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.userevent.nano.LauncherLogProto; -import com.android.launcher3.util.MultiValueAlpha.AlphaProperty; import com.android.quickstep.util.RemoteAnimationTargetSet; import com.android.quickstep.views.IconRecentsView; @@ -110,11 +109,6 @@ public final class FallbackActivityControllerHelper extends } @Override - public AlphaProperty getAlphaProperty(RecentsActivity activity) { - return activity.getDragLayer().getAlphaProperty(0); - } - - @Override public int getContainerType() { return LauncherLogProto.ContainerType.SIDELOADED_LAUNCHER; } diff --git a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java b/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java index 76685f341..d55d2e5fd 100644 --- a/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/go/quickstep/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -22,9 +22,7 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherInitListener; import com.android.launcher3.anim.AnimatorPlaybackController; -import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.userevent.nano.LauncherLogProto; -import com.android.launcher3.util.MultiValueAlpha.AlphaProperty; import com.android.quickstep.views.IconRecentsView; import java.util.function.BiPredicate; @@ -94,11 +92,6 @@ public final class LauncherActivityControllerHelper extends GoActivityControlHel } @Override - public AlphaProperty getAlphaProperty(Launcher activity) { - return activity.getDragLayer().getAlphaProperty(DragLayer.ALPHA_INDEX_SWIPE_UP); - } - - @Override public int getContainerType() { final Launcher launcher = getVisibleLauncher(); return launcher != null ? launcher.getStateManager().getState().containerType |