Introduce CameraLaserSensorPreferenceControllerV2

- Create new CameraLaserSensorPreferenceControllerV2
 - Copy logic from CameraLaserSensorPreferenceController with slight
 modifications for dashboard fragment compatibility
 - Deprecate CameraLaserSensorPreferenceController

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8854d3e891afab607025a427a376e33e9b61dcc3
This commit is contained in:
jeffreyhuang
2017-09-25 10:19:51 -07:00
parent 4466843b80
commit c215b3c4e9
7 changed files with 292 additions and 1 deletions

View File

@@ -28,6 +28,10 @@ import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
/**
* deprecated in favor of {@link CameraLaserSensorPreferenceControllerV2}
*/
@Deprecated
public class CameraLaserSensorPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {

View File

@@ -0,0 +1,108 @@
/*
* 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 com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
public class CameraLaserSensorPreferenceControllerV2 extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener {
private static final String KEY_CAMERA_LASER_SENSOR_SWITCH = "camera_laser_sensor_switch";
@VisibleForTesting
static final String BUILD_TYPE = "ro.build.type";
@VisibleForTesting
static final String PROPERTY_CAMERA_LASER_SENSOR = "persist.camera.stats.disablehaf";
@VisibleForTesting
static final int ENABLED = 0;
@VisibleForTesting
static final int DISABLED = 2;
@VisibleForTesting
static final String USERDEBUG_BUILD = "userdebug";
@VisibleForTesting
static final String ENG_BUILD = "eng";
@VisibleForTesting
static final String USER_BUILD = "user";
private SwitchPreference mPreference;
public CameraLaserSensorPreferenceControllerV2(Context context) {
super(context);
}
@Override
public boolean isAvailable() {
final String buildType = SystemProperties.get(BUILD_TYPE);
return mContext.getResources().getBoolean(R.bool.config_show_camera_laser_sensor) &&
(TextUtils.equals(USERDEBUG_BUILD, buildType) || TextUtils.equals(ENG_BUILD,
buildType));
}
@Override
public String getPreferenceKey() {
return KEY_CAMERA_LASER_SENSOR_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;
String value = Integer.toString(isEnabled ? ENABLED : DISABLED);
SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, value);
return true;
}
@Override
public void updateState(Preference preference) {
final boolean enabled = isLaserSensorEnabled();
mPreference.setChecked(enabled);
}
@Override
protected void onDeveloperOptionsSwitchEnabled() {
mPreference.setEnabled(true);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
SystemProperties.set(PROPERTY_CAMERA_LASER_SENSOR, Integer.toString(DISABLED));
mPreference.setChecked(false);
mPreference.setEnabled(false);
}
private boolean isLaserSensorEnabled() {
final String prop = SystemProperties.get(PROPERTY_CAMERA_LASER_SENSOR,
Integer.toString(ENABLED));
return TextUtils.equals(Integer.toString(ENABLED), prop);
}
}

View File

@@ -199,7 +199,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
// logger buffer sizes
// store logger data persistently on device
// telephony monitor
// camera laser sensor
controllers.add(new CameraLaserSensorPreferenceControllerV2(context));
// camera HAL HDR+
// feature flags
// wireless display certification