From 22119f516a22af7d72f3b952c2f6453bf12ec672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pomini?= Date: Fri, 10 May 2024 16:59:34 +0000 Subject: [PATCH] Remove old contrastDialog from dev options Flag: NA Bug: 333905689 Test: treehugger, manual Change-Id: I400ab2b14cf8589be97123f3bcf3b26c98009d07 --- AndroidManifest.xml | 3 - res/values/strings.xml | 6 - res/xml/development_settings.xml | 6 - .../DevelopmentSettingsDashboardFragment.java | 4 - .../theme/ContrastPreferenceController.kt | 68 ----------- .../ContrastPreferenceControllerTest.java | 113 ------------------ 6 files changed, 200 deletions(-) delete mode 100644 src/com/android/settings/theme/ContrastPreferenceController.kt delete mode 100644 tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fd9f2e50a74..bb5659012db 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3049,9 +3049,6 @@ - - - adjust color turn screen dark, turn screen light - - color contrast @@ -13168,11 +13166,7 @@ Cancel - - Contrast - Standard - Default Medium diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 4d9e6f93255..866a529dd8b 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -567,12 +567,6 @@ android:title="@string/transparent_navigation_bar" android:summary="@string/transparent_navigation_bar_summary" /> - - context.getString(R.string.contrast_high) - CONTRAST_LEVEL_MEDIUM -> context.getString(R.string.contrast_medium) - else -> context.getString(R.string.contrast_standard) - } - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java deleted file mode 100644 index d74b6dfe0a6..00000000000 --- a/tests/robotests/src/com/android/settings/theme/ContrastPreferenceControllerTest.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2023 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.theme; - -import static android.app.UiModeManager.ContrastUtils; -import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_HIGH; -import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_MEDIUM; -import static android.app.UiModeManager.ContrastUtils.CONTRAST_LEVEL_STANDARD; -import static android.provider.Settings.Secure.CONTRAST_LEVEL; - -import static com.android.settings.core.BasePreferenceController.AVAILABLE; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.UiModeManager; -import android.content.Context; -import android.provider.Settings; - -import androidx.preference.Preference; -import androidx.test.core.app.ApplicationProvider; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; -import org.robolectric.RobolectricTestRunner; - -import java.util.stream.Stream; - -@RunWith(RobolectricTestRunner.class) -public class ContrastPreferenceControllerTest { - - @Rule - public MockitoRule mocks = MockitoJUnit.rule(); - - private ContrastPreferenceController mController; - - @Mock - private UiModeManager mMockUiModeManager; - private Context mContext; - - @Before - public void setup() { - MockitoAnnotations.initMocks(this); - mContext = ApplicationProvider.getApplicationContext(); - mController = new ContrastPreferenceController(mContext, mMockUiModeManager); - } - - @Test - public void controllerIsAvailable() { - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); - } - - @Ignore("b/313614100") - @Test - public void testHandlePreferenceTreeClick() { - Preference preference = new Preference(mContext); - preference.setKey(ContrastPreferenceController.KEY); - assertThat(mController.handlePreferenceTreeClick(preference)).isTrue(); - - Preference otherPreference = new Preference(mContext); - otherPreference.setKey("wrong key"); - assertThat(mController.handlePreferenceTreeClick(otherPreference)).isFalse(); - } - - @Test - public void controllerSummary() { - float initialContrast = mContext.getSystemService(UiModeManager.class).getContrast(); - try { - allContrastValues().forEach(contrastLevel -> { - float contrast = ContrastUtils.fromContrastLevel(contrastLevel); - clearInvocations(mMockUiModeManager); - when(mMockUiModeManager.getContrast()).thenReturn(contrast); - String summary = mController.getSummary().toString(); - verify(mMockUiModeManager).getContrast(); - assertThat(summary).isEqualTo(mController.getSummary(contrastLevel)); - }); - } finally { - putContrastInSettings(initialContrast); - } - } - - private static Stream allContrastValues() { - return Stream.of(CONTRAST_LEVEL_STANDARD, CONTRAST_LEVEL_MEDIUM, CONTRAST_LEVEL_HIGH); - } - - private void putContrastInSettings(float contrast) { - Settings.Secure.putFloat(mContext.getContentResolver(), CONTRAST_LEVEL, contrast); - } -}