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

WIP: Add moveToCustomContentScreen method

Browse Source 
To allow as to move to the -1 screen from GEL. Also added a
showWorkspace method to handle intents when we are in All Apps.

Related GEL CL at ag/357408

Change-Id: I0a4d03df2bf035d342b74f6c3c9b3fe9105f1c59
This commit is contained in:
Allan Wojciechowski
2013-09-12 10:48:23 +01:00
committed by Sandeep Siddhartha
parent d6214a7a63
commit af110e8603
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1333,7 +1333,7 @@ public class Workspace extends SmoothPagedView
}
private void updateStateForCustomContent(int screenCenter) {
if (hasCustomContent() && !isSmall() && !isSwitchingState()) {
if (hasCustomContent()) {
int index = mScreenOrder.indexOf(CUSTOM_CONTENT_SCREEN_ID);
int scrollDelta = getScrollForPage(index + 1) - getScrollX();
float translationX = Math.max(scrollDelta, 0);
@@ -4127,20 +4127,39 @@ public class Workspace extends SmoothPagedView
}
}
void moveToDefaultScreen(boolean animate) {
private void moveToScreen(int page, boolean animate) {
if (!isSmall()) {
if (animate) {
snapToPage(mDefaultPage);
snapToPage(page);
} else {
setCurrentPage(mDefaultPage);
setCurrentPage(page);
}
}
View child = getChildAt(mDefaultPage);
View child = getChildAt(page);
if (child != null) {
child.requestFocus();
}
}
void moveToDefaultScreen(boolean animate) {
moveToScreen(mDefaultPage, animate);
}
void moveToCustomContentScreen(boolean animate) {
if (hasCustomContent()) {
int ccIndex = getPageIndexForScreenId(CUSTOM_CONTENT_SCREEN_ID);
if (animate) {
snapToPage(ccIndex);
} else {
setCurrentPage(ccIndex);
}
View child = getChildAt(ccIndex);
if (child != null) {
child.requestFocus();
}
}
}
@Override
protected int getPageIndicatorMarker(int pageIndex) {
if (getScreenIdForPageIndex(pageIndex) == CUSTOM_CONTENT_SCREEN_ID) {