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

Merge "Adds smart autorotate setting to the system." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-02-03 06:18:42 +00:00
committed by Android (Google) Code Review
parent 6c3b1b0b76 2e533939d4
commit b5884dc67c
7 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5930,6 +5930,13 @@ public final class Settings {
*/
public static final String ADAPTIVE_SLEEP = "adaptive_sleep";
/**
* Setting key to indicate whether camera-based autorotate is enabled.
*
* @hide
*/
public static final String CAMERA_AUTOROTATE = "camera_autorotate";
/**
* @deprecated Use {@link android.provider.Settings.Global#DEVELOPMENT_SETTINGS_ENABLED}
* instead

7
core/proto/android/providers/settings/secure.proto
View File

@@ -518,6 +518,11 @@ message SecureSettingsProto {
}
optional Search search = 48;
message CameraAutorotate {
optional SettingProto enabled = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional CameraAutorotate camera_autorotate = 88;
message SpellChecker {
option (android.msg_privacy).dest = DEST_EXPLICIT;
@@ -642,5 +647,5 @@ message SecureSettingsProto {
// Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit).
// Next tag = 88;
// Next tag = 89;
}

3
core/res/res/values/config.xml
View File

@@ -517,6 +517,9 @@
<!-- Flag indicating whether we should enable smart battery. -->
<bool name="config_smart_battery_available">false</bool>
<!-- Flag indicating whether we should enable camera-based autorotate -->
<bool name="config_camera_autorotate">false</bool>
<!-- Fast brightness animation ramp rate in brightness units per second-->
<integer translatable="false" name="config_brightness_ramp_rate_fast">180</integer>

1
core/res/res/values/symbols.xml
View File

@@ -1881,6 +1881,7 @@
<java-symbol type="bool" name="config_enableServerNotificationEffectsForAutomotive" />
<java-symbol type="bool" name="config_useAttentionLight" />
<java-symbol type="bool" name="config_adaptive_sleep_available" />
<java-symbol type="bool" name="config_camera_autorotate"/>
<java-symbol type="bool" name="config_animateScreenLights" />
<java-symbol type="bool" name="config_automatic_brightness_available" />
<java-symbol type="bool" name="config_smart_battery_available" />

1
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@@ -38,6 +38,7 @@ public class SecureSettings {
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED,
Settings.Secure.ADAPTIVE_SLEEP,
Settings.Secure.CAMERA_AUTOROTATE,
Settings.Secure.AUTOFILL_SERVICE,
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,
Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES,

1
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@@ -57,6 +57,7 @@ public class SecureSettingsValidators {
VALIDATORS.put(
Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.ADAPTIVE_SLEEP, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.CAMERA_AUTOROTATE, BOOLEAN_VALIDATOR);
VALIDATORS.put(Secure.AUTOFILL_SERVICE, NULLABLE_COMPONENT_NAME_VALIDATOR);
VALIDATORS.put(
Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE,

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -1969,6 +1969,12 @@ class SettingsProtoDumpUtil {
Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING,
SecureSettingsProto.BLUETOOTH_ON_WHILE_DRIVING);
final long smartAutoRotateToken = p.start(SecureSettingsProto.CAMERA_AUTOROTATE);
dumpSetting(s, p,
Settings.Secure.CAMERA_AUTOROTATE,
SecureSettingsProto.CameraAutorotate.ENABLED);
p.end(smartAutoRotateToken);
final long cameraToken = p.start(SecureSettingsProto.CAMERA);
dumpSetting(s, p,
Settings.Secure.CAMERA_GESTURE_DISABLED,