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

Commit 8456c41e authored by Aaron Liu's avatar Aaron Liu
Browse files

Migrate bouncer code to be in one package 

Bouncer code right now is scattered in code base. This CL migrates the
files to be consolidated under a single package.

Bug: 285161628
Test: ensure that the code runs and tests run.
Change-Id: I525326d6a6b2e3cec155b67149602d221a91307b
parent 988c8309

packages/SystemUI/Android.bp

+4 −4
Original line number Original line Diff line number Diff line
@@ -250,17 +250,17 @@ filegroup { 
        "tests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/LightRevealScrimRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.kt",

        "tests/src/com/android/systemui/keyguard/data/repository/TrustRepositoryTest.kt",

        // domain

        // domain

        "tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt",

        "tests/src/com/android/systemui/bouncer/domain/interactor/AlternateBouncerInteractorTest.kt",

        "tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt",

        "tests/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerCallbackInteractorTest.kt",

        "tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt",

        // ui

        // ui

        "tests/src/com/android/systemui/bouncer/ui/viewmodel/KeyguardBouncerViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/GoneToDreamingTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToDreamingTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt",

        "tests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenToOccludedTransitionViewModelTest.kt",

packages/SystemUI/res-keyguard/layout/keyguard_password_view.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
    >

    >

    <include layout="@layout/keyguard_bouncer_message_area"/>

    <include layout="@layout/keyguard_bouncer_message_area"/>





    <com.android.systemui.keyguard.bouncer.ui.BouncerMessageView

    <com.android.systemui.bouncer.ui.BouncerMessageView

        android:id="@+id/bouncer_message_view"

        android:id="@+id/bouncer_message_view"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

packages/SystemUI/res-keyguard/layout/keyguard_pattern_view.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
    android:clipToPadding="false">

    android:clipToPadding="false">

    <include layout="@layout/keyguard_bouncer_message_area"/>

    <include layout="@layout/keyguard_bouncer_message_area"/>





    <com.android.systemui.keyguard.bouncer.ui.BouncerMessageView

    <com.android.systemui.bouncer.ui.BouncerMessageView

        android:id="@+id/bouncer_message_view"

        android:id="@+id/bouncer_message_view"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
    androidprv:layout_maxWidth="@dimen/keyguard_security_width">

    androidprv:layout_maxWidth="@dimen/keyguard_security_width">

<include layout="@layout/keyguard_bouncer_message_area"/>

<include layout="@layout/keyguard_bouncer_message_area"/>





<com.android.systemui.keyguard.bouncer.ui.BouncerMessageView

<com.android.systemui.bouncer.ui.BouncerMessageView

    android:id="@+id/bouncer_message_view"

    android:id="@+id/bouncer_message_view"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

packages/SystemUI/src/com/android/keyguard/BouncerKeyguardMessageArea.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ import android.util.AttributeSet 
import android.view.View

import android.view.View

import com.android.app.animation.Interpolators

import com.android.app.animation.Interpolators

import com.android.settingslib.Utils

import com.android.settingslib.Utils

import com.android.systemui.keyguard.shared.constants.KeyguardBouncerConstants.ColorId.TITLE

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.TITLE





/** Displays security messages for the keyguard bouncer. */

/** Displays security messages for the keyguard bouncer. */

open class BouncerKeyguardMessageArea(context: Context?, attrs: AttributeSet?) :

open class BouncerKeyguardMessageArea(context: Context?, attrs: AttributeSet?) :