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

Merge "Make autorotate off by default for new installs and upgrades"

Browse Source
This commit is contained in:
Mike Digman
2018-01-17 02:20:13 +00:00
committed by Android (Google) Code Review
parent 304b339c77 4af4a6f042
commit 45dba069be
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -28,7 +28,7 @@
<string name="def_bluetooth_disabled_profiles" translatable="false">0</string>
<bool name="def_auto_time">true</bool>
<bool name="def_auto_time_zone">true</bool>
<bool name="def_accelerometer_rotation">true</bool>
<bool name="def_accelerometer_rotation">false</bool>
<!-- Default screen brightness, from 0 to 255. 102 is 40%. -->
<integer name="def_screen_brightness">102</integer>
<bool name="def_screen_brightness_automatic_mode">false</bool>

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

@@ -2945,7 +2945,7 @@ public class SettingsProvider extends ContentProvider {
}
private final class UpgradeController {
private static final int SETTINGS_VERSION = 150;
private static final int SETTINGS_VERSION = 151;
private final int mUserId;
@@ -3538,6 +3538,18 @@ public class SettingsProvider extends ContentProvider {
currentVersion = 150;
}
if (currentVersion == 150) {
// Version 151: Reset rotate locked setting for upgrading users
final SettingsState systemSettings = getSystemSettingsLocked(userId);
systemSettings.insertSettingLocked(
Settings.System.ACCELEROMETER_ROTATION,
getContext().getResources().getBoolean(
R.bool.def_accelerometer_rotation) ? "1" : "0",
null, true, SettingsState.SYSTEM_PACKAGE_NAME);
currentVersion = 151;
}
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {