OSDN Git Service

Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
authorJulia Reynolds <juliacr@google.com>
Mon, 9 Apr 2018 19:18:36 +0000 (12:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 19:18:36 +0000 (12:18 -0700)
am: 2b5d069d4b

Change-Id: I1e0eac8dfb3f9dde02c29b540af381e45fb10eec

1  2 
res/values/strings.xml
src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
src/com/android/settings/notification/ZenModeSettings.java

Simple merge
@@@ -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;