Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Add a secure setting for double twist gesture for camera flip.\" into nyc-mr1-dev

Browse Source 
am: 3e869587e8

Change-Id: If64a188d45beea48d264219df8a9c7bce63bcecf
This commit is contained in:
Doris Ling
2016-07-09 00:03:08 +00:00
committed by android-build-merger
parent 4b09c6bc9e 3e869587e8
commit b8d3caf4b8
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/provider/Settings.java
View File

@@ -6146,6 +6146,15 @@ public final class Settings {
public static final String CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED =
"camera_double_tap_power_gesture_disabled";
/**
* Whether the camera double twist gesture to flip between front and back mode should be
* enabled.
*
* @hide
*/
public static final String CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED =
"camera_double_twist_to_flip_enabled";
/**
* Control whether Night display is currently activated.
* @hide
@@ -6300,6 +6309,14 @@ public final class Settings {
"automatic_storage_manager_last_run";
/**
* Whether SystemUI navigation keys is enabled.
* @hide
*/
public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
"system_navigation_keys_enabled";
/**
* This are the settings to be backed up.
*
@@ -9113,13 +9130,6 @@ public final class Settings {
*/
public static final String MAX_NOTIFICATION_ENQUEUE_RATE = "max_notification_enqueue_rate";
/**
* Whether SystemUI navigation keys is enabled.
* @hide
*/
public static final String SYSTEM_NAVIGATION_KEYS_ENABLED =
"system_navigation_keys_enabled";
/**
* Whether cell is enabled/disabled
* @hide

4
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -7280,8 +7280,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
private boolean areSystemNavigationKeysEnabled() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.SYSTEM_NAVIGATION_KEYS_ENABLED, 1) == 1;
return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 1) == 1;
}
@Override