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

Merge "Enable Floating Search by default and update tests accordingly."

Browse Source
This commit is contained in:
Andy Wickham
2023-02-03 10:27:38 +00:00
committed by Android (Google) Code Review
parent f98fc1d099 952400d2f2
commit 89638d2252
8 changed files with 69 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+13 -6
View File
@@ -473,7 +473,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
}
setupHeader();
if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get()) {
if (isBottomSearchBar()) {
// Keep the scroller above the search bar.
RelativeLayout.LayoutParams scrollerLayoutParams =
(LayoutParams) findViewById(R.id.fast_scroller).getLayoutParams();
@@ -519,7 +519,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
removeCustomRules(getSearchRecyclerView());
if (!isSearchSupported()) {
layoutWithoutSearchContainer(rvContainer, showTabs);
} else if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get()) {
} else if (isBottomSearchBar()) {
alignParentTop(rvContainer, showTabs);
alignParentTop(getSearchRecyclerView(), /* tabs= */ false);
layoutAboveSearchContainer(rvContainer);
@@ -554,7 +554,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
removeCustomRules(mHeader);
if (!isSearchSupported()) {
layoutWithoutSearchContainer(mHeader, false /* includeTabsMargin */);
} else if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get()) {
} else if (isBottomSearchBar()) {
alignParentTop(mHeader, false /* includeTabsMargin */);
} else {
layoutBelowSearchContainer(mHeader, false /* includeTabsMargin */);
@@ -593,6 +593,13 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
(int) (mSearchContainer.getAlpha() * 255));
}
/** @return true if the search bar is at the bottom of the container (as opposed to the top). */
private boolean isBottomSearchBar() {
return FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get()
&& ((RelativeLayout.LayoutParams) mSearchContainer.getLayoutParams()).getRule(
ALIGN_PARENT_BOTTOM) == RelativeLayout.TRUE;
}
private void layoutBelowSearchContainer(View v, boolean includeTabsMargin) {
if (!(v.getLayoutParams() instanceof RelativeLayout.LayoutParams)) {
return;
@@ -891,7 +898,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
setPadding(grid.workspacePadding.left, 0, grid.workspacePadding.right, 0);
} else {
int topPadding = grid.allAppsTopPadding;
if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get() && !grid.isTablet) {
if (isBottomSearchBar() && !grid.isTablet) {
topPadding += getResources().getDimensionPixelSize(
R.dimen.all_apps_additional_top_padding_floating_search);
}
@@ -1092,7 +1099,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
FloatingHeaderView headerView = getFloatingHeaderView();
if (isTablet) {
// Start adding header protection if search bar or tabs will attach to the top.
if (!FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get() || mUsingTabs) {
if (!isBottomSearchBar() || mUsingTabs) {
View panel = (View) mBottomSheetBackground;
float translationY = ((View) panel.getParent()).getTranslationY();
mTmpRectF.set(panel.getLeft(), panel.getTop() + translationY, panel.getRight(),
@@ -1134,7 +1141,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
/** Returns the position of the bottom edge of the header */
public int getHeaderBottom() {
int bottom = (int) getTranslationY() + mHeader.getClipTop();
if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get()) {
if (isBottomSearchBar()) {
if (mActivityContext.getDeviceProfile().isTablet) {
return bottom + mBottomSheetBackground.getTop();
}
src/com/android/launcher3/config/FeatureFlags.java
+1 -1
View File
@@ -86,7 +86,7 @@ public final class FeatureFlags {
"ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");
public static final BooleanFlag ENABLE_FLOATING_SEARCH_BAR =
getDebugFlag("ENABLE_FLOATING_SEARCH_BAR", false,
new DeviceFlag("ENABLE_FLOATING_SEARCH_BAR", true,
"Keep All Apps search bar at the bottom (but above keyboard if open)");
public static final BooleanFlag ENABLE_HIDE_HEADER = new DeviceFlag("ENABLE_HIDE_HEADER",
src/com/android/launcher3/testing/TestInformationHandler.java
+7
View File
@@ -232,6 +232,13 @@ public class TestInformationHandler implements ResourceBasedOverride {
l -> l.getAppsView().getActiveRecyclerView().getClipBounds().top);
}
case TestProtocol.REQUEST_ALL_APPS_BOTTOM_PADDING: {
return getLauncherUIProperty(Bundle::putInt,
l -> l.getAppsView().getBottom()
- l.getAppsView().getActiveRecyclerView().getBottom()
+ l.getAppsView().getActiveRecyclerView().getPaddingBottom());
}
default:
return null;
}
src/com/android/launcher3/testing/shared/TestProtocol.java
+1
View File
@@ -120,6 +120,7 @@ public final class TestProtocol {
public static final String REQUEST_TASKBAR_ALL_APPS_TOP_PADDING =
"taskbar-all-apps-top-padding";
public static final String REQUEST_ALL_APPS_TOP_PADDING = "all-apps-top-padding";
public static final String REQUEST_ALL_APPS_BOTTOM_PADDING = "all-apps-bottom-padding";
public static final String REQUEST_WORKSPACE_CELL_LAYOUT_SIZE = "workspace-cell-layout-size";
public static final String REQUEST_WORKSPACE_CELL_CENTER = "workspace-cell-center";
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+3 -4
View File
@@ -170,9 +170,9 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
flingBackwardY < flingForwardY));
// Test scrolling down to YouTube.
assertNotNull("All apps: can't fine YouTube", allApps.getAppIcon("YouTube"));
assertNotNull("All apps: can't find YouTube", allApps.getAppIcon("YouTube"));
// Test scrolling up to Camera.
assertNotNull("All apps: can't fine Camera", allApps.getAppIcon("Camera"));
assertNotNull("All apps: can't find Camera", allApps.getAppIcon("Camera"));
// Test failing to find a non-existing app.
final AllApps allAppsFinal = allApps;
expectFail("All apps: could find a non-existing app",
@@ -264,8 +264,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
assertNotNull("AppIcon.launch returned null", app.launch(getAppPackageName()));
test.executeOnLauncher(launcher -> assertTrue(
"Launcher activity is the top activity; expecting another activity to be the "
+ "top "
+ "one",
+ "top one",
test.isInLaunchedApp(launcher)));
} finally {
allApps.unfreeze();
tests/tapl/com/android/launcher3/tapl/AllApps.java
+29 -14
View File
@@ -34,6 +34,9 @@ import androidx.test.uiautomator.UiObject2;
import com.android.launcher3.testing.shared.TestProtocol;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
/**
@@ -102,10 +105,10 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
iconCenter.x, iconCenter.y);
}
private boolean iconCenterInRecyclerTopPadding(UiObject2 appListRecycler, UiObject2 icon) {
private boolean iconCenterInRecyclerTopPadding(UiObject2 appsListRecycler, UiObject2 icon) {
final Point iconCenter = icon.getVisibleCenter();
return iconCenter.y <= mLauncher.getVisibleBounds(appListRecycler).top
return iconCenter.y <= mLauncher.getVisibleBounds(appsListRecycler).top
+ getAppsListRecyclerTopPadding();
}
@@ -137,15 +140,11 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
bottomGestureStartOnScreen)) {
mLauncher.scrollToLastVisibleRow(
allAppsContainer,
mLauncher.getObjectsInContainer(allAppsContainer, "icon")
.stream()
.filter(icon ->
mLauncher.getVisibleBounds(icon).top
< bottomGestureStartOnScreen)
.collect(Collectors.toList()),
getVisibleIcons(allAppsContainer),
mLauncher.getVisibleBounds(appListRecycler).top
+ getAppsListRecyclerTopPadding()
- mLauncher.getVisibleBounds(allAppsContainer).top);
- mLauncher.getVisibleBounds(allAppsContainer).top,
getAppsListRecyclerBottomPadding());
verifyActiveContainer();
final int newScroll = getAllAppsScroll();
mLauncher.assertTrue(
@@ -175,6 +174,16 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
}
}
@NonNull
private List<UiObject2> getVisibleIcons(UiObject2 allAppsContainer) {
return mLauncher.getObjectsInContainer(allAppsContainer, "icon")
.stream()
.filter(icon ->
mLauncher.getVisibleBounds(icon).top
< mLauncher.getBottomGestureStartOnScreen())
.collect(Collectors.toList());
}
/**
* Finds an icon. Fails if the icon doesn't exist. Scrolls the app list when needed to make
* sure the icon is visible.
@@ -196,20 +205,26 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
protected abstract int getAppsListRecyclerTopPadding();
protected int getAppsListRecyclerBottomPadding() {
return mLauncher.getTestInfo(TestProtocol.REQUEST_ALL_APPS_BOTTOM_PADDING)
.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
}
private void scrollBackToBeginning() {
try (LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
"want to scroll back in all apps")) {
LauncherInstrumentation.log("Scrolling to the beginning");
final UiObject2 allAppsContainer = verifyActiveContainer();
final UiObject2 appListRecycler = getAppListRecycler(allAppsContainer);
final UiObject2 highestItem = Collections.min(getVisibleIcons(allAppsContainer),
Comparator.comparingInt(i -> mLauncher.getVisibleBounds(i).top));
int attempts = 0;
final Rect margins = new Rect(
/* left= */ 0,
mLauncher.getVisibleBounds(appListRecycler).top
+ getAppsListRecyclerTopPadding() + 1,
mLauncher.getVisibleBounds(highestItem).bottom,
/* right= */ 0,
/* bottom= */ 5);
/* bottom= */ getAppsListRecyclerBottomPadding());
for (int scroll = getAllAppsScroll();
scroll != 0;
@@ -240,7 +255,7 @@ public abstract class AllApps extends LauncherInstrumentation.VisibleContainer {
.getInt(TestProtocol.TEST_INFO_RESPONSE_FIELD);
}
private UiObject2 getAppListRecycler(UiObject2 allAppsContainer) {
protected UiObject2 getAppListRecycler(UiObject2 allAppsContainer) {
return mLauncher.waitForObjectInContainer(allAppsContainer, "apps_list_view");
}
tests/tapl/com/android/launcher3/tapl/HomeAllApps.java
+4 -8
View File
@@ -17,15 +17,11 @@ package com.android.launcher3.tapl;
import static com.android.launcher3.testing.shared.TestProtocol.NORMAL_STATE_ORDINAL;
import android.graphics.Rect;
import androidx.annotation.NonNull;
import androidx.test.uiautomator.UiObject2;
import com.android.launcher3.testing.shared.TestProtocol;
import java.util.Objects;
public class HomeAllApps extends AllApps {
private static final String BOTTOM_SHEET_RES_ID = "bottom_sheet_background";
@@ -45,10 +41,10 @@ public class HomeAllApps extends AllApps {
mLauncher.addContextLayer("want to switch from all apps to workspace")) {
UiObject2 allAppsContainer = verifyActiveContainer();
final Rect searchBoxBounds = Objects.requireNonNull(
mLauncher.getVisibleBounds(getSearchBox(allAppsContainer)));
final int startX = searchBoxBounds.centerX();
final int startY = searchBoxBounds.bottom;
final int startX = allAppsContainer.getVisibleCenter().x;
final int startY = mLauncher.getVisibleBounds(getAppListRecycler(allAppsContainer)).top
+ getAppsListRecyclerTopPadding()
- mLauncher.getVisibleBounds(allAppsContainer).top + 1;
final int endY = mLauncher.getDevice().getDisplayHeight();
LauncherInstrumentation.log(
"switchToWorkspace: startY = " + startY + ", endY = " + endY
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+11 -5
View File
@@ -78,6 +78,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Deque;
import java.util.LinkedList;
import java.util.List;
@@ -1490,19 +1491,24 @@ public final class LauncherInstrumentation {
}
void scrollToLastVisibleRow(
UiObject2 container, Collection<UiObject2> items, int topPaddingInContainer) {
final UiObject2 lowestItem = Collections.max(items, (i1, i2) ->
Integer.compare(getVisibleBounds(i1).top, getVisibleBounds(i2).top));
UiObject2 container, Collection<UiObject2> items, int topPaddingInContainer,
int appsListBottomPadding) {
final UiObject2 lowestItem = Collections.max(items,
Comparator.comparingInt(i -> getVisibleBounds(i).top));
final int itemRowCurrentTopOnScreen = getVisibleBounds(lowestItem).top;
final Rect containerRect = getVisibleBounds(container);
final int itemRowNewTopOnScreen = containerRect.top + topPaddingInContainer;
final int distance = itemRowCurrentTopOnScreen - itemRowNewTopOnScreen + getTouchSlop();
scrollDownByDistance(container, distance);
scrollDownByDistance(container, distance, appsListBottomPadding);
}
void scrollDownByDistance(UiObject2 container, int distance) {
scrollDownByDistance(container, distance, 0);
}
void scrollDownByDistance(UiObject2 container, int distance, int bottomPadding) {
final Rect containerRect = getVisibleBounds(container);
final int bottomGestureMarginInContainer = getBottomGestureMarginInContainer(container);
scroll(
@@ -1512,7 +1518,7 @@ public final class LauncherInstrumentation {
0,
containerRect.height() - distance - bottomGestureMarginInContainer,
0,
bottomGestureMarginInContainer),
bottomGestureMarginInContainer + bottomPadding),
/* steps= */ 10,
/* slowDown= */ true);
}