Revert "Open QS with an adb command"
Revert submission 34056353-betterQsOpen
Reason for revert: Droidmonitor created revert due to b/424847724. Will be verifying through ABTD before submission.
Fix: 424847724
Reverted changes: /q/submissionid:34056353-betterQsOpen
Change-Id: I54d761300797f2336fb805c5d01c89487fb121c2
diff --git a/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/NotificationShade.kt b/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/NotificationShade.kt
index 231f568..62a8300 100644
--- a/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/NotificationShade.kt
+++ b/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/NotificationShade.kt
@@ -289,24 +289,8 @@
else NotificationShadeType.NORMAL
}
- /** Opens quick settings. */
- fun openQuickSettings(): QuickSettings {
- try {
- return openQuickSettingsWithShellCommand()
- } catch (e: Exception) {
- return openQuickSettingsWithSwipe()
- }
- }
-
- /** Opens quick settings. */
- fun openQuickSettingsWithShellCommand(): QuickSettings {
- uiDevice.executeShellCommand("cmd statusbar expand-settings")
- waitForObj(sysuiResSelector("quick_settings_panel", displayId))
- return QuickSettings(displayId)
- }
-
/** Opens quick settings via swipe. */
- fun openQuickSettingsWithSwipe(): QuickSettings {
+ fun openQuickSettings(): QuickSettings {
val device = uiDevice
// Swipe in first quarter to avoid desktop windowing app handle interactions.
val swipeXCoordinate = device.getDisplayWidth(displayId) / 4
diff --git a/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/Root.kt b/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/Root.kt
index 527346a..2027b82 100644
--- a/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/Root.kt
+++ b/libraries/systemui-tapl/src/android/platform/systemui_tapl/ui/Root.kt
@@ -34,7 +34,6 @@
import android.platform.uiautomatorhelpers.DeviceHelpers.betterSwipe
import android.platform.uiautomatorhelpers.DeviceHelpers.uiDevice
import android.platform.uiautomatorhelpers.DeviceHelpers.waitForNullableObj
-import android.platform.uiautomatorhelpers.DeviceHelpers.waitForObj
import android.platform.uiautomatorhelpers.FailedEnsureException
import android.view.Display.DEFAULT_DISPLAY
import android.view.InputDevice
@@ -87,7 +86,7 @@
/** Opens the notification shade via two fingers wipe. */
fun openNotificationShadeViaTwoFingersSwipe(): NotificationShade {
assertWithMessage(
- "two finger swipe is only supported on the default display, because it relies on " +
+ "two finger swipe is only supported on the default display, because it relies on " +
"UiObject#performTwoPointerGesture, and UiObject has no concept of displayId " +
"(unlike UiObject2)"
)
@@ -231,7 +230,7 @@
) {
if (assertIsHunState) {
assertWithMessage(
- "HUN state Assertion usage error: Notification: ${identity.title} " +
+ "HUN state Assertion usage error: Notification: ${identity.title} " +
"| You can only assert the HUN State of a notification that has an action " +
"button."
)
@@ -243,13 +242,6 @@
}
}
- /** Opens quick settings. */
- fun openQuickSettings(): QuickSettings {
- uiDevice.executeShellCommand("cmd statusbar expand-settings")
- waitForObj(sysuiResSelector("quick_settings_panel", displayId))
- return QuickSettings(displayId)
- }
-
/** Opens the quick settings via AccessibilityService.GLOBAL_ACTION_QUICK_SETTINGS. */
fun openQuickSettingsViaGlobalAction(): QuickSettings {
val device = uiDevice
