PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-18 21:38:32 +00:00
committed by Android (Google) Code Review
parent abd0f6a5f6 509670cb0d
commit 6bf17de139
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/gestures/LongPressPowerButtonPreferenceController.java
View File

@@ -179,16 +179,18 @@ public class LongPressPowerButtonPreferenceController extends TogglePreferenceCo
POWER_BUTTON_LONG_PRESS_SETTING, LONG_PRESS_POWER_ASSISTANT_VALUE); POWER_BUTTON_LONG_PRESS_SETTING, LONG_PRESS_POWER_ASSISTANT_VALUE);
} }
// We need to determine the right disabled value - we set it to device default // We need to determine the right disabled value based on the device default
// if it's different than Assist, otherwise we fallback to either global actions or power // for long-press power.
// menu.
// If the default is to start the assistant, then the fallback is GlobalActions.
final int defaultPowerButtonValue = mContext.getResources().getInteger( final int defaultPowerButtonValue = mContext.getResources().getInteger(
POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE); POWER_BUTTON_LONG_PRESS_DEFAULT_VALUE_RESOURCE);
if (defaultPowerButtonValue == LONG_PRESS_POWER_ASSISTANT_VALUE) { if (defaultPowerButtonValue == LONG_PRESS_POWER_ASSISTANT_VALUE) {
return Settings.Global.putInt(mContext.getContentResolver(), 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(), return Settings.Global.putInt(mContext.getContentResolver(),
POWER_BUTTON_LONG_PRESS_SETTING, defaultPowerButtonValue); POWER_BUTTON_LONG_PRESS_SETTING, defaultPowerButtonValue);
} }

9
tests/robotests/src/com/android/settings/gestures/LongPressPowerButtonPreferenceControllerTest.java
View File

@@ -199,7 +199,7 @@ public class LongPressPowerButtonPreferenceControllerTest {
@Test @Test
public void preferenceUnchecked_assistDefault_setNoAction() { public void preferenceUnchecked_assistDefault_setNoAction() {
// Value out of range chosen deliberately. // Ensure that the Assistant is the default behavior for LPP.
when(mResources.getInteger( when(mResources.getInteger(
com.android.internal.R.integer.config_longPressOnPowerBehavior)) com.android.internal.R.integer.config_longPressOnPowerBehavior))
.thenReturn( .thenReturn(
@@ -209,13 +209,12 @@ public class LongPressPowerButtonPreferenceControllerTest {
assertThat(Settings.Global.getInt(mContext.getContentResolver(), assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.POWER_BUTTON_LONG_PRESS, -1)).isEqualTo( 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(), assertThat(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.KEY_CHORD_POWER_VOLUME_UP, -1)).isEqualTo( Settings.Global.KEY_CHORD_POWER_VOLUME_UP, -1)).isEqualTo(
LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_NO_ACTION); LongPressPowerButtonPreferenceController.KEY_CHORD_POWER_VOLUME_UP_NO_ACTION);
verify(mController.mAssistSwitch).setSummary( verify(mController.mAssistSwitch).setSummary(getString(
getString( R.string.power_menu_summary_long_press_for_assist_disabled_with_power_menu));
R.string.power_menu_summary_long_press_for_assist_disabled_no_action));
} }
private String getString(@StringRes int id) { private String getString(@StringRes int id) {