Adding content push button behind flag to OAV.
Tested: TaplTestsNexus:testOverviewActions() Change-Id: I83bc6e5033e2292776c927fba363214f347e01ce
This commit is contained in:
parent
b6dc22c38b
commit
46aba2a46e
|
@ -56,7 +56,7 @@
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
<Space
|
<Space
|
||||||
android:id="@+id/share_space"
|
android:id="@+id/oav_three_button_space"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="1dp"
|
android:layout_height="1dp"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
|
|
|
@ -58,6 +58,12 @@ public class QuickstepTestInformationHandler extends TestInformationHandler {
|
||||||
FeatureFlags.ENABLE_OVERVIEW_SHARE.get());
|
FeatureFlags.ENABLE_OVERVIEW_SHARE.get());
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case TestProtocol.REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED: {
|
||||||
|
response.putBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD,
|
||||||
|
FeatureFlags.ENABLE_OVERVIEW_CONTENT_PUSH.get());
|
||||||
|
return response;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.call(method);
|
return super.call(method);
|
||||||
|
|
|
@ -113,7 +113,7 @@ public class OverviewActionsView<T extends OverlayUICallbacks> extends FrameLayo
|
||||||
findViewById(R.id.action_screenshot).setOnClickListener(this);
|
findViewById(R.id.action_screenshot).setOnClickListener(this);
|
||||||
if (ENABLE_OVERVIEW_SHARE.get()) {
|
if (ENABLE_OVERVIEW_SHARE.get()) {
|
||||||
share.setVisibility(VISIBLE);
|
share.setVisibility(VISIBLE);
|
||||||
findViewById(R.id.share_space).setVisibility(VISIBLE);
|
findViewById(R.id.oav_three_button_space).setVisibility(VISIBLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -149,6 +149,9 @@ public final class FeatureFlags {
|
||||||
public static final BooleanFlag ENABLE_OVERVIEW_SHARE = getDebugFlag(
|
public static final BooleanFlag ENABLE_OVERVIEW_SHARE = getDebugFlag(
|
||||||
"ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
|
"ENABLE_OVERVIEW_SHARE", false, "Show Share button in Overview Actions");
|
||||||
|
|
||||||
|
public static final BooleanFlag ENABLE_OVERVIEW_CONTENT_PUSH = getDebugFlag(
|
||||||
|
"ENABLE_OVERVIEW_CONTENT_PUSH", false, "Show Content Push button in Overview Actions");
|
||||||
|
|
||||||
public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(
|
public static final BooleanFlag ENABLE_DATABASE_RESTORE = getDebugFlag(
|
||||||
"ENABLE_DATABASE_RESTORE", true,
|
"ENABLE_DATABASE_RESTORE", true,
|
||||||
"Enable database restore when new restore session is created");
|
"Enable database restore when new restore session is created");
|
||||||
|
|
|
@ -96,6 +96,8 @@ public final class TestProtocol {
|
||||||
public static final String REQUEST_DISABLE_DEBUG_TRACING = "disable-debug-tracing";
|
public static final String REQUEST_DISABLE_DEBUG_TRACING = "disable-debug-tracing";
|
||||||
|
|
||||||
public static final String REQUEST_OVERVIEW_SHARE_ENABLED = "overview-share-enabled";
|
public static final String REQUEST_OVERVIEW_SHARE_ENABLED = "overview-share-enabled";
|
||||||
|
public static final String REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED =
|
||||||
|
"overview-content-push-enabled";
|
||||||
|
|
||||||
public static boolean sDisableSensorRotation;
|
public static boolean sDisableSensorRotation;
|
||||||
public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
|
public static final String REQUEST_MOCK_SENSOR_ROTATION = "mock-sensor-rotation";
|
||||||
|
|
|
@ -1313,6 +1313,11 @@ public final class LauncherInstrumentation {
|
||||||
TestProtocol.TEST_INFO_RESPONSE_FIELD);
|
TestProtocol.TEST_INFO_RESPONSE_FIELD);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean overviewContentPushEnabled() {
|
||||||
|
return getTestInfo(TestProtocol.REQUEST_OVERVIEW_CONTENT_PUSH_ENABLED).getBoolean(
|
||||||
|
TestProtocol.TEST_INFO_RESPONSE_FIELD);
|
||||||
|
}
|
||||||
|
|
||||||
private void disableSensorRotation() {
|
private void disableSensorRotation() {
|
||||||
getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION);
|
getTestInfo(TestProtocol.REQUEST_MOCK_SENSOR_ROTATION);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,27 @@ public class OverviewActions {
|
||||||
this.mLauncher = launcherInstrumentation;
|
this.mLauncher = launcherInstrumentation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clicks content push button.
|
||||||
|
*/
|
||||||
|
@NonNull
|
||||||
|
public Overview clickAndDismissContentPush() {
|
||||||
|
if (mLauncher.overviewContentPushEnabled()) {
|
||||||
|
try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
|
||||||
|
LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
|
||||||
|
"want to click content push button and exit screenshot ui")) {
|
||||||
|
UiObject2 exo = mLauncher.waitForObjectInContainer(mOverviewActions,
|
||||||
|
"action_content_push");
|
||||||
|
mLauncher.clickLauncherObject(exo);
|
||||||
|
try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
|
||||||
|
"clicked content push button")) {
|
||||||
|
return new Overview(mLauncher);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return new Overview(mLauncher);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clicks screenshot button and closes screenshot ui.
|
* Clicks screenshot button and closes screenshot ui.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue