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

Commit ccff58e9 authored by Daniel Chapin's avatar Daniel Chapin Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "revert-25007252-release_migrate_split_keyguard_bottom_area-WEBUJLMAOF" into main

* changes:
  Revert "Release MIGRATE_LOCK_ICON"
  Revert "Modify inflation of ambient indication area to handle me..."
  Revert "Release MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA"
parents 5b56429b 726df815

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

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

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

    @JvmField

    @JvmField

    val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA =

    val MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA =

        releasedFlag("migrate_split_keyguard_bottom_area")

        unreleasedFlag("migrate_split_keyguard_bottom_area", teamfood = true)





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

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

    @JvmField

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




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

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

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

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

    @JvmField val MIGRATE_LOCK_ICON = releasedFlag("migrate_lock_icon")

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





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

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

    @JvmField val WIDGET_ON_KEYGUARD = unreleasedFlag("widget_on_keyguard")

    @JvmField val WIDGET_ON_KEYGUARD = unreleasedFlag("widget_on_keyguard")

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

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




    override fun addViews(constraintLayout: ConstraintLayout) {

    override fun addViews(constraintLayout: ConstraintLayout) {

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

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

            val view =

                LayoutInflater.from(constraintLayout.context)

                LayoutInflater.from(constraintLayout.context)

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

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



            constraintLayout.addView(view)

        }

        }

    }

    }