Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove MIGRATE_INDICATION_AREA flag" into udc-qpr-dev

Browse Source
This commit is contained in:
Matt Pietal
2023-08-07 18:17:19 +00:00
committed by Android (Google) Code Review
parent 9d72f3b2c9 e88272db7a
commit ae856b4054
3 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -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"

4
packages/SystemUI/src/com/android/systemui/flags/Flags.kt
View File

@@ -244,10 +244,6 @@ object Flags {
/** 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.

8
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt
View File

@@ -137,14 +137,6 @@ constructor(
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,