This way the search bar looks more connected to the keyboard without the scrollbar showing next to it. Note: Here the search bar is added on top of all other views (previously it was inserted above only the header), and the protection is always added just behind the search bar. Also adjusts the height of the scrollbar to end above the search bar when floating search bar is enabled. Screenshots: Scrollbar behind search bar: https://drive.google.com/file/d/10ZJ-q5nA9ZBjr7gjoauTDDAbQRUNk7S7/view?usp=share_link&resourcekey=0-pF6eOcuKz2_sCA_eZpa1Sw New scrollbar height with floating search: https://drive.google.com/file/d/1fVIJjiG7RMme5fBXiSJmxNfOhHJ__Gwj/view?usp=share_link&resourcekey=0-b9RsB7f55U_rIZBu4IhVGQ Fix: 265478433 Test: With and without floating search and always-on keyboard and work profile. Change-Id: I4f7ae0d376dae215c0cbd8deaee3e4a409d21ae4
323 lines
13 KiB
Java
323 lines
13 KiB
Java
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.allapps;
|
|
|
|
import static com.android.launcher3.logger.LauncherAtom.ContainerInfo;
|
|
import static com.android.launcher3.logger.LauncherAtom.SearchResultContainer;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_PERSONAL_SCROLLED_DOWN;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_PERSONAL_SCROLLED_UP;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SCROLLED_UNKNOWN_DIRECTION;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SEARCH_SCROLLED_DOWN;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_SEARCH_SCROLLED_UP;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_FAB_BUTTON_COLLAPSE;
|
|
import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_WORK_FAB_BUTTON_EXTEND;
|
|
import static com.android.launcher3.util.LogConfig.SEARCH_LOGGING;
|
|
|
|
import android.content.Context;
|
|
import android.graphics.Canvas;
|
|
import android.util.AttributeSet;
|
|
import android.util.Log;
|
|
|
|
import androidx.recyclerview.widget.RecyclerView;
|
|
|
|
import com.android.launcher3.DeviceProfile;
|
|
import com.android.launcher3.ExtendedEditText;
|
|
import com.android.launcher3.FastScrollRecyclerView;
|
|
import com.android.launcher3.LauncherAppState;
|
|
import com.android.launcher3.R;
|
|
import com.android.launcher3.Utilities;
|
|
import com.android.launcher3.logging.StatsLogManager;
|
|
import com.android.launcher3.views.ActivityContext;
|
|
import com.android.launcher3.views.RecyclerViewFastScroller;
|
|
|
|
import java.util.List;
|
|
|
|
/**
|
|
* A RecyclerView with custom fast scroll support for the all apps view.
|
|
*/
|
|
public class AllAppsRecyclerView extends FastScrollRecyclerView {
|
|
protected static final String TAG = "AllAppsRecyclerView";
|
|
private static final boolean DEBUG = false;
|
|
private static final boolean DEBUG_LATENCY = Utilities.isPropertyEnabled(SEARCH_LOGGING);
|
|
|
|
protected final int mNumAppsPerRow;
|
|
private final AllAppsFastScrollHelper mFastScrollHelper;
|
|
private int mCumulativeVerticalScroll;
|
|
|
|
protected AlphabeticalAppsList<?> mApps;
|
|
|
|
public AllAppsRecyclerView(Context context) {
|
|
this(context, null);
|
|
}
|
|
|
|
public AllAppsRecyclerView(Context context, AttributeSet attrs) {
|
|
this(context, attrs, 0);
|
|
}
|
|
|
|
public AllAppsRecyclerView(Context context, AttributeSet attrs, int defStyleAttr) {
|
|
this(context, attrs, defStyleAttr, 0);
|
|
}
|
|
|
|
public AllAppsRecyclerView(Context context, AttributeSet attrs, int defStyleAttr,
|
|
int defStyleRes) {
|
|
super(context, attrs, defStyleAttr);
|
|
mNumAppsPerRow = LauncherAppState.getIDP(context).numColumns;
|
|
mFastScrollHelper = new AllAppsFastScrollHelper(this);
|
|
}
|
|
|
|
/**
|
|
* Sets the list of apps in this view, used to determine the fastscroll position.
|
|
*/
|
|
public void setApps(AlphabeticalAppsList<?> apps) {
|
|
mApps = apps;
|
|
}
|
|
|
|
public AlphabeticalAppsList<?> getApps() {
|
|
return mApps;
|
|
}
|
|
|
|
protected void updatePoolSize() {
|
|
DeviceProfile grid = ActivityContext.lookupContext(getContext()).getDeviceProfile();
|
|
RecyclerView.RecycledViewPool pool = getRecycledViewPool();
|
|
int approxRows = (int) Math.ceil(grid.availableHeightPx / grid.allAppsIconSizePx);
|
|
pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_EMPTY_SEARCH, 1);
|
|
pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ALL_APPS_DIVIDER, 1);
|
|
pool.setMaxRecycledViews(AllAppsGridAdapter.VIEW_TYPE_ICON, approxRows
|
|
* (mNumAppsPerRow + 1));
|
|
}
|
|
|
|
@Override
|
|
public void onDraw(Canvas c) {
|
|
if (DEBUG) {
|
|
Log.d(TAG, "onDraw at = " + System.currentTimeMillis());
|
|
}
|
|
if (DEBUG_LATENCY) {
|
|
Log.d(SEARCH_LOGGING, getClass().getSimpleName() + " onDraw; time stamp = "
|
|
+ System.currentTimeMillis());
|
|
}
|
|
super.onDraw(c);
|
|
}
|
|
|
|
@Override
|
|
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
|
|
updatePoolSize();
|
|
}
|
|
|
|
public void onSearchResultsChanged() {
|
|
// Always scroll the view to the top so the user can see the changed results
|
|
scrollToTop();
|
|
}
|
|
|
|
@Override
|
|
public void onScrollStateChanged(int state) {
|
|
super.onScrollStateChanged(state);
|
|
|
|
StatsLogManager mgr = ActivityContext.lookupContext(getContext()).getStatsLogManager();
|
|
switch (state) {
|
|
case SCROLL_STATE_DRAGGING:
|
|
mCumulativeVerticalScroll = 0;
|
|
requestFocus();
|
|
mgr.logger().sendToInteractionJankMonitor(
|
|
LAUNCHER_ALLAPPS_VERTICAL_SWIPE_BEGIN, this);
|
|
ActivityContext.lookupContext(getContext()).hideKeyboard();
|
|
break;
|
|
case SCROLL_STATE_IDLE:
|
|
mgr.logger().sendToInteractionJankMonitor(
|
|
LAUNCHER_ALLAPPS_VERTICAL_SWIPE_END, this);
|
|
logCumulativeVerticalScroll();
|
|
break;
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onScrolled(int dx, int dy) {
|
|
super.onScrolled(dx, dy);
|
|
mCumulativeVerticalScroll += dy;
|
|
}
|
|
|
|
/**
|
|
* Maps the touch (from 0..1) to the adapter position that should be visible.
|
|
*/
|
|
@Override
|
|
public String scrollToPositionAtProgress(float touchFraction) {
|
|
int rowCount = mApps.getNumAppRows();
|
|
if (rowCount == 0) {
|
|
return "";
|
|
}
|
|
|
|
// Find the fastscroll section that maps to this touch fraction
|
|
List<AlphabeticalAppsList.FastScrollSectionInfo> fastScrollSections =
|
|
mApps.getFastScrollerSections();
|
|
int count = fastScrollSections.size();
|
|
if (count == 0) {
|
|
return "";
|
|
}
|
|
int index = Utilities.boundToRange((int) (touchFraction * count), 0, count - 1);
|
|
AlphabeticalAppsList.FastScrollSectionInfo section = fastScrollSections.get(index);
|
|
mFastScrollHelper.smoothScrollToSection(section);
|
|
return section.sectionName;
|
|
}
|
|
|
|
@Override
|
|
public void onFastScrollCompleted() {
|
|
super.onFastScrollCompleted();
|
|
mFastScrollHelper.onFastScrollCompleted();
|
|
}
|
|
|
|
@Override
|
|
protected boolean isPaddingOffsetRequired() {
|
|
return true;
|
|
}
|
|
|
|
@Override
|
|
protected int getTopPaddingOffset() {
|
|
return -getPaddingTop();
|
|
}
|
|
|
|
/**
|
|
* Updates the bounds for the scrollbar.
|
|
*/
|
|
@Override
|
|
public void onUpdateScrollbar(int dy) {
|
|
if (mApps == null) {
|
|
return;
|
|
}
|
|
List<AllAppsGridAdapter.AdapterItem> items = mApps.getAdapterItems();
|
|
|
|
// Skip early if there are no items or we haven't been measured
|
|
if (items.isEmpty() || mNumAppsPerRow == 0 || getChildCount() == 0) {
|
|
mScrollbar.setThumbOffsetY(-1);
|
|
return;
|
|
}
|
|
|
|
// Skip early if, there no child laid out in the container.
|
|
int scrollY = computeVerticalScrollOffset();
|
|
if (scrollY < 0) {
|
|
mScrollbar.setThumbOffsetY(-1);
|
|
return;
|
|
}
|
|
|
|
// Only show the scrollbar if there is height to be scrolled
|
|
int availableScrollBarHeight = getAvailableScrollBarHeight();
|
|
int availableScrollHeight = getAvailableScrollHeight();
|
|
if (availableScrollHeight <= 0) {
|
|
mScrollbar.setThumbOffsetY(-1);
|
|
return;
|
|
}
|
|
|
|
if (mScrollbar.isThumbDetached()) {
|
|
if (!mScrollbar.isDraggingThumb()) {
|
|
// Calculate the current scroll position, the scrollY of the recycler view accounts
|
|
// for the view padding, while the scrollBarY is drawn right up to the background
|
|
// padding (ignoring padding)
|
|
int scrollBarY = (int)
|
|
(((float) scrollY / availableScrollHeight) * availableScrollBarHeight);
|
|
|
|
int thumbScrollY = mScrollbar.getThumbOffsetY();
|
|
int diffScrollY = scrollBarY - thumbScrollY;
|
|
if (diffScrollY * dy > 0f) {
|
|
// User is scrolling in the same direction the thumb needs to catch up to the
|
|
// current scroll position. We do this by mapping the difference in movement
|
|
// from the original scroll bar position to the difference in movement necessary
|
|
// in the detached thumb position to ensure that both speed towards the same
|
|
// position at either end of the list.
|
|
if (dy < 0) {
|
|
int offset = (int) ((dy * thumbScrollY) / (float) scrollBarY);
|
|
thumbScrollY += Math.max(offset, diffScrollY);
|
|
} else {
|
|
int offset = (int) ((dy * (availableScrollBarHeight - thumbScrollY)) /
|
|
(float) (availableScrollBarHeight - scrollBarY));
|
|
thumbScrollY += Math.min(offset, diffScrollY);
|
|
}
|
|
thumbScrollY = Math.max(0, Math.min(availableScrollBarHeight, thumbScrollY));
|
|
mScrollbar.setThumbOffsetY(thumbScrollY);
|
|
if (scrollBarY == thumbScrollY) {
|
|
mScrollbar.reattachThumbToScroll();
|
|
}
|
|
} else {
|
|
// User is scrolling in an opposite direction to the direction that the thumb
|
|
// needs to catch up to the scroll position. Do nothing except for updating
|
|
// the scroll bar x to match the thumb width.
|
|
mScrollbar.setThumbOffsetY(thumbScrollY);
|
|
}
|
|
}
|
|
} else {
|
|
synchronizeScrollBarThumbOffsetToViewScroll(scrollY, availableScrollHeight);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public int getScrollBarTop() {
|
|
return ActivityContext.lookupContext(getContext()).getAppsView().isSearchSupported()
|
|
? getResources().getDimensionPixelOffset(R.dimen.all_apps_header_top_padding)
|
|
: 0;
|
|
}
|
|
|
|
@Override
|
|
public int getScrollBarMarginBottom() {
|
|
return getRootWindowInsets() == null ? 0
|
|
: getRootWindowInsets().getSystemWindowInsetBottom();
|
|
}
|
|
|
|
public RecyclerViewFastScroller getScrollbar() {
|
|
return mScrollbar;
|
|
}
|
|
|
|
@Override
|
|
public boolean hasOverlappingRendering() {
|
|
return false;
|
|
}
|
|
|
|
private void logCumulativeVerticalScroll() {
|
|
ActivityContext context = ActivityContext.lookupContext(getContext());
|
|
StatsLogManager mgr = context.getStatsLogManager();
|
|
ActivityAllAppsContainerView<?> appsView = context.getAppsView();
|
|
ExtendedEditText editText = appsView.getSearchUiManager().getEditText();
|
|
ContainerInfo containerInfo = ContainerInfo.newBuilder().setSearchResultContainer(
|
|
SearchResultContainer
|
|
.newBuilder()
|
|
.setQueryLength((editText == null) ? -1 : editText.length())).build();
|
|
if (mCumulativeVerticalScroll == 0) {
|
|
// mCumulativeVerticalScroll == 0 when user comes back to original position, we
|
|
// don't know the direction of scrolling.
|
|
mgr.logger().withContainerInfo(containerInfo).log(
|
|
LAUNCHER_ALLAPPS_SCROLLED_UNKNOWN_DIRECTION);
|
|
return;
|
|
} else if (appsView.isSearching()) {
|
|
// In search results page
|
|
mgr.logger().withContainerInfo(containerInfo).log((mCumulativeVerticalScroll > 0)
|
|
? LAUNCHER_ALLAPPS_SEARCH_SCROLLED_DOWN
|
|
: LAUNCHER_ALLAPPS_SEARCH_SCROLLED_UP);
|
|
return;
|
|
} else if (appsView.mViewPager != null) {
|
|
int currentPage = appsView.mViewPager.getCurrentPage();
|
|
if (currentPage == ActivityAllAppsContainerView.AdapterHolder.WORK) {
|
|
// In work A-Z list
|
|
mgr.logger().withContainerInfo(containerInfo).log((mCumulativeVerticalScroll > 0)
|
|
? LAUNCHER_WORK_FAB_BUTTON_COLLAPSE
|
|
: LAUNCHER_WORK_FAB_BUTTON_EXTEND);
|
|
return;
|
|
}
|
|
}
|
|
// In personal A-Z list
|
|
mgr.logger().withContainerInfo(containerInfo).log((mCumulativeVerticalScroll > 0)
|
|
? LAUNCHER_ALLAPPS_PERSONAL_SCROLLED_DOWN
|
|
: LAUNCHER_ALLAPPS_PERSONAL_SCROLLED_UP);
|
|
}
|
|
}
|