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

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

Merge "LPP will now always launch either GlobalActions or the Assistant." into... 

Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de1 am: f4977c5e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279

Change-Id: I01256184429ddc1f337a5453b6a73ac6b441cfe4
parents 48efcc55 f4977c5e

src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java

+6 −4
Original line number Diff line number Diff line
@@ -179,16 +179,18 @@ public class LongPressPowerButtonPreferenceController extends TogglePreferenceCo 
                    POWER_BUTTON_LONG_PRESS_SETTING, LONG_PRESS_POWER_ASSISTANT_VALUE);

        }



        // We need to determine the right disabled value - we set it to device default

        // if it's different than Assist, otherwise we fallback to either global actions or power

        // menu.

        // We need to determine the right disabled value based on the device default

        // for long-press power.



        // If the default is to start the assistant, then the fallback is GlobalActions.

        final int defaultPowerButtonValue = mContext.getResources().getInteger(

                POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE);

        if (defaultPowerButtonValue == LONG_PRESS_POWER_ASSISTANT_VALUE) {

            return Settings.Global.putInt(mContext.getContentResolver(),

                    POWER_BUTTON_LONG_PRESS_SETTING, LONG_PRESS_POWER_NO_ACTION);

                    POWER_BUTTON_LONG_PRESS_SETTING, LONG_PRESS_POWER_GLOBAL_ACTIONS);

        }



        // If the default is something different than Assist, we use that default.

        return Settings.Global.putInt(mContext.getContentResolver(),

                POWER_BUTTON_LONG_PRESS_SETTING, defaultPowerButtonValue);

    }

tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java

+4 −5
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public class LongPressPowerButtonPreferenceControllerTest { 


    @Test

    public void preferenceUnchecked_assistDefault_setNoAction() {

        // Value out of range chosen deliberately.

        // Ensure that the Assistant is the default behavior for LPP.

        when(mResources.getInteger(

                com.android.internal.R.integer.config_longPressOnPowerBehavior))

                .thenReturn(
@@ -209,13 +209,12 @@ public class LongPressPowerButtonPreferenceControllerTest { 


        assertThat(Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.POWER_BUTTON_LONG_PRESS, -1)).isEqualTo(

                LongPressPowerButtonPreferenceController.LONG_PRESS_POWER_NO_ACTION);

                LongPressPowerButtonPreferenceController.LONG_PRESS_POWER_GLOBAL_ACTIONS);

        assertThat(Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.KEY_CHORD_POWER_VOLUME_UP, -1)).isEqualTo(

                LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_NO_ACTION);

        verify(mController.mAssistSwitch).setSummary(

                getString(

                        R.string.power_menu_summary_long_press_for_assist_disabled_no_action));

        verify(mController.mAssistSwitch).setSummary(getString(

                    R.string.power_menu_summary_long_press_for_assist_disabled_with_power_menu));

    }



    private String getString(@StringRes int id) {