PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing overview mode scale calculations.

Browse Source 
- Making the overview scale apply just like the spring loaded scale factor
- Tweaking overview scale to make it not so small

Change-Id: If93bac08609b0cfd9c9d9f8f6057498957378b56
This commit is contained in:
Winson Chung
2015-07-10 18:00:48 -07:00
parent 76648c58d5
commit 4f7eb4077e
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+12 -9
View File
@@ -306,8 +306,9 @@ public class Workspace extends PagedView
TypedArray a = context.obtainStyledAttributes(attrs,
R.styleable.Workspace, defStyle, 0);
mSpringLoadedShrinkFactor =
res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f;
mOverviewModeShrinkFactor = grid.getOverviewModeScale(mIsRtl);
res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f;
mOverviewModeShrinkFactor =
res.getInteger(R.integer.config_workspaceOverviewShrinkPercentage) / 100f;
mOriginalDefaultPage = mDefaultPage = a.getInt(R.styleable.Workspace_defaultScreen, 1);
a.recycle();
@@ -1952,15 +1953,17 @@ public class Workspace extends PagedView
int getOverviewModeTranslationY() {
DeviceProfile grid = mLauncher.getDeviceProfile();
Rect overviewBar = grid.getOverviewModeButtonBarRect();
Rect workspacePadding = grid.getWorkspacePadding(Utilities.isRtl(getResources()));
int overviewButtonBarHeight = grid.getOverviewModeButtonBarHeight();
int availableHeight = getViewportHeight();
int scaledHeight = (int) (mOverviewModeShrinkFactor * getNormalChildHeight());
int offsetFromTopEdge = (availableHeight - scaledHeight) / 2;
int offsetToCenterInOverview = (availableHeight - mInsets.top - overviewBar.height()
- scaledHeight) / 2;
return -offsetFromTopEdge + mInsets.top + offsetToCenterInOverview;
int workspaceTop = mInsets.top + workspacePadding.top;
int workspaceBottom = getViewportHeight() - mInsets.bottom - workspacePadding.bottom;
int overviewTop = mInsets.top;
int overviewBottom = getViewportHeight() - mInsets.bottom - overviewButtonBarHeight;
int workspaceOffsetTopEdge = workspaceTop + ((workspaceBottom - workspaceTop) - scaledHeight) / 2;
int overviewOffsetTopEdge = overviewTop + (overviewBottom - overviewTop - scaledHeight) / 2;
return -workspaceOffsetTopEdge + overviewOffsetTopEdge;
}
/**