summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDavid van Tonder <david.vantonder@gmail.com>2013-07-10 17:22:55 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-07-10 17:22:55 -0700
commitd029fe6ef51c7b2aa8b7da00f7c060d744988588 (patch)
tree11bb0e9a1400129388f71df8c1f82a58d0292f33 /core
parentf1ceb6749a50adc7ea19b91a3497e6f317bdd347 (diff)
parent4de54dc35a55903fc449a112bb7efab0f2b77667 (diff)
downloadframeworks_base-d029fe6ef51c7b2aa8b7da00f7c060d744988588.zip
frameworks_base-d029fe6ef51c7b2aa8b7da00f7c060d744988588.tar.gz
frameworks_base-d029fe6ef51c7b2aa8b7da00f7c060d744988588.tar.bz2
Merge "Add lockscreen rotation as an optional rotation setting (1/2)" into cm-10.1
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 2e88fd3..dc06167 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2132,6 +2132,13 @@ public final class Settings {
public static final String ACCELEROMETER_ROTATION = "accelerometer_rotation";
/**
+ * Control whether the accelerometer will be used to change lockscreen
+ * orientation. If 0, it will not be used; if 1, it will be used by default.
+ * @hide
+ */
+ public static final String LOCKSCREEN_ROTATION = "lockscreen_rotation";
+
+ /**
* Control the type of rotation which can be performed using the accelerometer
* if ACCELEROMETER_ROTATION is enabled.
* Value is a bitwise combination of
@@ -3222,6 +3229,7 @@ public final class Settings {
TIME_12_24,
DATE_FORMAT,
ACCELEROMETER_ROTATION,
+ LOCKSCREEN_ROTATION,
USER_ROTATION,
DTMF_TONE_WHEN_DIALING,
DTMF_TONE_TYPE_WHEN_DIALING,