diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:45:01 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:45:01 +0100 |
| commit | c65088b68e9bb0aa97768c536822c6b82cc86b6f (patch) | |
| tree | 6f1f1189764a238d417ed7d2f742a56f78507ad9 /packages/SettingsProvider | |
| parent | a57394a0be5e601c447a07786487bd4c34b0d899 (diff) | |
| parent | 4ba10939b7c05e4cf44d053ee8fa37a703c19e9b (diff) | |
| download | frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.zip frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.tar.gz frameworks_base-c65088b68e9bb0aa97768c536822c6b82cc86b6f.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 10 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index a3a5aaa..e9169bf 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -29,13 +29,6 @@ <bool name="def_auto_time">true</bool> <bool name="def_auto_time_zone">true</bool> <bool name="def_accelerometer_rotation">true</bool> - <!-- Bitmask of allowed display rotation angles: - ROTATION_0_MODE: 1 - ROTATION_90_MODE: 2 - ROTATION_180_MODE: 4 - ROTATION_270_MODE: 8 - Default to 0, 90, 270. --> - <integer name="def_accelerometer_rotation_angles">11</integer> <!-- 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> @@ -230,9 +223,6 @@ <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT --> <string name="def_nfc_payment_component"></string> - <!-- Default for Settings.System.STATUS_BAR_NOTIF_COUNT. --> - <integer name="def_notif_count">0</integer> - <!-- Default protected sms originating address values of Settings.Secure.PROTECTED_SMS_ADDRESSES --> <string-array name="def_protected_sms_list_values"></string-array> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index fe6b079..a57ddc1 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2586,9 +2586,6 @@ class DatabaseHelper extends SQLiteOpenHelper { loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION, R.bool.def_accelerometer_rotation); - loadIntegerSetting(stmt, Settings.System.ACCELEROMETER_ROTATION_ANGLES, - R.integer.def_accelerometer_rotation_angles); - loadDefaultHapticSettings(stmt); loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE, |