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

[Contrast] Migrate contrast settings into Display

Browse Source 
Test: local raven device
Bug: 333905689

Change-Id: Ie94633c23ebe024b8fb48d7ffebdd7b1dfa588da
This commit is contained in:
marcusge
2024-04-20 00:13:24 +00:00
committed by Marcus Ge
parent ecaa88ccb0
commit 24289fa084
15 changed files with 103 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/accessibility/ColorContrastFragmentTest.java → tests/robotests/src/com/android/settings/display/ColorContrastFragmentTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.accessibility;
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
@@ -28,6 +28,7 @@ import android.content.Context;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.accessibility.ShortcutsSettingsFragment;
import com.android.settings.testutils.XmlTestUtils;
import org.junit.Before;

28
tests/robotests/src/com/android/settings/accessibility/ContrastPreferenceControllerTest.java → tests/robotests/src/com/android/settings/display/ContrastPreferenceControllerTest.java
View File

@@ -14,15 +14,22 @@
* limitations under the License.
*/
package com.android.settings.accessibility;
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.accessibility.Flags;
import com.android.settings.core.BasePreferenceController;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -31,19 +38,30 @@ import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class ContrastPreferenceControllerTest {
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
private static final String PREFERENCE_KEY = "preference_key";
private Context mContext;
private ContrastPreferenceController mController;
@Before
public void setUp() {
mController = new ContrastPreferenceController(ApplicationProvider.getApplicationContext(),
PREFERENCE_KEY);
mContext = ApplicationProvider.getApplicationContext();
mController = new ContrastPreferenceController(mContext, PREFERENCE_KEY);
}
@Test
public void getAvailabilityStatus_shouldReturnUnavailable() {
@EnableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL)
public void getAvailabilityStatus_flagsEnabled_shouldReturnAvailable() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@DisableFlags(Flags.FLAG_ENABLE_COLOR_CONTRAST_CONTROL)
public void getAvailabilityStatus_flagsDisabled_shouldReturnUnsupported() {
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
}

2
tests/robotests/src/com/android/settings/accessibility/ContrastSelectorPreferenceControllerTest.java → tests/robotests/src/com/android/settings/display/ContrastSelectorPreferenceControllerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.accessibility;
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;