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

Commit a77c8690 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Revert "Update the ambient indication container"" into sc-v2-dev am: 300d2286 

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

Change-Id: Idc07f93430ab702e256919a53bf07d523d373652
parents 6f556491 300d2286

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


<com.android.systemui.statusbar.phone.KeyguardBottomAreaView

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

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

    android:id="@+id/keyguard_bottom_area"

    android:layout_height="match_parent"

    android:layout_width="match_parent"
@@ -113,8 +114,7 @@ 
        android:layout_height="match_parent">



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



    </FrameLayout>



    <include layout="@layout/ambient_indication"

             android:id="@+id/ambient_indication_container" />

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

packages/SystemUI/res/layout/status_bar_expanded.xml

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ 
            systemui:layout_constraintEnd_toEndOf="parent"

        />



        <include layout="@layout/ambient_indication"

            android:id="@+id/ambient_indication_container" />



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



        <include

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+0 −28
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import android.widget.ImageView; 
import android.widget.TextView;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.widget.LockPatternUtils;
@@ -151,7 +150,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    private ControlsComponent mControlsComponent;

    private boolean mControlServicesAvailable = false;



    @Nullable private View mAmbientIndicationArea;

    private ViewGroup mIndicationArea;

    private TextView mIndicationText;

    private TextView mIndicationTextBottom;
@@ -272,29 +270,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 


    public void initFrom(KeyguardBottomAreaView oldBottomArea) {

        setStatusBar(oldBottomArea.mStatusBar);



        // if it exists, continue to use the original ambient indication container

        // instead of the newly inflated one

        if (mAmbientIndicationArea != null) {

            // remove old ambient indication from its parent

            View originalAmbientIndicationView =

                    oldBottomArea.findViewById(R.id.ambient_indication_container);

            ((ViewGroup) originalAmbientIndicationView.getParent())

                    .removeView(originalAmbientIndicationView);



            // remove current ambient indication from its parent (discard)

            ViewGroup ambientIndicationParent = (ViewGroup) mAmbientIndicationArea.getParent();

            int ambientIndicationIndex =

                    ambientIndicationParent.indexOfChild(mAmbientIndicationArea);

            ambientIndicationParent.removeView(mAmbientIndicationArea);



            // add the old ambient indication to this view

            ambientIndicationParent.addView(originalAmbientIndicationView, ambientIndicationIndex);

            mAmbientIndicationArea = originalAmbientIndicationView;



            // update burn-in offsets

            dozeTimeTick();

        }

    }



    @Override
@@ -308,7 +283,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        mWalletButton = findViewById(R.id.wallet_button);

        mControlsButton = findViewById(R.id.controls_button);

        mIndicationArea = findViewById(R.id.keyguard_indication_area);

        mAmbientIndicationArea = findViewById(R.id.ambient_indication_container);

        mIndicationText = findViewById(R.id.keyguard_indication_text);

        mIndicationTextBottom = findViewById(R.id.keyguard_indication_text_bottom);

        mIndicationBottomMargin = getResources().getDimensionPixelSize(
@@ -927,7 +901,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        int burnInYOffset = getBurnInOffset(mBurnInYOffset * 2, false /* xAxis */)

                - mBurnInYOffset;

        mIndicationArea.setTranslationY(burnInYOffset * mDarkAmount);

        mAmbientIndicationArea.setTranslationY(burnInYOffset * mDarkAmount);

    }



    public void setAntiBurnInOffsetX(int burnInXOffset) {
@@ -936,7 +909,6 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        }

        mBurnInXOffset = burnInXOffset;

        mIndicationArea.setTranslationX(burnInXOffset);

        mAmbientIndicationArea.setTranslationX(burnInXOffset);

    }



    /**

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ class KeyguardBottomAreaTest : SysuiTestCase() { 


    @Test

    fun initFrom_doesntCrash() {

        val other = LayoutInflater.from(mContext).inflate(R.layout.keyguard_bottom_area,

                null, false) as KeyguardBottomAreaView

        val other = LayoutInflater.from(mContext).inflate(

                R.layout.keyguard_bottom_area, null, false) as KeyguardBottomAreaView



        other.initFrom(mKeyguardBottomArea)

        other.launchVoiceAssist()