PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev

Browse Source 
am: fa3af7b0e7

Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
This commit is contained in:
Chien-Yu Chen
2017-12-03 03:28:40 +00:00
committed by android-build-merger
parent c8d91c6066 fa3af7b0e7
commit 890c9a7ad3
6 changed files with 0 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/com/android/settings/development/CameraHalHdrplusPreferenceController.java
View File

@@ -1,105 +0,0 @@
/*
* 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);
}
}

9
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -366,7 +366,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private BugReportPreferenceController mBugReportController;
private BugReportInPowerPreferenceController mBugReportInPowerController;
private TelephonyMonitorPreferenceController mTelephonyMonitorController;
private CameraHalHdrplusPreferenceController mCameraHalHdrplusController;
private CameraLaserSensorPreferenceController mCameraLaserSensorController;
private BroadcastReceiver mEnableAdbReceiver;
@@ -408,7 +407,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);
@@ -442,7 +440,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mBugReportInPowerController.displayPreference(getPreferenceScreen());
mTelephonyMonitorController.displayPreference(getPreferenceScreen());
mWebViewAppPrefController.displayPreference(getPreferenceScreen());
mCameraHalHdrplusController.displayPreference(getPreferenceScreen());
mEnableAdbController.displayPreference(getPreferenceScreen());
mCameraLaserSensorController.displayPreference(getPreferenceScreen());
@@ -667,7 +664,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mBugReportInPowerController.enablePreference(enabled);
mTelephonyMonitorController.enablePreference(enabled);
mWebViewAppPrefController.enablePreference(enabled);
mCameraHalHdrplusController.enablePreference(enabled);
mCameraLaserSensorController.enablePreference(enabled);
updateAllOptions();
}
@@ -802,7 +798,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);
@@ -2481,10 +2476,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
return true;
}
if (mCameraHalHdrplusController.handlePreferenceTreeClick(preference)) {
return true;
}
if (mEnableAdbController.handlePreferenceTreeClick(preference)) {
return true;
}