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

Merge Ambient display into Lockscreen settings.

Browse Source 
And remove the entry point from security page. Now we only have 1 entry
point from Display page.

Change-Id: I06bc15a6fd8802a4918d8772af2722d5aafa332e
Fixes: 71892510
Test: robotests
This commit is contained in:
Fan Zhang
2018-05-11 17:49:39 -07:00
parent b976044f57
commit 30d4d015b5
18 changed files with 184 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java
View File

@@ -1,116 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowSecureSettings.class)
public class AmbientDisplayPreferenceControllerTest {
@Mock
private Context mContext;
@Mock
private AmbientDisplayConfiguration mConfig;
@Mock
private Preference mPreference;
private AmbientDisplayPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new AmbientDisplayPreferenceController(mContext, mConfig, "key");
}
@Test
public void isAvailable_available() {
when(mConfig.available()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_unavailable() {
when(mConfig.available()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void updateState_alwaysOn() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(true);
mController.updateState(mPreference);
verify(mPreference).setSummary(R.string.ambient_display_screen_summary_always_on);
}
@Test
public void updateState_notifications() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(true);
mController.updateState(mPreference);
verify(mPreference).setSummary(R.string.ambient_display_screen_summary_notifications);
}
@Test
public void updateState_gestures() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
when(mConfig.enabled(anyInt())).thenReturn(true);
mController.updateState(mPreference);
verify(mPreference).setSummary(R.string.switch_on_text);
}
@Test
public void updateState_off() {
when(mConfig.alwaysOnEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnNotificationEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
when(mConfig.pulseOnPickupEnabled(anyInt())).thenReturn(false);
mController.updateState(mPreference);
verify(mPreference).setSummary(R.string.switch_off_text);
}
@Test
public void getPreferenceKey() {
assertThat(mController.getPreferenceKey()).isEqualTo("key");
}
}

101
tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java
View File

@@ -1,101 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.display;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.Context;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class AmbientDisplaySettingsTest {
private TestFragment mTestFragment;
private Context mContext;
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mTestFragment = spy(new TestFragment());
}
@Test
public void onAttach_alwaysOn_shouldInvokeSetters() {
final AmbientDisplayAlwaysOnPreferenceController controller = spy(
new AmbientDisplayAlwaysOnPreferenceController(mContext, "key"));
doReturn(controller).when(mTestFragment).use(
AmbientDisplayAlwaysOnPreferenceController.class);
mTestFragment.onAttach(mContext);
verify(controller).setConfig(any());
verify(controller).setCallback(any());
}
@Test
public void onAttach_notifications_shouldInvokeSetters() {
final AmbientDisplayNotificationsPreferenceController controller = spy(
new AmbientDisplayNotificationsPreferenceController(mContext, "key"));
doReturn(controller).when(mTestFragment).use(
AmbientDisplayNotificationsPreferenceController.class);
mTestFragment.onAttach(mContext);
verify(controller).setConfig(any());
}
@Test
public void onAttach_doubleTap_shouldInvokeSetters() {
final DoubleTapScreenPreferenceController controller = spy(
new DoubleTapScreenPreferenceController(mContext, "key"));
doReturn(controller).when(mTestFragment).use(DoubleTapScreenPreferenceController.class);
mTestFragment.onAttach(mContext);
verify(controller).setConfig(any());
}
@Test
public void onAttach_pickUp_shouldInvokeSetters() {
final PickupGesturePreferenceController controller = spy(
new PickupGesturePreferenceController(mContext, "key"));
doReturn(controller).when(mTestFragment).use(PickupGesturePreferenceController.class);
mTestFragment.onAttach(mContext);
verify(controller).setConfig(any());
}
public static class TestFragment extends AmbientDisplaySettings {
@Override
protected <T extends AbstractPreferenceController> T use(Class<T> clazz) {
return super.use(clazz);
}
}
}