From 6cd426482e544fe9520dbf374e14343848802178 Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Thu, 31 May 2018 22:29:29 +0000 Subject: [PATCH] Revert "Settings: Add logical camera default switch" This reverts commit 5aab8d9ee126398972dd19ba57c19aa3122090fe. Reason for revert: This setting is for internal QC purpose only Bug: 80007047 Change-Id: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2 --- res/values/config.xml | 3 - res/values/strings.xml | 3 - res/xml/development_settings.xml | 4 - .../DevelopmentSettingsDashboardFragment.java | 1 - ...icalCameraDefaultPreferenceController.java | 90 ----------- tests/robotests/res/values-mcc999/config.xml | 1 - tests/robotests/res/values/config.xml | 3 +- ...CameraDefaultPreferenceControllerTest.java | 140 ------------------ 8 files changed, 1 insertion(+), 244 deletions(-) delete mode 100644 src/com/android/settings/development/LogicalCameraDefaultPreferenceController.java delete mode 100644 tests/robotests/src/com/android/settings/development/LogicalCameraDefaultPreferenceControllerTest.java diff --git a/res/values/config.xml b/res/values/config.xml index 284b653a24d..e204b7fd7ec 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -44,9 +44,6 @@ false - - false - false diff --git a/res/values/strings.xml b/res/values/strings.xml index e0318670c67..c7e5436241e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9100,9 +9100,6 @@ Camera Laser Sensor - - Logical Camera As Default - Automatic system updates diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 0c3e5785d1f..2e549046be1 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -192,10 +192,6 @@ android:key="camera_laser_sensor_switch" android:title="@string/camera_laser_sensor_switch" /> - - false false true - false diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml index 8ea12219315..359df6cc0a5 100644 --- a/tests/robotests/res/values/config.xml +++ b/tests/robotests/res/values/config.xml @@ -22,5 +22,4 @@ true true true - true - + \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/development/LogicalCameraDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogicalCameraDefaultPreferenceControllerTest.java deleted file mode 100644 index 2d052512097..00000000000 --- a/tests/robotests/src/com/android/settings/development/LogicalCameraDefaultPreferenceControllerTest.java +++ /dev/null @@ -1,140 +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.development; - -import static com.android.settings.development.LogicalCameraDefaultPreferenceController.ENG_BUILD; -import static com.android.settings.development.LogicalCameraDefaultPreferenceController.USERDEBUG_BUILD; -import static com.android.settings.development.LogicalCameraDefaultPreferenceController.USER_BUILD; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; - -import com.android.settings.testutils.SettingsRobolectricTestRunner; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; - -@RunWith(SettingsRobolectricTestRunner.class) -public class LogicalCameraDefaultPreferenceControllerTest { - - @Mock - private PreferenceScreen mScreen; - @Mock - private SwitchPreference mPreference; - - private LogicalCameraDefaultPreferenceController mController; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mController = new LogicalCameraDefaultPreferenceController(RuntimeEnvironment.application); - when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); - when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); - mController.displayPreference(mScreen); - } - - @Test - @Config(qualifiers = "mcc999") - public void isAvailable_withConfigNoShow_shouldReturnFalse() { - assertThat(mController.isAvailable()).isFalse(); - } - - @Test - public void isAvailable_withUserdebugBuild_shouldReturnTrue() { - SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); - - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void isAvailable_withEngBuild_shouldReturnTrue() { - SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, ENG_BUILD); - - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void isAvailable_withUserBuild_shouldReturnTrue() { - SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, USER_BUILD); - - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void updateState_logicalCameraDefaultEnabled_shouldCheckedPreference() { - SystemProperties.set(LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT, - Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED)); - SystemProperties.set(LogicalCameraDefaultPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); - - mController.updateState(mScreen); - - verify(mPreference).setChecked(true); - } - - @Test - public void updateState_logicalCameraDefaultEnabled_shouldUncheckedPreference() { - SystemProperties.set(LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT, - Integer.toString(LogicalCameraDefaultPreferenceController.DISABLED)); - SystemProperties.set( - LogicalCameraDefaultPreferenceController.BUILD_TYPE, USERDEBUG_BUILD); - - mController.updateState(mScreen); - - verify(mPreference).setChecked(false); - } - - @Test - public void onPreferenceChange_preferenceChecked_shouldEnableLogicalCameraDefault() { - mController.onPreferenceChange(mPreference, true); - - assertThat(Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED)).isEqualTo( - SystemProperties.get( - LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT, - Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED))); - } - - @Test - public void onPreferenceChange_preferenceUnchecked_shouldDisableLogicalCameraDefault() { - mController.onPreferenceChange(mPreference, false); - - assertThat(Integer.toString(LogicalCameraDefaultPreferenceController.DISABLED)).isEqualTo( - SystemProperties.get( - LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT, - Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED))); - } - - @Test - public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() { - mController.onDeveloperOptionsSwitchDisabled(); - - verify(mPreference).setEnabled(false); - verify(mPreference).setChecked(false); - assertThat(Integer.toString(LogicalCameraDefaultPreferenceController.DISABLED)).isEqualTo( - SystemProperties.get( - LogicalCameraDefaultPreferenceController.PROPERTY_LOGICAL_CAMERA_DEFAULT, - Integer.toString(LogicalCameraDefaultPreferenceController.ENABLED))); - } -}