mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 02:38:20 +00:00
Merge "Add TAPL APIs for search web suggestions." into udc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
90e2a4d2d7
@@ -345,6 +345,15 @@
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity-alias android:name="WebSearchActivity"
|
||||
android:label="WebSearchActivity"
|
||||
android:exported="true"
|
||||
android:targetActivity="com.android.launcher3.testcomponent.BaseTestingActivity">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.WEB_SEARCH" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
</intent-filter>
|
||||
</activity-alias>
|
||||
|
||||
<!-- [b/197780098] Disable eager initialization of Jetpack libraries. -->
|
||||
<provider
|
||||
|
||||
@@ -59,21 +59,23 @@ public class SearchResultFromQsb {
|
||||
}
|
||||
|
||||
/** Find the web suggestion from search suggestion's title text */
|
||||
public void verifyWebSuggestIsPresent(String text) {
|
||||
ArrayList<UiObject2> goldenGateResults =
|
||||
public SearchWebSuggestion findWebSuggestion(String text) {
|
||||
ArrayList<UiObject2> webSuggestions =
|
||||
new ArrayList<>(mLauncher.waitForObjectsInContainer(
|
||||
mLauncher.waitForSystemLauncherObject(SEARCH_CONTAINER_RES_ID),
|
||||
By.clazz(TextView.class)));
|
||||
boolean found = false;
|
||||
for(UiObject2 uiObject: goldenGateResults) {
|
||||
for (UiObject2 uiObject: webSuggestions) {
|
||||
String currentString = uiObject.getText();
|
||||
if (currentString.equals(text)) {
|
||||
found = true;
|
||||
return createWebSuggestion(uiObject);
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
throw new IllegalStateException("Web suggestion title: " + text + " not found");
|
||||
}
|
||||
mLauncher.fail("Web suggestion title: " + text + " not found");
|
||||
return null;
|
||||
}
|
||||
|
||||
protected SearchWebSuggestion createWebSuggestion(UiObject2 webSuggestion) {
|
||||
return new SearchWebSuggestion(mLauncher, webSuggestion);
|
||||
}
|
||||
|
||||
/** Find the total amount of views being displayed and return the size */
|
||||
|
||||
@@ -35,4 +35,14 @@ public class SearchResultFromTaskbarQsb extends SearchResultFromQsb {
|
||||
protected TaskbarAppIcon createAppIcon(UiObject2 icon) {
|
||||
return new TaskbarAppIcon(mLauncher, icon);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TaskbarSearchWebSuggestion findWebSuggestion(String text) {
|
||||
return (TaskbarSearchWebSuggestion) super.findWebSuggestion(text);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected TaskbarSearchWebSuggestion createWebSuggestion(UiObject2 webSuggestion) {
|
||||
return new TaskbarSearchWebSuggestion(mLauncher, webSuggestion);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.tapl;
|
||||
|
||||
import androidx.test.uiautomator.UiObject2;
|
||||
|
||||
import com.android.launcher3.testing.shared.TestProtocol;
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* Operations on a search web suggestion from a qsb.
|
||||
*/
|
||||
public class SearchWebSuggestion extends Launchable {
|
||||
|
||||
private static final Pattern LONG_CLICK_EVENT = Pattern.compile("onAllAppsItemLongClick");
|
||||
|
||||
SearchWebSuggestion(LauncherInstrumentation launcher, UiObject2 object) {
|
||||
super(launcher, object);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void expectActivityStartEvents() {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String launchableType() {
|
||||
return "search web suggestion";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void waitForLongPressConfirmation() {
|
||||
mLauncher.waitForLauncherObject("popup_container");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addExpectedEventsForLongClick() {
|
||||
mLauncher.expectEvent(TestProtocol.SEQUENCE_MAIN, getLongClickEvent());
|
||||
}
|
||||
|
||||
protected Pattern getLongClickEvent() {
|
||||
return LONG_CLICK_EVENT;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.tapl;
|
||||
|
||||
import androidx.test.uiautomator.UiObject2;
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* Operations on a search web suggestion from the Taskbar qsb.
|
||||
*/
|
||||
public class TaskbarSearchWebSuggestion extends SearchWebSuggestion implements
|
||||
SplitscreenDragSource {
|
||||
|
||||
private static final Pattern LONG_CLICK_EVENT = Pattern.compile("onTaskbarItemLongClick");
|
||||
|
||||
TaskbarSearchWebSuggestion(LauncherInstrumentation launcher,
|
||||
UiObject2 object) {
|
||||
super(launcher, object);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Pattern getLongClickEvent() {
|
||||
return LONG_CLICK_EVENT;
|
||||
}
|
||||
|
||||
/** This method requires public access, however should not be called in tests. */
|
||||
@Override
|
||||
public Launchable getLaunchable() {
|
||||
return this;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user