Remove MIGRATE_INDICATION_AREA flag
... and remove indication area from XML
Fixes: 280846900
Fixes: 280067944
Test: atest SystemUITests
Change-Id: I87c5e3e2e9e4c035a8bfe0af34c0efe0964fe7fc
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 66c57fc..36f7b96 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -22,42 +22,6 @@
android:layout_width="match_parent"
android:outlineProvider="none" >
- <LinearLayout
- android:id="@id/keyguard_indication_area"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"
- android:layout_gravity="bottom|center_horizontal"
- android:orientation="vertical">
-
- <com.android.systemui.statusbar.phone.KeyguardIndicationTextView
- android:id="@id/keyguard_indication_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingStart="@dimen/keyguard_indication_text_padding"
- android:paddingEnd="@dimen/keyguard_indication_text_padding"
- android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
- android:accessibilityLiveRegion="polite"/>
-
- <com.android.systemui.statusbar.phone.KeyguardIndicationTextView
- android:id="@id/keyguard_indication_text_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:minHeight="@dimen/keyguard_indication_text_min_height"
- android:layout_gravity="center_horizontal"
- android:paddingStart="@dimen/keyguard_indication_text_padding"
- android:paddingEnd="@dimen/keyguard_indication_text_padding"
- android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
- android:maxLines="2"
- android:ellipsize="end"
- android:alpha=".8"
- android:accessibilityLiveRegion="polite"
- android:visibility="gone"/>
-
- </LinearLayout>
-
<com.android.systemui.animation.view.LaunchableImageView
android:id="@+id/start_button"
android:layout_height="@dimen/keyguard_affordance_fixed_height"
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index d5a9fbd..0c4947e 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -244,10 +244,6 @@
/** Keyguard Migration */
- /** Migrate the indication area to the new keyguard root view. */
- // TODO(b/280067944): Tracking bug.
- @JvmField val MIGRATE_INDICATION_AREA = releasedFlag(236, "migrate_indication_area")
-
/**
* Migrate the bottom area to the new keyguard root view. Because there is no such thing as a
* "bottom area" after this, this also breaks it up into many smaller, modular pieces.
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
index dffc19d..2b6f77d 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
@@ -137,14 +137,6 @@
fun bindIndicationArea() {
indicationAreaHandle?.dispose()
- // At startup, 2 views with the ID `R.id.keyguard_indication_area` will be available.
- // Disable one of them
- if (!featureFlags.isEnabled(Flags.MIGRATE_INDICATION_AREA)) {
- keyguardRootView.findViewById<View?>(R.id.keyguard_indication_area)?.let {
- keyguardRootView.removeView(it)
- }
- }
-
indicationAreaHandle =
KeyguardIndicationAreaBinder.bind(
notificationShadeWindowView,