From: Michael Wright <michaelwr@google.com>
Date: Fri, 25 May 2018 23:31:20 +0000 (+0100)
Subject: Add per-device defaults for VIBRATE_WHEN_RINGING
X-Git-Tag: android-x86-9.0-r1~98^2~14^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0e9eeee0dd50325362e2c8132f43f512551e604b;p=android-x86%2Fframeworks-base.git

Add per-device defaults for VIBRATE_WHEN_RINGING

Some devices have hand-crafted, artisanal haptics to go along with the
dulcet tones of the ringer. When making such a device, we really want
our users to have the opportunity to appreciate the fine buzzes and
clicks we spent so long orchestrating, and so this makes it possible to
default VIBRATE_WHEN_RINGING on.

Bug: 79212179
Test: manual
Change-Id: I52bf133345bd3e8b09b591b9bac4711d0d485094
---

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 28e8db9e488b..e1a602b53d9d 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -214,4 +214,7 @@
 
     <!-- Default for Settings.Global.BACKUP_AGENT_TIMEOUT_PARAMETERS -->
     <string name="def_backup_agent_timeout_parameters"></string>
+
+    <!-- Default for Settings.System.VIBRATE_WHEN_RINGING -->
+    <bool name="def_vibrate_when_ringing">false</bool>
 </resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index fbe52d191c30..960d30524b95 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2935,7 +2935,7 @@ public class SettingsProvider extends ContentProvider {
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 168;
+            private static final int SETTINGS_VERSION = 169;
 
             private final int mUserId;
 
@@ -3805,6 +3805,21 @@ public class SettingsProvider extends ContentProvider {
                     currentVersion = 168;
                 }
 
+                if (currentVersion == 168) {
+                    // Version 168: by default, vibrate for phone calls
+                    final SettingsState systemSettings = getSystemSettingsLocked(userId);
+                    final Setting currentSetting = systemSettings.getSettingLocked(
+                            Settings.System.VIBRATE_WHEN_RINGING);
+                    if (currentSetting.isNull()) {
+                        systemSettings.insertSettingLocked(
+                                Settings.System.VIBRATE_WHEN_RINGING,
+                                getContext().getResources().getBoolean(
+                                        R.bool.def_vibrate_when_ringing) ? "1" : "0",
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+                    currentVersion = 169;
+                }
+
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {