commit 301e92a4dd71e6581935a8ccc53cb0b6b842c58b
author Beverly <beverlyt@google.com> Fri Apr 27 09:43:05 2018 -0400
committer Beverly <beverlyt@google.com> Fri May 11 09:45:04 2018 -0400
tree 89683cd2063988701cccb2eef20e72c2c4472380
parent 6982d3ee2ab5d8b2d277033bbf316d5b763150f1

Show settings suggestion

Bug: 78445134
Test: Settings tests
Change-Id: Ib66ebb3af3328ac1ffa9949282afaf800e1f1019

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 32aafea..7b76fce 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 @@
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 165;
+            private static final int SETTINGS_VERSION = 166;
 
             private final int mUserId;
 
@@ -3733,7 +3733,7 @@
                 }
 
                 if (currentVersion == 164) {
-                    // Version 164: Add a gesture for silencing phones
+                    // Version 164: show zen upgrade notification
                     final SettingsState settings = getGlobalSettingsLocked();
                     final Setting currentSetting = settings.getSettingLocked(
                             Global.SHOW_ZEN_UPGRADE_NOTIFICATION);
@@ -3747,6 +3747,36 @@
                     currentVersion = 165;
                 }
 
+                if (currentVersion == 165) {
+                    // Version 165: Show zen settings suggestion and zen updated
+                    final SettingsState settings = getGlobalSettingsLocked();
+                    final Setting currentSetting = settings.getSettingLocked(
+                            Global.SHOW_ZEN_SETTINGS_SUGGESTION);
+                    if (currentSetting.isNull()) {
+                        settings.insertSettingLocked(
+                                Global.SHOW_ZEN_SETTINGS_SUGGESTION, "1",
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+
+                    final Setting currentUpdatedSetting = settings.getSettingLocked(
+                            Global.ZEN_SETTINGS_UPDATED);
+                    if (currentUpdatedSetting.isNull()) {
+                        settings.insertSettingLocked(
+                                Global.ZEN_SETTINGS_UPDATED, "0",
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+
+                    final Setting currentSettingSuggestionViewed = settings.getSettingLocked(
+                            Global.ZEN_SETTINGS_SUGGESTION_VIEWED);
+                    if (currentSettingSuggestionViewed.isNull()) {
+                        settings.insertSettingLocked(
+                                Global.ZEN_SETTINGS_SUGGESTION_VIEWED, "0",
+                                null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+                    }
+
+                    currentVersion = 166;
+                }
+
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {