aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding support for non-zero left insets

Browse Source 
Bug: 29613069
Change-Id: Ifdf9bcce7ecdedc510f3be8a4dc10eb8da7c4bf1
This commit is contained in:
Sunny Goyal
2016-07-06 09:47:56 -07:00
parent 27731e4d7d
commit 6c2975e7e3
5 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/launcher3/Workspace.java
View File

@@ -357,7 +357,16 @@ public class Workspace extends PagedView
@Override
public void setInsets(Rect insets) {
int extraLeftPadding = insets.left - mInsets.left;
mInsets.set(insets);
if (extraLeftPadding != 0) {
/**
* Initial layout assumes that the insets is on the right,
* {@link DeviceProfile#getWorkspacePadding()}. Compensate for the difference.
*/
setPadding(getPaddingLeft() + extraLeftPadding, getPaddingTop(),
getPaddingRight() - extraLeftPadding, getPaddingBottom());
}
CellLayout customScreen = getScreenWithId(CUSTOM_CONTENT_SCREEN_ID);
if (customScreen != null) {
@@ -550,8 +559,9 @@ public class Workspace extends PagedView
// Add the first page
CellLayout firstPage = insertNewWorkspaceScreen(Workspace.FIRST_SCREEN_ID, 0);
if (!mIsRtl || !mLauncher.getDeviceProfile().isVerticalBarLayout()) {
// Let the cell layout extend the start padding.
if (!mLauncher.getDeviceProfile().isVerticalBarLayout()) {
// Let the cell layout extend the start padding. On transposed layout, there is page
// indicator on left and hotseat on right, as such workspace does not touch the edge.
((LayoutParams) firstPage.getLayoutParams()).matchStartEdge = true;
firstPage.setPaddingRelative(getPaddingStart(), 0, 0, 0);
}
@@ -3087,7 +3097,11 @@ public class Workspace extends PagedView
mTempXY[0] = x;
mTempXY[1] = y;
mLauncher.getDragLayer().getDescendantCoordRelativeToSelf(this, mTempXY, true);
return mLauncher.getDeviceProfile().isInHotseatRect(mTempXY[0], mTempXY[1]);
View hotseat = mLauncher.getHotseat();
return mTempXY[0] >= hotseat.getLeft() &&
mTempXY[0] <= hotseat.getRight() &&
mTempXY[1] >= hotseat.getTop() &&
mTempXY[1] <= hotseat.getBottom();
}
void mapPointFromSelfToHotseatLayout(Hotseat hotseat, float[] xy) {