Fix reference to non-existent ids These views don't exist after migration. Fixes: 325325938 Test: atest PlatformScenarioTests Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint DEVELOPMENT Change-Id: Ic4fc2a1f0477e2599eec5e47086e6c8444b04eda
diff --git a/libraries/systemui-helper/src/android/platform/helpers/features/common/HomeLockscreenPage.java b/libraries/systemui-helper/src/android/platform/helpers/features/common/HomeLockscreenPage.java index 88c7aa4..9e3252b 100644 --- a/libraries/systemui-helper/src/android/platform/helpers/features/common/HomeLockscreenPage.java +++ b/libraries/systemui-helper/src/android/platform/helpers/features/common/HomeLockscreenPage.java
@@ -18,6 +18,8 @@ import static android.platform.helpers.ui.UiAutomatorUtils.getUiDevice; +import static com.android.systemui.Flags.migrateClocksToBlueprint; + import static com.google.common.truth.Truth.assertWithMessage; import static java.util.concurrent.TimeUnit.SECONDS; @@ -51,9 +53,18 @@ public static final BySelector SWIPEABLE_AREA = By.res("com.android.systemui:id/notification_panel"); // https://hsv.googleplex.com/5130837462876160?node=117 - public static final Pattern PAGE_TITLE_SELECTOR_PATTERN = - Pattern.compile( + public static final Pattern PAGE_TITLE_SELECTOR_PATTERN; + + static { + if (migrateClocksToBlueprint()) { + PAGE_TITLE_SELECTOR_PATTERN = Pattern.compile( + String.format("com.android.systemui:id/%s", "keyguard_indication_area")); + } else { + PAGE_TITLE_SELECTOR_PATTERN = Pattern.compile( String.format("com.android.systemui:id/%s", "keyguard_clock_container")); + } + } + private static final BySelector PAGE_TITLE_SELECTOR = By.res(PAGE_TITLE_SELECTOR_PATTERN); private static final int SHORT_SLEEP_IN_SECONDS = 2;