Snap for 4821244 from bed0aff4a21d89f0b6b2bb2351aa6e63e9f60170 to pi-release (be7f9c73) · 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 Camera laser sensor switch in Developer Options -->
		<bool name="config_show_camera_laser_sensor">false</bool>

		<!-- Whether to show logical camera default switch in Developer Options -->
		<bool name="config_show_logical_camera_default">false</bool>

		<!-- Whether to show Connected MAC Randomization in Developer Options
		as not all devices can support dynamic MAC address change. -->
		<bool name="config_wifi_support_connected_mac_randomization">false</bool>

res/values/strings.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -9115,9 +9115,6 @@
		<!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
		<string name="camera_laser_sensor_switch">Camera Laser Sensor</string>

		<!-- Title for logical camera default switch [CHAR LIMIT=NONE] -->
		<string name="logical_camera_default_switch">Logical Camera As Default</string>

		<!-- Title of the setting to disable the automatic update -->
		<string name="ota_disable_automatic_update">Automatic system updates</string>

res/xml/development_settings.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -187,10 +187,6 @@
		android:key="camera_laser_sensor_switch"
		android:title="@string/camera_laser_sensor_switch" />

		<SwitchPreference
		android:key="logical_camera_default_switch"
		android:title="@string/logical_camera_default_switch" />

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

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -404,7 +404,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new LogdSizePreferenceController(context));
		controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
		controllers.add(new CameraLaserSensorPreferenceController(context));
		controllers.add(new LogicalCameraDefaultPreferenceController(context));
		controllers.add(new WifiDisplayCertificationPreferenceController(context));
		controllers.add(new WifiVerboseLoggingPreferenceController(context));
		controllers.add(new WifiConnectedMacRandomizationPreferenceController(context));

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

deleted100644 → 0

+0 −90

Original line number	Diff line number	Diff line
		/*
		* 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 android.content.Context;
		import android.os.SystemProperties;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;
		import android.text.TextUtils;

		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 LogicalCameraDefaultPreferenceController extends DeveloperOptionsPreferenceController
		implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

		private static final String KEY_LOGICAL_CAMERA_DEFAULT_SWITCH = "logical_camera_default_switch";
		@VisibleForTesting
		static final String BUILD_TYPE = "ro.build.type";
		@VisibleForTesting
		static final String PROPERTY_LOGICAL_CAMERA_DEFAULT = "persist.camera.logical.default";
		@VisibleForTesting
		static final int ENABLED = 1;
		@VisibleForTesting
		static final int DISABLED = 0;
		@VisibleForTesting
		static final String USERDEBUG_BUILD = "userdebug";
		@VisibleForTesting
		static final String ENG_BUILD = "eng";
		@VisibleForTesting
		static final String USER_BUILD = "user";

		public LogicalCameraDefaultPreferenceController(Context context) {
		super(context);
		}

		@Override
		public boolean isAvailable() {
		return mContext.getResources().getBoolean(R.bool.config_show_logical_camera_default);
		}

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

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isEnabled = (Boolean) newValue;
		String value = Integer.toString(isEnabled ? ENABLED : DISABLED);
		SystemProperties.set(PROPERTY_LOGICAL_CAMERA_DEFAULT, value);
		return true;
		}

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

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		SystemProperties.set(PROPERTY_LOGICAL_CAMERA_DEFAULT, Integer.toString(DISABLED));
		((SwitchPreference) mPreference).setChecked(false);
		}

		private boolean isLogicalCameraDefault() {
		final String prop = SystemProperties.get(PROPERTY_LOGICAL_CAMERA_DEFAULT,
		Integer.toString(DISABLED));
		return TextUtils.equals(Integer.toString(ENABLED), prop);
		}

		}