New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (10/n).
- Create the font size LabeledSeekBarPreference and add the entry 1) It's integrated with the system font scale configurations. 2) Create the new PreviewSizeSeekBarController component for controlling the LabeledSeekBarPreference of the display/font size. 3) Create the new PreviewSizeData component to store the configurations related to the display/font size features. Bug: 211503117 Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest Change-Id: I0c1cf6d0425c5c8b61cc8ed0c9fedadf7a65bd27
This commit is contained in:
@@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/**
|
||||
* Tests for {@link FontSizeData}.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class FontSizeDataTest {
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private FontSizeData mFontSizeData;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mFontSizeData = new FontSizeData(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void commit_success() {
|
||||
final int progress = 3;
|
||||
|
||||
mFontSizeData.commit(progress);
|
||||
final float currentScale =
|
||||
Settings.System.getFloat(mContext.getContentResolver(), Settings.System.FONT_SCALE,
|
||||
/* def= */ 1.0f);
|
||||
|
||||
assertThat(currentScale).isEqualTo(mFontSizeData.getValues().get(progress));
|
||||
}
|
||||
}
|
@@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.accessibility;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
|
||||
import com.android.settings.widget.LabeledSeekBarPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
|
||||
/**
|
||||
* Tests for {@link PreviewSizeSeekBarController}.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
public class PreviewSizeSeekBarControllerTest {
|
||||
private static final String FONT_SIZE_KEY = "font_size";
|
||||
private final Context mContext = ApplicationProvider.getApplicationContext();
|
||||
private PreviewSizeSeekBarController mSeekBarController;
|
||||
private FontSizeData mFontSizeData;
|
||||
private LabeledSeekBarPreference mSeekBarPreference;
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mPreferenceScreen;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mFontSizeData = new FontSizeData(mContext);
|
||||
|
||||
mSeekBarController =
|
||||
new PreviewSizeSeekBarController(mContext, FONT_SIZE_KEY, mFontSizeData);
|
||||
|
||||
mSeekBarPreference = spy(new LabeledSeekBarPreference(mContext, /* attrs= */ null));
|
||||
when(mPreferenceScreen.findPreference(anyString())).thenReturn(mSeekBarPreference);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void initMax_matchResult() {
|
||||
when(mPreferenceScreen.findPreference(anyString())).thenReturn(mSeekBarPreference);
|
||||
|
||||
mSeekBarController.displayPreference(mPreferenceScreen);
|
||||
|
||||
assertThat(mSeekBarPreference.getMax()).isEqualTo(
|
||||
mFontSizeData.getValues().size() - 1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void initProgress_matchResult() {
|
||||
when(mPreferenceScreen.findPreference(anyString())).thenReturn(mSeekBarPreference);
|
||||
|
||||
mSeekBarController.displayPreference(mPreferenceScreen);
|
||||
|
||||
verify(mSeekBarPreference).setProgress(mFontSizeData.getInitialIndex());
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user