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

Commit ab64b323 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add screenshot back to power menu for some devices" into rvc-dev am:... 

Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e06 am: ab73ba71

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

Change-Id: I8c4ad0785cb13e53bc154306ddd43ab8e04f6e05
parents c6095a41 ab73ba71

core/res/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -2781,6 +2781,7 @@ 
        <item>power</item>

        <item>restart</item>

        <item>logout</item>

        <item>screenshot</item>

        <item>bugreport</item>

    </string-array>

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

+21 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM; 
import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

import static android.view.WindowManager.ScreenshotSource.SCREENSHOT_GLOBAL_ACTIONS;

import static android.view.WindowManager.TAKE_SCREENSHOT_FULLSCREEN;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON;



import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.SOME_AUTH_REQUIRED_AFTER_USER_REQUEST;

import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_NOT_REQUIRED;
@@ -548,7 +549,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
        if (!mDeviceProvisioned && !action.showBeforeProvisioning()) {

            return false;

        }

        return true;

        return action.shouldShow();

    }



    /**
@@ -961,6 +962,8 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 


    @VisibleForTesting

    class ScreenshotAction extends SinglePressAction implements LongPressAction {

        final String KEY_SYSTEM_NAV_2BUTTONS = "system_nav_2buttons";



        public ScreenshotAction() {

            super(R.drawable.ic_screenshot, R.string.global_action_screenshot);

        }
@@ -992,6 +995,19 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            return false;

        }



        @Override

        public boolean shouldShow() {

          // Include screenshot in power menu for legacy nav because it is not accessible

          // through Recents in that mode

            return is2ButtonNavigationEnabled();

        }



        boolean is2ButtonNavigationEnabled() {

            return NAV_BAR_MODE_2BUTTON == mContext.getResources().getInteger(

                    com.android.internal.R.integer.config_navBarInteractionMode);

        }





        @Override

        public boolean onLongPress() {

            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SCREENRECORD_LONG_PRESS)) {
@@ -1615,6 +1631,10 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
         * @return

         */

        CharSequence getMessage();



        default boolean shouldShow() {

            return true;

        }

    }



    /**

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

+23 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.testing.TestableLooper; 
import android.util.FeatureFlagUtils;

import android.view.IWindowManager;

import android.view.View;

import android.view.WindowManagerPolicyConstants;

import android.widget.FrameLayout;



import androidx.test.filters.SmallTest;
@@ -241,6 +242,28 @@ public class GlobalActionsDialogTest extends SysuiTestCase { 
        verifyLogPosted(GlobalActionsDialog.GlobalActionsEvent.GA_SCREENSHOT_LONG_PRESS);

    }



    @Test

    public void testShouldShowScreenshot() {

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.integer.config_navBarInteractionMode,

                WindowManagerPolicyConstants.NAV_BAR_MODE_2BUTTON);



        GlobalActionsDialog.ScreenshotAction screenshotAction =

                mGlobalActionsDialog.makeScreenshotActionForTesting();

        assertThat(screenshotAction.shouldShow()).isTrue();

    }



    @Test

    public void testShouldNotShowScreenshot() {

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.integer.config_navBarInteractionMode,

                WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON);



        GlobalActionsDialog.ScreenshotAction screenshotAction =

                mGlobalActionsDialog.makeScreenshotActionForTesting();

        assertThat(screenshotAction.shouldShow()).isFalse();

    }



    private void verifyLogPosted(GlobalActionsDialog.GlobalActionsEvent event) {

        mTestableLooper.processAllMessages();

        verify(mUiEventLogger, times(1))