summaryrefslogtreecommitdiffstats
path: root/quickstep/recents_ui_overrides/src/com
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-03-15 18:52:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-15 18:52:25 +0000
commitd082129ef816884f2658c362215c66a35704a3f3 (patch)
tree1bc2177071e0a56b4a457a8e519a731cd6aa4b9a /quickstep/recents_ui_overrides/src/com
parentf1d72926dcfc5f2986d53ea79db1045e1dc34b75 (diff)
parentd64b4f44da58621ea9b5872e8e8ca2121e0abbe6 (diff)
downloadandroid_packages_apps_Trebuchet-d082129ef816884f2658c362215c66a35704a3f3.tar.gz
android_packages_apps_Trebuchet-d082129ef816884f2658c362215c66a35704a3f3.tar.bz2
android_packages_apps_Trebuchet-d082129ef816884f2658c362215c66a35704a3f3.zip
Merge "Switching swipe-up to overview to using test info provider" into ub-launcher3-master
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com')
-rw-r--r--quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java
index f4ea9f9bf..79e127a8d 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java
@@ -26,6 +26,7 @@ import android.view.View;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.InvariantDeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.R;
@@ -132,7 +133,10 @@ public class OverviewState extends LauncherState {
}
public static float getDefaultSwipeHeight(Launcher launcher) {
- DeviceProfile dp = launcher.getDeviceProfile();
+ return getDefaultSwipeHeight(launcher.getDeviceProfile());
+ }
+
+ public static float getDefaultSwipeHeight(DeviceProfile dp) {
return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;
}