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

Commit e8c15a1f authored by Patrick Huang's avatar Patrick Huang Committed by Automerger Merge Worker
Browse files

Merge "Hide power menu Emergency button if device lacks telephony" into tm-dev am: 55940dd7 

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

Change-Id: I4380b85047e6545d1c17ac47f674d8f3a4e8f7d0
parents 54db1505 55940dd7

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+9 −1
Original line number Diff line number Diff line
@@ -624,7 +624,9 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                    addIfShouldShowAction(tempActions, new LogoutAction());

                }

            } else if (GLOBAL_ACTION_KEY_EMERGENCY.equals(actionKey)) {

                if (shouldDisplayEmergency()) {

                    addIfShouldShowAction(tempActions, new EmergencyDialerAction());

                }

            } else {

                Log.e(TAG, "Invalid global action key " + actionKey);

            }
@@ -703,6 +705,12 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                || state == SOME_AUTH_REQUIRED_AFTER_USER_REQUEST);

    }



    @VisibleForTesting

    boolean shouldDisplayEmergency() {

        // Emergency calling requires a telephony radio.

        return mHasTelephony;

    }



    @VisibleForTesting

    boolean shouldDisplayBugReport(UserInfo currentUser) {

        return mGlobalSettings.getInt(Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java

+29 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
    public void testCreateActionItems_lockdownEnabled_doesShowLockdown() {

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);

        doReturn(4).when(mGlobalActionsDialogLite).getMaxShownPowerItems();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayEmergency();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayLockdown(any());

        doReturn(true).when(mGlobalActionsDialogLite).shouldShowAction(any());

        String[] actions = {
@@ -365,8 +366,10 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
    public void testCreateActionItems_lockdownDisabled_doesNotShowLockdown() {

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);

        doReturn(4).when(mGlobalActionsDialogLite).getMaxShownPowerItems();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayEmergency();

        // make sure lockdown action will NOT be shown

        doReturn(false).when(mGlobalActionsDialogLite).shouldDisplayLockdown(any());

        doReturn(true).when(mGlobalActionsDialogLite).shouldShowAction(any());

        String[] actions = {

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_EMERGENCY,

                // lockdown action not allowed
@@ -385,6 +388,32 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
        assertThat(mGlobalActionsDialogLite.mPowerItems).isEmpty();

    }



    @Test

    public void testCreateActionItems_emergencyDisabled_doesNotShowEmergency() {

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);

        doReturn(4).when(mGlobalActionsDialogLite).getMaxShownPowerItems();

        // make sure emergency action will NOT be shown

        doReturn(false).when(mGlobalActionsDialogLite).shouldDisplayEmergency();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayLockdown(any());

        doReturn(true).when(mGlobalActionsDialogLite).shouldShowAction(any());

        String[] actions = {

                // emergency action not allowed

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_EMERGENCY,

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_LOCKDOWN,

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_POWER,

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_RESTART,

        };

        doReturn(actions).when(mGlobalActionsDialogLite).getDefaultActions();

        mGlobalActionsDialogLite.createActionItems();



        assertItemsOfType(mGlobalActionsDialogLite.mItems,

                GlobalActionsDialogLite.LockDownAction.class,

                GlobalActionsDialogLite.ShutDownAction.class,

                GlobalActionsDialogLite.RestartAction.class);

        assertThat(mGlobalActionsDialogLite.mOverflowItems).isEmpty();

        assertThat(mGlobalActionsDialogLite.mPowerItems).isEmpty();

    }



    @Test

    public void testShouldLogLockdownPress() {

        GlobalActionsDialogLite.LockDownAction lockDownAction =