From: Julia Reynolds <juliacr@google.com>
Date: Mon, 9 Apr 2018 19:18:36 +0000 (-0700)
Subject: Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=65fe2137d8188c2ba3de0ce90acb9d3279ddd09b;p=android-x86%2Fpackages-apps-Settings.git

Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
am: 2b5d069d4b

Change-Id: I1e0eac8dfb3f9dde02c29b540af381e45fb10eec
---

65fe2137d8188c2ba3de0ce90acb9d3279ddd09b
diff --cc src/com/android/settings/notification/ZenModeSettings.java
index 97aafdb366,3d4258d2d2..41d345fda3
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@@ -40,8 -40,18 +41,19 @@@ import java.util.List
  import java.util.Map;
  import java.util.Map.Entry;
  
 +@SearchIndexable
  public class ZenModeSettings extends ZenModeSettingsBase {
+     private static final String KEY_SOUND = "zen_effect_sound";
+     @Override
+     public void onResume() {
+         super.onResume();
+         CheckBoxPreference soundPreference =
+                 (CheckBoxPreference) getPreferenceScreen().findPreference(KEY_SOUND);
+         if (soundPreference != null) {
+             soundPreference.setChecked(true);
+         }
+     }
+ 
      @Override
      protected int getPreferenceScreenResId() {
          return R.xml.zen_mode_settings;