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

Commit 2de72199 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move LaunchableFrameLayout to view directory." into udc-qpr-dev

parents 1d0ac15d 829576e6

packages/SystemUI/animation/src/com/android/systemui/animation/DialogLaunchAnimator.kt

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.widget.FrameLayout 
import com.android.app.animation.Interpolators

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.jank.InteractionJankMonitor.CujType

import com.android.systemui.animation.view.LaunchableFrameLayout

import com.android.systemui.util.registerAnimationOnBackInvoked

import kotlin.math.roundToInt

packages/SystemUI/animation/src/com/android/systemui/animation/LaunchableFrameLayout.kt→packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableFrameLayout.kt

+3 −1
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ 
 * limitations under the License.

 */



package com.android.systemui.animation

package com.android.systemui.animation.view



import android.content.Context

import android.util.AttributeSet

import android.widget.FrameLayout

import com.android.systemui.animation.LaunchableView

import com.android.systemui.animation.LaunchableViewDelegate



/** A [FrameLayout] that also implements [LaunchableView]. */

open class LaunchableFrameLayout : FrameLayout, LaunchableView {

packages/SystemUI/res/layout/keyguard_qs_user_switch.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:layout_gravity="end">

    <!-- We add a background behind the UserAvatarView with the same color and with a circular shape

         so that this view can be expanded into a Dialog or an Activity. -->

    <com.android.systemui.animation.LaunchableFrameLayout

    <com.android.systemui.animation.view.LaunchableFrameLayout

        android:id="@+id/kg_multi_user_avatar_with_background"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"
@@ -42,5 +42,5 @@ 
            systemui:framePadding="0dp"

            systemui:frameWidth="0dp">

        </com.android.systemui.statusbar.phone.UserAvatarView>

    </com.android.systemui.animation.LaunchableFrameLayout>

    </com.android.systemui.animation.view.LaunchableFrameLayout>

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyChip.kt

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.widget.ImageView 
import android.widget.LinearLayout

import com.android.settingslib.Utils

import com.android.systemui.R

import com.android.systemui.animation.LaunchableFrameLayout

import com.android.systemui.animation.view.LaunchableFrameLayout

import com.android.systemui.statusbar.events.BackgroundAnimatableView



class OngoingPrivacyChip @JvmOverloads constructor(

packages/SystemUI/tests/src/com/android/systemui/animation/GhostedViewLaunchAnimatorControllerTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.testing.TestableLooper 
import android.widget.FrameLayout

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.animation.view.LaunchableFrameLayout

import org.junit.Assert.assertThrows

import org.junit.Test

import org.junit.runner.RunWith