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

Commit 523b1adf authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Ongoing Call] Don't show the ongoing call chip when there's a HUN."... 

Merge "[Ongoing Call] Don't show the ongoing call chip when there's a HUN." into tm-qpr-dev am: e186eb93 am: 2ba70033 am: 4374452c am: 3233a77b

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



Change-Id: I976e3aef0001f7125556cbb2aba325dd663aca39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6ba5fed 3233a77b

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+7 −3
Original line number Diff line number Diff line
@@ -453,9 +453,6 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    protected int adjustDisableFlags(int state) {

        boolean headsUpVisible =

                mStatusBarFragmentComponent.getHeadsUpAppearanceController().shouldBeVisible();

        if (headsUpVisible) {

            state |= DISABLE_CLOCK;

        }



        if (!mKeyguardStateController.isLaunchTransitionFadingAway()

                && !mKeyguardStateController.isKeyguardFadingAway()
@@ -473,6 +470,13 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
            state |= DISABLE_ONGOING_CALL_CHIP;

        }



        if (headsUpVisible) {

            // Disable everything on the left side of the status bar, since the app name for the

            // heads up notification appears there instead.

            state |= DISABLE_CLOCK;

            state |= DISABLE_ONGOING_CALL_CHIP;

        }



        return state;

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java

+13 −0
Original line number Diff line number Diff line
@@ -332,6 +332,19 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { 
                mFragment.getView().findViewById(R.id.ongoing_call_chip).getVisibility());

    }



    @Test

    public void disable_hasOngoingCallButAlsoHun_chipHidden() {

        CollapsedStatusBarFragment fragment = resumeAndGetFragment();



        when(mOngoingCallController.hasOngoingCall()).thenReturn(true);

        when(mHeadsUpAppearanceController.shouldBeVisible()).thenReturn(true);



        fragment.disable(DEFAULT_DISPLAY, 0, 0, false);



        assertEquals(View.GONE,

                mFragment.getView().findViewById(R.id.ongoing_call_chip).getVisibility());

    }



    @Test

    public void disable_ongoingCallEnded_chipHidden() {

        CollapsedStatusBarFragment fragment = resumeAndGetFragment();