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

Commit dfa402ef authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by android-build-team Robot
Browse files

Settings: Remove HAL HDR+ option 

Test: RunSettingsRoboTests
Bug: 68223991
Merged-In: I9eb27c7e205ac005c6a71726e125ed1e512da33b
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
(cherry picked from commit 7bae2054)
parent 921a0078

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ 
    <!-- Whether to show TelphonyMonitor switch in Developer Options -->

    <bool name="config_show_telephony_monitor">false</bool>



    <!-- Whether to show Camera HAL HDR+ switch in Developer Options -->

    <bool name="config_show_camera_hal_hdrplus">false</bool>



    <!-- Whether to show Camera laser sensor switch in Developer Options -->

    <bool name="config_show_camera_laser_sensor">false</bool>

res/values/strings.xml

+0 −6
Original line number Diff line number Diff line
@@ -8237,12 +8237,6 @@ 
    <!-- Toast message letting the user know the how to trigger telephony monitor -->

    <string name="telephony_monitor_toast">To apply telephony monitor change, reboot device</string>









    <!-- Title for Camera HAL HDR+ switch [CHAR LIMIT=50] -->









    <string name="camera_hal_hdrplus_switch">Camera HAL HDR+</string>

















    <!-- Toast message letting the user know how to enable Camera HAL HDR+ -->









    <string name="camera_hal_hdrplus_toast">To apply Camera HAL HDR+ change, reboot device</string>

















    <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->









    <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>

































res/xml/development_prefs.xml



+0
−4






























Original line number
Diff line number
Diff line







@@ -167,10 +167,6 @@







            android:key="camera_laser_sensor_switch"









            android:title="@string/camera_laser_sensor_switch" />



















        <SwitchPreference









            android:key="camera_hal_hdrplus_switch"









            android:title="@string/camera_hal_hdrplus_switch" />



















    </PreferenceCategory>



















    <PreferenceCategory android:key="debug_networking_category"
































src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
deleted100644 → 0



+0
−105






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2017 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 android.content.Context;









import android.os.SystemProperties;









import android.support.v14.preference.SwitchPreference;









import android.support.v7.preference.Preference;









import android.support.v7.preference.PreferenceScreen;









import android.widget.Toast;



















import com.android.internal.annotations.VisibleForTesting;









import com.android.settings.R;









import com.android.settings.core.PreferenceControllerMixin;









import com.android.settingslib.core.AbstractPreferenceController;



















public class CameraHalHdrplusPreferenceController extends AbstractPreferenceController









        implements PreferenceControllerMixin {



















    private static final String KEY_CAMERA_HAL_HDRPLUS_SWITCH = "camera_hal_hdrplus_switch";









    @VisibleForTesting









    static final String BUILD_TYPE = "ro.build.type";









    @VisibleForTesting









    static final String PROPERTY_CAMERA_HAL_HDRPLUS = "persist.camera.hdrplus.enable";









    @VisibleForTesting









    static final String ENABLED = "1";









    @VisibleForTesting









    static final String DISABLED = "0";



















    private SwitchPreference mPreference;



















    public CameraHalHdrplusPreferenceController(Context context) {









        super(context);









    }



















    @Override









    public void displayPreference(PreferenceScreen screen) {









        super.displayPreference(screen);









        if (isAvailable()) {









            mPreference = (SwitchPreference) screen.findPreference(KEY_CAMERA_HAL_HDRPLUS_SWITCH);









            mPreference.setChecked(isHalHdrplusEnabled());









        }









    }



















    @Override









    public String getPreferenceKey() {









        return KEY_CAMERA_HAL_HDRPLUS_SWITCH;









    }



















    @Override









    public boolean isAvailable() {









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









    }



















    @Override









    public void updateState(Preference preference) {









        updatePreference();









    }



















    @Override









    public boolean handlePreferenceTreeClick(Preference preference) {









        if (KEY_CAMERA_HAL_HDRPLUS_SWITCH.equals(preference.getKey())) {









            final SwitchPreference switchPreference = (SwitchPreference)preference;









            SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS,









                    switchPreference.isChecked() ? ENABLED : DISABLED);









            Toast.makeText(mContext, R.string.camera_hal_hdrplus_toast,









                    Toast.LENGTH_LONG).show();









            return true;









        }









        return false;









    }



















    public void enablePreference(boolean enabled) {









        if (isAvailable()) {









            mPreference.setEnabled(enabled);









        }









    }



















    public boolean updatePreference() {









        if (!isAvailable()) {









            return false;









        }









        final boolean enabled = isHalHdrplusEnabled();









        mPreference.setChecked(enabled);









        return enabled;









    }



















    private boolean isHalHdrplusEnabled() {









        return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, true);









    }









}
























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



+0
−9






























Original line number
Diff line number
Diff line







@@ -364,7 +364,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment







    private BugReportPreferenceController mBugReportController;









    private BugReportInPowerPreferenceController mBugReportInPowerController;









    private TelephonyMonitorPreferenceController mTelephonyMonitorController;









    private CameraHalHdrplusPreferenceController mCameraHalHdrplusController;









    private CameraLaserSensorPreferenceController mCameraLaserSensorController;



















    private BroadcastReceiver mEnableAdbReceiver;








@@ -406,7 +405,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment







        mTelephonyMonitorController = new TelephonyMonitorPreferenceController(getActivity());









        mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());









        mVerifyAppsOverUsbController = new VerifyAppsOverUsbPreferenceController(getActivity());









        mCameraHalHdrplusController = new CameraHalHdrplusPreferenceController(getActivity());









        mCameraLaserSensorController = new CameraLaserSensorPreferenceController(getActivity());



















        setIfOnlyAvailableForAdmins(true);








@@ -440,7 +438,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment







        mBugReportInPowerController.displayPreference(getPreferenceScreen());









        mTelephonyMonitorController.displayPreference(getPreferenceScreen());









        mWebViewAppPrefController.displayPreference(getPreferenceScreen());









        mCameraHalHdrplusController.displayPreference(getPreferenceScreen());









        mEnableAdbController.displayPreference(getPreferenceScreen());



















        mCameraLaserSensorController.displayPreference(getPreferenceScreen());








@@ -663,7 +660,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment







        mBugReportInPowerController.enablePreference(enabled);









        mTelephonyMonitorController.enablePreference(enabled);









        mWebViewAppPrefController.enablePreference(enabled);









        mCameraHalHdrplusController.enablePreference(enabled);









        mCameraLaserSensorController.enablePreference(enabled);









        updateAllOptions();









    }








@@ -798,7 +794,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment







        }









        mHaveDebugSettings |= mBugReportInPowerController.updatePreference();









        mHaveDebugSettings |= mTelephonyMonitorController.updatePreference();









        mHaveDebugSettings |= mCameraHalHdrplusController.updatePreference();









        mHaveDebugSettings |= mCameraLaserSensorController.updatePreference();









        updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,









                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);








@@ -2469,10 +2464,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment







            return true;









        }



















        if (mCameraHalHdrplusController.handlePreferenceTreeClick(preference)) {









            return true;









        }



















        if (mEnableAdbController.handlePreferenceTreeClick(preference)) {









            return true;









        }