Improve the UI of Press & hold power button settings
The following changes has been made: - The on/off toggle for Assistant now becomes two radio selectors ("Power Menu" and "Digital Assistant"). This is to make things clearer that Press & hold power button can be configured to power menu. - The corresponding power menu animation will be shown when "Power Menu" is selected. - The Assistant specific sensitivity settings and the foot notes are hidden when "Power Menu" is selected. - Some minor wording updates according to the requests from Assistant / Settings UXW. Bug: 229722937 Test: robotest, manual Change-Id: Ib356fba861ad8c4a2626a0e0bd8cf3e4d90ce9a6
This commit is contained in:
@@ -18,20 +18,21 @@ package com.android.settings.gestures;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class PowerMenuPreferenceControllerTest {
|
||||
@@ -41,35 +42,75 @@ public class PowerMenuPreferenceControllerTest {
|
||||
|
||||
private static final String KEY_GESTURE_POWER_MENU = "gesture_power_menu";
|
||||
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
mResources = mock(Resources.class);
|
||||
when(mResources.getBoolean(
|
||||
com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
|
||||
.thenReturn(true);
|
||||
when(mContext.getResources()).thenReturn(mResources);
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
mResources = spy(mContext.getResources());
|
||||
mController = new PowerMenuPreferenceController(mContext, KEY_GESTURE_POWER_MENU);
|
||||
|
||||
when(mContext.getResources()).thenReturn(mResources);
|
||||
when(mResources.getBoolean(
|
||||
com.android.internal.R.bool
|
||||
.config_longPressOnPowerForAssistantSettingAvailable))
|
||||
.thenReturn(true);
|
||||
when(mResources.getInteger(com.android.internal.R.integer.config_longPressOnPowerBehavior))
|
||||
.thenReturn(1); // Default to power menu
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_assistAvailable_available() {
|
||||
public void getAvailabilityStatus_settingsAvailable_returnsAvailable() {
|
||||
when(mResources.getBoolean(
|
||||
com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
|
||||
.thenReturn(true);
|
||||
com.android.internal.R.bool
|
||||
.config_longPressOnPowerForAssistantSettingAvailable))
|
||||
.thenReturn(true);
|
||||
when(mResources.getInteger(com.android.internal.R.integer.config_longPressOnPowerBehavior))
|
||||
.thenReturn(1); // Default to power menu
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(
|
||||
BasePreferenceController.AVAILABLE);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_assistUnavailable_unavailable() {
|
||||
public void getAvailabilityStatus_settingsNotAvailable_returnsNotAvailable() {
|
||||
when(mResources.getBoolean(
|
||||
com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
|
||||
.thenReturn(false);
|
||||
com.android.internal.R.bool
|
||||
.config_longPressOnPowerForAssistantSettingAvailable))
|
||||
.thenReturn(false);
|
||||
when(mResources.getInteger(com.android.internal.R.integer.config_longPressOnPowerBehavior))
|
||||
.thenReturn(1); // Default to power menu
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(
|
||||
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_longPressPowerSettingNotAvailable_returnsNotAvailable() {
|
||||
when(mResources.getBoolean(
|
||||
com.android.internal.R.bool
|
||||
.config_longPressOnPowerForAssistantSettingAvailable))
|
||||
.thenReturn(true);
|
||||
when(mResources.getInteger(com.android.internal.R.integer.config_longPressOnPowerBehavior))
|
||||
.thenReturn(3); // Default to power off (unsupported setup)
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_longPressPowerToAssistant_returnsNotAvailable() {
|
||||
PowerMenuSettingsUtils.setLongPressPowerForAssistant(mContext);
|
||||
|
||||
assertThat(mController.getSummary().toString())
|
||||
.isEqualTo(
|
||||
mContext.getString(R.string.power_menu_summary_long_press_for_assistant));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSummary_longPressPowerToPowerMenu_returnsNotAvailable() {
|
||||
PowerMenuSettingsUtils.setLongPressPowerForPowerMenu(mContext);
|
||||
|
||||
assertThat(mController.getSummary().toString())
|
||||
.isEqualTo(
|
||||
mContext.getString(R.string.power_menu_summary_long_press_for_power_menu));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user