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

Commit 2e721398 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Disable additional KeyguardStatusViewController callbacks" into main

parents fbc37475 4c7d3d26

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+8 −0
Original line number Diff line number Diff line
@@ -250,6 +250,10 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
    @Override

    protected void onViewAttached() {

        mStatusArea = mView.findViewById(R.id.keyguard_status_area);

        if (migrateClocksToBlueprint()) {

            return;

        }



        mStatusArea.addOnLayoutChangeListener(mStatusAreaLayoutChangeListener);

        mKeyguardUpdateMonitor.registerCallback(mInfoCallback);

        mConfigurationController.addCallback(mConfigurationListener);
@@ -257,6 +261,10 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 


    @Override

    protected void onViewDetached() {

        if (migrateClocksToBlueprint()) {

            return;

        }



        mStatusArea.removeOnLayoutChangeListener(mStatusAreaLayoutChangeListener);

        mKeyguardUpdateMonitor.removeCallback(mInfoCallback);

        mConfigurationController.removeCallback(mConfigurationListener);

packages/SystemUI/tests/src/com/android/keyguard/KeyguardStatusViewControllerTest.java

+4 −0
Original line number Diff line number Diff line
@@ -30,12 +30,14 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.animation.AnimatorTestRule;

import android.platform.test.annotations.DisableFlags;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.View;



import com.android.app.animation.Interpolators;

import com.android.systemui.Flags;

import com.android.systemui.animation.ViewHierarchyAnimator;

import com.android.systemui.plugins.clocks.ClockConfig;

import com.android.systemui.plugins.clocks.ClockController;
@@ -80,6 +82,7 @@ public class KeyguardStatusViewControllerTest extends KeyguardStatusViewControll 
    }



    @Test

    @DisableFlags(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

    public void onLocaleListChangedNotifiesClockSwitchController() {

        ArgumentCaptor<ConfigurationListener> configurationListenerArgumentCaptor =

                ArgumentCaptor.forClass(ConfigurationListener.class);
@@ -239,6 +242,7 @@ public class KeyguardStatusViewControllerTest extends KeyguardStatusViewControll 
    }



    @Test

    @DisableFlags(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

    public void statusAreaHeightChange_animatesHeightOutputChange() {

        // Init & Capture Layout Listener

        mController.onInit();