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

resolved conflicts for 99bbec73 to master

Browse Source 
Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb
This commit is contained in:
Jorim Jaggi
2015-09-09 18:48:27 -07:00
parent 3fac92ff7e 99bbec733d
commit cb9d7a96bb
3 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/com/android/settings/DisplaySettings.java
View File

@@ -16,6 +16,7 @@
package com.android.settings;
import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
import static android.provider.Settings.Secure.DOUBLE_TAP_TO_WAKE;
import static android.provider.Settings.Secure.DOZE_ENABLED;
@@ -76,6 +77,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private static final String KEY_AUTO_ROTATE = "auto_rotate";
private static final String KEY_NIGHT_MODE = "night_mode";
private static final String KEY_CAMERA_GESTURE = "camera_gesture";
private static final String KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE
= "camera_double_tap_power_gesture";
private DropDownPreference mFontSizePref;
@@ -89,6 +92,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
private SwitchPreference mTapToWakePreference;
private SwitchPreference mAutoBrightnessPreference;
private SwitchPreference mCameraGesturePreference;
private SwitchPreference mCameraDoubleTapPowerGesturePreference;
@Override
protected int getMetricsCategory() {
@@ -156,6 +160,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
removePreference(KEY_CAMERA_GESTURE);
}
if (isCameraDoubleTapPowerGestureAvailable(getResources())) {
mCameraDoubleTapPowerGesturePreference
= (SwitchPreference) findPreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
mCameraDoubleTapPowerGesturePreference.setOnPreferenceChangeListener(this);
} else {
removePreference(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
}
if (RotationPolicy.isRotationLockToggleVisible(activity)) {
DropDownPreference rotatePreference =
(DropDownPreference) findPreference(KEY_AUTO_ROTATE);
@@ -240,6 +252,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
!SystemProperties.getBoolean("gesture.disable_camera_launch", false);
}
private static boolean isCameraDoubleTapPowerGestureAvailable(Resources res) {
return res.getBoolean(
com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
}
private void updateTimeoutPreferenceDescription(long currentTimeout) {
ListPreference preference = mScreenTimeoutPreference;
String summary;
@@ -373,11 +390,18 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
mTapToWakePreference.setChecked(value != 0);
}
// Update camera gesture if it is available.
// Update camera gesture #1 if it is available.
if (mCameraGesturePreference != null) {
int value = Settings.Secure.getInt(getContentResolver(), CAMERA_GESTURE_DISABLED, 0);
mCameraGesturePreference.setChecked(value == 0);
}
// Update camera gesture #2 if it is available.
if (mCameraDoubleTapPowerGesturePreference != null) {
int value = Settings.Secure.getInt(
getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
mCameraDoubleTapPowerGesturePreference.setChecked(value == 0);
}
}
private void updateScreenSaverSummary() {
@@ -438,6 +462,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
Settings.Secure.putInt(getContentResolver(), CAMERA_GESTURE_DISABLED,
value ? 0 : 1 /* Backwards because setting is for disabling */);
}
if (preference == mCameraDoubleTapPowerGesturePreference) {
boolean value = (Boolean) objValue;
Settings.Secure.putInt(getContentResolver(), CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
value ? 0 : 1 /* Backwards because setting is for disabling */);
}
if (preference == mNightModePreference) {
try {
final int value = Integer.parseInt((String) objValue);
@@ -496,6 +525,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
if (!isCameraGestureAvailable(context.getResources())) {
result.add(KEY_CAMERA_GESTURE);
}
if (!isCameraDoubleTapPowerGestureAvailable(context.getResources())) {
result.add(KEY_CAMERA_DOUBLE_TAP_POWER_GESTURE);
}
return result;
}
};