diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-06-06 15:39:13 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-06-11 13:51:03 -0700 |
commit | c82c6396e9862220a7227a299d30a73630b3bb94 (patch) | |
tree | 10881edaa2ecdae0756554d659d75e353ae97125 /src | |
parent | 367a53ec13407231513521416392d2cd8144b9dd (diff) | |
download | android_packages_apps_Trebuchet-c82c6396e9862220a7227a299d30a73630b3bb94.tar.gz android_packages_apps_Trebuchet-c82c6396e9862220a7227a299d30a73630b3bb94.tar.bz2 android_packages_apps_Trebuchet-c82c6396e9862220a7227a299d30a73630b3bb94.zip |
Moving clear all button inside the recents view
Bug: 72222505
Bug: 109828536
Change-Id: I843b79db3e47abc2c41ed78f186b9c941941ddef
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 7 | ||||
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 42 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 6 |
3 files changed, 22 insertions, 33 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 3eaead11a..aaeeb634f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -214,8 +214,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, // UI and state for the overview panel private View mOverviewPanel; - private View mOverviewPanelContainer; - @Thunk boolean mWorkspaceLoading = true; private OnResumeCallback mOnResumeCallback; @@ -913,7 +911,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, mWorkspace = mDragLayer.findViewById(R.id.workspace); mWorkspace.initParentViews(mDragLayer); mOverviewPanel = findViewById(R.id.overview_panel); - mOverviewPanelContainer = findViewById(R.id.overview_panel_container); mHotseat = findViewById(R.id.hotseat); mHotseatSearchBox = findViewById(R.id.search_container_hotseat); @@ -1174,10 +1171,6 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, return (T) mOverviewPanel; } - public <T extends View> T getOverviewPanelContainer() { - return (T) mOverviewPanelContainer; - } - public DropTargetBar getDropTargetBar() { return mDropTargetBar; } diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index de9cd986f..db5dc6635 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -24,7 +24,6 @@ import android.animation.TimeInterpolator; import android.annotation.SuppressLint; import android.content.Context; import android.content.res.TypedArray; -import android.graphics.Matrix; import android.graphics.Rect; import android.os.Bundle; import android.provider.Settings; @@ -142,8 +141,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou protected T mPageIndicator; // Convenience/caching - private static final Matrix sTmpInvMatrix = new Matrix(); - private static final float[] sTmpPoint = new float[2]; private static final Rect sTmpRect = new Rect(); protected final Rect mInsets = new Rect(); @@ -242,12 +239,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou return index; } - protected void scrollAndForceFinish(int scrollX) { - scrollTo(scrollX, 0); - mScroller.setFinalX(scrollX); - forceFinishScroller(true); - } - /** * Updates the scroll of the current page immediately to its final scroll position. We use this * in CustomizePagedView to allow tabs to share the same PagedView while resetting the scroll of @@ -259,7 +250,9 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou if (0 <= mCurrentPage && mCurrentPage < getPageCount()) { newX = getScrollForPage(mCurrentPage); } - scrollAndForceFinish(newX); + scrollTo(newX, 0); + mScroller.setFinalX(newX); + forceFinishScroller(true); } private void abortScrollerAnimation(boolean resetNextPage) { @@ -544,10 +537,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou setMeasuredDimension(widthSize, heightSize); } - protected void restoreScrollOnLayout() { - setCurrentPage(getNextPage()); - } - @SuppressLint("DrawAllocation") @Override protected void onLayout(boolean changed, int left, int top, int right, int bottom) { @@ -599,7 +588,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou } if (mScroller.isFinished() && pageScrollChanged) { - restoreScrollOnLayout(); + setCurrentPage(getNextPage()); } } @@ -620,23 +609,26 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou - mInsets.bottom - getPaddingBottom()) / 2; final int scrollOffsetLeft = mInsets.left + getPaddingLeft(); + final int scrollOffsetRight = getWidth() - getPaddingRight() - mInsets.right; boolean pageScrollChanged = false; - for (int i = startIndex, childLeft = scrollOffsetLeft + offsetForPageScrolls(); - i != endIndex; - i += delta) { + for (int i = startIndex, childLeft = scrollOffsetLeft; i != endIndex; i += delta) { final View child = getPageAt(i); if (scrollLogic.shouldIncludeView(child)) { - final int childTop = verticalCenter - child.getMeasuredHeight() / 2; final int childWidth = child.getMeasuredWidth(); + final int childRight = childLeft + childWidth; if (layoutChildren) { final int childHeight = child.getMeasuredHeight(); - child.layout(childLeft, childTop, - childLeft + child.getMeasuredWidth(), childTop + childHeight); + final int childTop = verticalCenter - childHeight / 2; + child.layout(childLeft, childTop, childRight, childTop + childHeight); } - final int pageScroll = childLeft - scrollOffsetLeft; + // In case the pages are of different width, align the page to left or right edge + // based on the orientation. + final int pageScroll = mIsRtl + ? (childLeft - scrollOffsetLeft) + : Math.max(0, childRight - scrollOffsetRight); if (outPageScrolls[i] != pageScroll) { pageScrollChanged = true; outPageScrolls[i] = pageScroll; @@ -666,10 +658,6 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou } } - protected int offsetForPageScrolls() { - return 0; - } - public void setPageSpacing(int pageSpacing) { mPageSpacing = pageSpacing; requestLayout(); @@ -747,11 +735,13 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou if (direction == View.FOCUS_LEFT) { if (getCurrentPage() > 0) { snapToPage(getCurrentPage() - 1); + getChildAt(getCurrentPage() - 1).requestFocus(direction); return true; } } else if (direction == View.FOCUS_RIGHT) { if (getCurrentPage() < getPageCount() - 1) { snapToPage(getCurrentPage() + 1); + getChildAt(getCurrentPage() + 1).requestFocus(direction); return true; } } diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 72ba418b2..899397861 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -490,6 +490,12 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo }); } + @Override + public void getDrawingRect(Rect outRect) { + super.getDrawingRect(outRect); + outRect.offset(0, (int) getTranslationY()); + } + public class AdapterHolder { public static final int MAIN = 0; public static final int WORK = 1; |