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

Settings: Show HAL HDR+ option in user build

Browse Source 
Test: CameraHalHdrPlusPreferenceControllerV2Test
Bug: 66919557
Change-Id: Ibaadf1b24ba82a8440aae9058397c96db6f24188
This commit is contained in:
Chien-Yu Chen
2017-09-27 13:31:49 -07:00
parent 2d479598f0
commit bb41a76256
2 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java
View File

@@ -40,12 +40,6 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends
static final String ENABLED = "1"; static final String ENABLED = "1";
@VisibleForTesting @VisibleForTesting
static final String DISABLED = "0"; static final String DISABLED = "0";
@VisibleForTesting
static final String USERDEBUG_BUILD = "userdebug";
@VisibleForTesting
static final String ENG_BUILD = "eng";
@VisibleForTesting
static final String USER_BUILD = "user";
private SwitchPreference mPreference; private SwitchPreference mPreference;
@@ -57,9 +51,7 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends
public boolean isAvailable() { public boolean isAvailable() {
final String buildType = SystemProperties.get(BUILD_TYPE); final String buildType = SystemProperties.get(BUILD_TYPE);
return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus) && return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);
(TextUtils.equals(USERDEBUG_BUILD, buildType) ||
TextUtils.equals(ENG_BUILD, buildType));
} }
@Override @Override

31
tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java
View File

@@ -16,11 +16,6 @@
package com.android.settings.development; package com.android.settings.development;
import static com.android.settings.development.CameraHalHdrPlusPreferenceControllerV2.ENG_BUILD;
import static com.android.settings.development
.CameraHalHdrPlusPreferenceControllerV2.USERDEBUG_BUILD;
import static com.android.settings.development.CameraHalHdrPlusPreferenceControllerV2.USER_BUILD;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -57,6 +52,8 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
private Context mContext; private Context mContext;
private CameraHalHdrPlusPreferenceControllerV2 mController; private CameraHalHdrPlusPreferenceControllerV2 mController;
static final String USERDEBUG_BUILD = "userdebug";
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
@@ -81,30 +78,6 @@ public class CameraHalHdrPlusPreferenceControllerV2Test {
assertThat(mController.isAvailable()).isFalse(); assertThat(mController.isAvailable()).isFalse();
} }
@Test
public void isAvailable_withUserdebugBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USERDEBUG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_withEngBuild_shouldReturnTrue() {
SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, ENG_BUILD);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_withUserBuild_shouldReturnFalse() {
SettingsShadowSystemProperties.set(
CameraHalHdrPlusPreferenceControllerV2.BUILD_TYPE, USER_BUILD);
assertThat(mController.isAvailable()).isFalse();
}
@Test @Test
public void updateState_cameraHalHdrPlusEnabled_shouldCheckedPreference() { public void updateState_cameraHalHdrPlusEnabled_shouldCheckedPreference() {
SettingsShadowSystemProperties.set( SettingsShadowSystemProperties.set(