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

Commit d5895d42 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

Bottom area buttons are LaunchableView 

This is needed to make sure that the visibility of the views stays
consistent throughout the transition animation that ensues when the
views are clicked by the user to open an activity or dialog.

The next step is to actually add support for LaunchableView in
ActivityLaunchAnimator like we did for DialogLaunchAnimator.

Bug: 249986783
Test: clicked on the buttons, the animations still work, the linked bug
is still present (it's expected to be fixed when we add support in
ActivityLaunchAnimator)

Change-Id: I2e846545cb1f268fc007309cde7a4dea95bd408c
parent 3348d719

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 


    </LinearLayout>



    <ImageView

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

        android:id="@+id/start_button"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"
@@ -71,7 +71,7 @@ 
        android:layout_marginBottom="@dimen/keyguard_affordance_vertical_offset"

        android:visibility="gone" />



    <ImageView

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

        android:id="@+id/end_button"

        android:layout_height="@dimen/keyguard_affordance_fixed_height"

        android:layout_width="@dimen/keyguard_affordance_fixed_width"

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

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

 * Copyright (C) 2022 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.common.ui.view



import android.content.Context

import android.util.AttributeSet

import android.widget.ImageView

import com.android.systemui.animation.LaunchableView

import com.android.systemui.animation.LaunchableViewDelegate



class LaunchableImageView : ImageView, LaunchableView {

    private val delegate =

        LaunchableViewDelegate(

            this,

            superSetVisibility = { super.setVisibility(it) },

            superSetTransitionVisibility = { super.setTransitionVisibility(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)



    constructor(

        context: Context?,

        attrs: AttributeSet?,

        defStyleAttr: Int,

        defStyleRes: Int,

    ) : super(context, attrs, defStyleAttr, defStyleRes)



    override fun setShouldBlockVisibilityChanges(block: Boolean) {

        delegate.setShouldBlockVisibilityChanges(block)

    }



    override fun setVisibility(visibility: Int) {

        delegate.setVisibility(visibility)

    }



    override fun setTransitionVisibility(visibility: Int) {

        delegate.setTransitionVisibility(visibility)

    }

}