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

Commit 72a14e0c authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Automerger Merge Worker
Browse files

Merge "Move some base launchable views to the animation library." into... 

Merge "Move some base launchable views to the animation library." into tm-qpr-dev am: 3fb52a63 am: 02c67d21

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21150132



Change-Id: I451979e8e9f168d25f25722c69b4dce88727216e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 559266a7 02c67d21

packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableImageView.kt→packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableImageView.kt

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 *

 */



package com.android.systemui.common.ui.view

package com.android.systemui.animation.view



import android.content.Context

import android.util.AttributeSet
@@ -23,6 +23,7 @@ import android.widget.ImageView 
import com.android.systemui.animation.LaunchableView

import com.android.systemui.animation.LaunchableViewDelegate



/** An [ImageView] that also implements [LaunchableView]. */

class LaunchableImageView : ImageView, LaunchableView {

    private val delegate =

        LaunchableViewDelegate(

packages/SystemUI/src/com/android/systemui/common/ui/view/LaunchableLinearLayout.kt→packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableLinearLayout.kt

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

 */



package com.android.systemui.common.ui.view

package com.android.systemui.animation.view



import android.content.Context

import android.util.AttributeSet

packages/SystemUI/animation/src/com/android/systemui/animation/view/LaunchableTextView.kt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 *

 */



package com.android.systemui.animation.view



import android.content.Context

import android.util.AttributeSet

import android.widget.TextView

import com.android.systemui.animation.LaunchableView

import com.android.systemui.animation.LaunchableViewDelegate



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

class LaunchableTextView : TextView, LaunchableView {

    private val delegate =

        LaunchableViewDelegate(

            this,

            superSetVisibility = { super.setVisibility(it) },

        )



    constructor(context: Context?) : super(context)

    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)

    constructor(

        context: Context?,

        attrs: AttributeSet?,

        defStyleAttr: Int,

    ) : super(context, attrs, defStyleAttr)



    override fun setShouldBlockVisibilityChanges(block: Boolean) {

        delegate.setShouldBlockVisibilityChanges(block)

    }



    override fun setVisibility(visibility: Int) {

        delegate.setVisibility(visibility)

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.systemui.common.ui.view.LaunchableLinearLayout

<com.android.systemui.animation.view.LaunchableLinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="0dp"

    android:layout_height="@dimen/qs_security_footer_single_line_height"
@@ -63,4 +63,4 @@ 
        android:src="@*android:drawable/ic_chevron_end"

        android:autoMirrored="true"

        android:tint="?android:attr/textColorSecondary" />

</com.android.systemui.common.ui.view.LaunchableLinearLayout>
 
 No newline at end of file
 
</com.android.systemui.animation.view.LaunchableLinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/dream_overlay_home_controls_chip.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="wrap_content"

    android:paddingVertical="@dimen/dream_overlay_complication_home_controls_padding">



    <com.android.systemui.common.ui.view.LaunchableImageView

    <com.android.systemui.animation.view.LaunchableImageView

        android:id="@+id/home_controls_chip"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"