diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-24 18:33:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-24 18:33:01 +0000 |
commit | e8532d84a94b095db4912dc863d826b7e7722036 (patch) | |
tree | 924527cf8be6ec4ab039bc7d23d028c3821a1778 /quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java | |
parent | fb6721da45e7f3fa4df00d6486ee3c53de5d7cf7 (diff) | |
parent | ccd90231e606e6a2c0ee55f49ad347723aa2f75f (diff) | |
download | android_packages_apps_Trebuchet-e8532d84a94b095db4912dc863d826b7e7722036.tar.gz android_packages_apps_Trebuchet-e8532d84a94b095db4912dc863d826b7e7722036.tar.bz2 android_packages_apps_Trebuchet-e8532d84a94b095db4912dc863d826b7e7722036.zip |
Merge "Calculate the scale up for quickscrub based on the available size of the screen" into ub-launcher3-edmonton
Diffstat (limited to 'quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java')
-rw-r--r-- | quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java index da85990bb..43d982230 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/FastOverviewState.java @@ -15,8 +15,13 @@ */ package com.android.launcher3.uioverrides; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Rect; + import com.android.launcher3.DeviceProfile; import com.android.launcher3.Launcher; +import com.android.launcher3.R; import com.android.quickstep.QuickScrubController; import com.android.quickstep.views.RecentsView; @@ -25,6 +30,12 @@ import com.android.quickstep.views.RecentsView; */ public class FastOverviewState extends OverviewState { + private static final float MAX_PREVIEW_SCALE_UP = 1.3f; + /** + * Vertical transition of the task previews relative to the full container. + */ + public static final float OVERVIEW_TRANSLATION_FACTOR = 0.5f; + private static final int STATE_FLAGS = FLAG_DISABLE_RESTORE | FLAG_DISABLE_INTERACTION | FLAG_OVERVIEW_UI | FLAG_HIDE_BACK_BUTTON | FLAG_DISABLE_ACCESSIBILITY; @@ -46,15 +57,23 @@ public class FastOverviewState extends OverviewState { @Override public float[] getOverviewScaleAndTranslationYFactor(Launcher launcher) { - return new float[] {getOverviewScale(launcher.getDeviceProfile()), 0.5f}; + RecentsView recentsView = launcher.getOverviewPanel(); + recentsView.getTaskSize(sTempRect); + + return new float[] {getOverviewScale(launcher.getDeviceProfile(), sTempRect, launcher), + OVERVIEW_TRANSLATION_FACTOR}; } - public static float getOverviewScale(DeviceProfile dp) { - if (dp.isMultiWindowMode || dp.isVerticalBarLayout()) { + public static float getOverviewScale(DeviceProfile dp, Rect taskRect, Context context) { + if (dp.isVerticalBarLayout()) { return 1f; } - // TODO: Calculate it dynamically based on available space - return 1.3f; + Resources res = context.getResources(); + float usedHeight = taskRect.height() + res.getDimension(R.dimen.task_thumbnail_top_margin); + float usedWidth = taskRect.width() + 2 * (res.getDimension(R.dimen.recents_page_spacing) + + res.getDimension(R.dimen.quickscrub_adjacent_visible_width)); + return Math.min(Math.min(dp.availableHeightPx / usedHeight, + dp.availableWidthPx / usedWidth), MAX_PREVIEW_SCALE_UP); } } |