Merge "Settings: Remove HAL HDR+ option" (684e8b89) · Commits · e / os / android_packages_apps_Settings

res/values/config.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -41,9 +41,6 @@
		<!-- Whether to show Connectivity Monitor switch in Developer Options -->
		<bool name="config_show_connectivity_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
		@@ -8277,12 +8277,6 @@
		<!-- Toast message letting the user know the how to apply connectivity monitor change -->
		<string name="connectivity_monitor_toast">To apply connectivity 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
		@@ -172,10 +172,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" />

		<Preference
		android:key="feature_flags_dashboard"
		android:title="@string/feature_flags_dashboard_title"

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

deleted100644 → 0

+0 −109

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;

		/**
		* deprecated in favor of {@link CameraHalHdrPlusPreferenceControllerV2}
		*/
		@Deprecated
		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/CameraHalHdrplusPreferenceControllerV2.java

deleted100644 → 0

+0 −100

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.text.TextUtils;
		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.development.DeveloperOptionsPreferenceController;

		public class CameraHalHdrplusPreferenceControllerV2 extends
		DeveloperOptionsPreferenceController implements
		Preference.OnPreferenceChangeListener, 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 CameraHalHdrplusPreferenceControllerV2(Context context) {
		super(context);
		}

		@Override
		public boolean isAvailable() {
		final String buildType = SystemProperties.get(BUILD_TYPE);

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

		@Override
		public String getPreferenceKey() {
		return KEY_CAMERA_HAL_HDRPLUS_SWITCH;
		}

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);

		mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isEnabled = (Boolean) newValue;
		SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS, isEnabled ? ENABLED : DISABLED);
		Toast.makeText(mContext, R.string.camera_hal_hdrplus_toast, Toast.LENGTH_LONG).show();
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		final boolean enabled = isHalHdrplusEnabled();
		mPreference.setChecked(enabled);
		}

		@Override
		protected void onDeveloperOptionsSwitchEnabled() {
		mPreference.setEnabled(true);
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		SystemProperties.set(PROPERTY_CAMERA_HAL_HDRPLUS, DISABLED);
		mPreference.setChecked(false);
		mPreference.setEnabled(false);
		}

		private boolean isHalHdrplusEnabled() {
		return SystemProperties.getBoolean(PROPERTY_CAMERA_HAL_HDRPLUS, true /* default */);
		}
		}