Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb41a762 authored by Chien-Yu Chen's avatar Chien-Yu Chen
Browse files

Settings: Show HAL HDR+ option in user build 

Test: CameraHalHdrPlusPreferenceControllerV2Test
Bug: 66919557
Change-Id: Ibaadf1b24ba82a8440aae9058397c96db6f24188
parent 2d479598

src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2.java

+1 −9
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends 
    static final String ENABLED = "1";

    @VisibleForTesting

    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;
@@ -57,9 +51,7 @@ public class CameraHalHdrPlusPreferenceControllerV2 extends 
    public boolean isAvailable() {

        final String buildType = SystemProperties.get(BUILD_TYPE);



        return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus) &&

                (TextUtils.equals(USERDEBUG_BUILD, buildType) ||

                        TextUtils.equals(ENG_BUILD, buildType));

        return mContext.getResources().getBoolean(R.bool.config_show_camera_hal_hdrplus);

    }



    @Override

tests/robotests/src/com/android/settings/development/CameraHalHdrPlusPreferenceControllerV2Test.java

+2 −29
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 


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 org.mockito.Mockito.verify;
@@ -57,6 +52,8 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { 
    private Context mContext;

    private CameraHalHdrPlusPreferenceControllerV2 mController;



    static final String USERDEBUG_BUILD = "userdebug";



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);
@@ -81,30 +78,6 @@ public class CameraHalHdrPlusPreferenceControllerV2Test { 
        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

    public void updateState_cameraHalHdrPlusEnabled_shouldCheckedPreference() {

        SettingsShadowSystemProperties.set(