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

Add config to disable app tray preview in display size.

Browse Source 
Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
This commit is contained in:
Fan Zhang
2018-09-07 17:06:07 -07:00
parent 8a2c9e79b0
commit 18eecb1e67
15 changed files with 166 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/robotests/assets/grandfather_not_in_search_index_provider_registry
View File

@@ -1,2 +1,3 @@
com.android.settings.display.FontSizePreferenceFragmentForSetupWizard
com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard
com.android.settings.search.indexing.FakeSettingsFragment

6
tests/robotests/res/values-mcc999/config.xml
View File

@@ -63,6 +63,12 @@
<bool name="config_show_wifi_mac_address">false</bool>
<bool name="config_disable_uninstall_update">true</bool>
<!-- Whether or not extra preview panels should be used for screen zoom setting. -->
<bool name="config_enable_extra_screen_zoom_preview">false</bool>
<!-- Whether or not extra preview panels should be used for screen zoom setting. -->
<bool name="config_enable_extra_screen_zoom_preview">false</bool>
<!-- List of a11y components on the device allowed to be enabled by Settings Slices -->
<string-array name="config_settings_slices_accessibility_components" translatable="false">
<item>fake_package/fake_service</item>

57
tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* 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 com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
public class ScreenZoomSettingsTest {
private ScreenZoomSettings mSettings;
private Context mContext;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mSettings = spy(new ScreenZoomSettings());
doReturn(mContext).when(mSettings).getContext();
}
@Test
public void getPreviewSampleResIds_default_return3Previews() {
assertThat(mSettings.getPreviewSampleResIds()).hasLength(3);
}
@Test
@Config(qualifiers = "mcc999")
public void getPreviewSampleResIds_extraPreviewDisabled_return1Preview() {
assertThat(mSettings.getPreviewSampleResIds()).hasLength(1);
}
}