Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c00165b1 authored by Brad Hinegardner's avatar Brad Hinegardner Committed by Android (Google) Code Review
Browse files

Merge changes from topic "release_migrate_split_keyguard_bottom_area" into main 

* changes:
  Release MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA
  Modify inflation of ambient indication area to handle merge layouts
  Release MIGRATE_LOCK_ICON
parents c1918796 8adb5772

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ object Flags { 
    // TODO(b/290652751): Tracking bug.

    @JvmField

    val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA =

        unreleasedFlag("migrate_split_keyguard_bottom_area", teamfood = true)

        releasedFlag("migrate_split_keyguard_bottom_area")



    // TODO(b/297037052): Tracking bug.

    @JvmField
@@ -274,7 +274,7 @@ object Flags { 


    /** Migrate the lock icon view to the new keyguard root view. */

    // TODO(b/286552209): Tracking bug.

    @JvmField val MIGRATE_LOCK_ICON = unreleasedFlag("migrate_lock_icon", teamfood = true)

    @JvmField val MIGRATE_LOCK_ICON = releasedFlag("migrate_lock_icon")



    // TODO(b/288276738): Tracking bug.

    @JvmField val WIDGET_ON_KEYGUARD = unreleasedFlag("widget_on_keyguard")

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultAmbientIndicationAreaSection.kt

+2 −5
Original line number Diff line number Diff line
@@ -50,11 +50,8 @@ constructor( 


    override fun addViews(constraintLayout: ConstraintLayout) {

        if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {

            val view =

            LayoutInflater.from(constraintLayout.context)

                    .inflate(R.layout.ambient_indication, constraintLayout, false)



            constraintLayout.addView(view)

                .inflate(R.layout.ambient_indication, constraintLayout, true)

        }

    }