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

Commit 4c7d3d26 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Disable additional KeyguardStatusViewController callbacks 

Bug: 326712862
Test: Manual & Presubmits
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint STAGING
Change-Id: I796cd925bd01435eefd6c69b26f14765ebdd647b
parent 97ef6a07

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

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

    @Override

    protected void onViewAttached() {

    protected void onViewAttached() {

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

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

        if (migrateClocksToBlueprint()) {

            return;

        }



        mStatusArea.addOnLayoutChangeListener(mStatusAreaLayoutChangeListener);

        mStatusArea.addOnLayoutChangeListener(mStatusAreaLayoutChangeListener);

        mKeyguardUpdateMonitor.registerCallback(mInfoCallback);

        mKeyguardUpdateMonitor.registerCallback(mInfoCallback);

        mConfigurationController.addCallback(mConfigurationListener);

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




    @Override

    @Override

    protected void onViewDetached() {

    protected void onViewDetached() {

        if (migrateClocksToBlueprint()) {

            return;

        }



        mStatusArea.removeOnLayoutChangeListener(mStatusAreaLayoutChangeListener);

        mStatusArea.removeOnLayoutChangeListener(mStatusAreaLayoutChangeListener);

        mKeyguardUpdateMonitor.removeCallback(mInfoCallback);

        mKeyguardUpdateMonitor.removeCallback(mInfoCallback);

        mConfigurationController.removeCallback(mConfigurationListener);

        mConfigurationController.removeCallback(mConfigurationListener);

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

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

import static org.mockito.Mockito.when;





import android.animation.AnimatorTestRule;

import android.animation.AnimatorTestRule;

import android.platform.test.annotations.DisableFlags;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper;

import android.view.View;

import android.view.View;





import com.android.app.animation.Interpolators;

import com.android.app.animation.Interpolators;

import com.android.systemui.Flags;

import com.android.systemui.animation.ViewHierarchyAnimator;

import com.android.systemui.animation.ViewHierarchyAnimator;

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

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

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

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

    }





    @Test

    @Test

    @DisableFlags(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

    public void onLocaleListChangedNotifiesClockSwitchController() {

    public void onLocaleListChangedNotifiesClockSwitchController() {

        ArgumentCaptor<ConfigurationListener> configurationListenerArgumentCaptor =

        ArgumentCaptor<ConfigurationListener> configurationListenerArgumentCaptor =

                ArgumentCaptor.forClass(ConfigurationListener.class);

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

    }





    @Test

    @Test

    @DisableFlags(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

    public void statusAreaHeightChange_animatesHeightOutputChange() {

    public void statusAreaHeightChange_animatesHeightOutputChange() {

        // Init & Capture Layout Listener

        // Init & Capture Layout Listener

        mController.onInit();

        mController.onInit();