am 615fd3df: Merge "Implement new rotation policy." into jb-dev

* commit '615fd3dff2e369d8b786abcfe41b6da988e41001':
  Implement new rotation policy.
This commit is contained in:
Jeff Brown
2012-06-05 19:14:17 -07:00
committed by Android Git Automerger
9 changed files with 270 additions and 151 deletions

View File

@ -1749,6 +1749,20 @@ public final class Settings {
*/
public static final String USER_ROTATION = "user_rotation";
/**
* Control whether the rotation lock toggle in the System UI should be hidden.
* Typically this is done for accessibility purposes to make it harder for
* the user to accidentally toggle the rotation lock while the display rotation
* has been locked for accessibility.
*
* If 0, then rotation lock toggle is not hidden for accessibility (although it may be
* unavailable for other reasons). If 1, then the rotation lock toggle is hidden.
*
* @hide
*/
public static final String HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY =
"hide_rotation_lock_toggle_for_accessibility";
/**
* Whether the phone vibrates when it is ringing due to an incoming call. This will
* be used by Phone and Setting apps; it shouldn't affect other apps.
@ -2029,6 +2043,7 @@ public final class Settings {
DATE_FORMAT,
ACCELEROMETER_ROTATION,
USER_ROTATION,
HIDE_ROTATION_LOCK_TOGGLE_FOR_ACCESSIBILITY,
DTMF_TONE_WHEN_DIALING,
DTMF_TONE_TYPE_WHEN_DIALING,
EMERGENCY_TONE,