PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove duplicates from sound settings" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-17 18:29:53 +00:00
committed by Android (Google) Code Review
parent 4bd0f411ce 06976317cb
commit 3abeba07d3
5 changed files with 127 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/notification/SoundSettings.java
View File

@@ -43,6 +43,7 @@ import java.util.List;
public class SoundSettings extends DashboardFragment {
private static final String TAG = "SoundSettings";
private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
private static final String SELECTED_PREFERENCE_KEY = "selected_preference";
private static final int REQUEST_CODE = 200;
@@ -187,7 +188,7 @@ public class SoundSettings extends DashboardFragment {
final List<PreferenceController> controllers = new ArrayList<>();
controllers.add(new ZenModePreferenceController(context));
controllers.add(new EmergencyBroadcastPreferenceController(
context, "cell_broadcast_settings"));
context, KEY_CELL_BROADCAST_SETTINGS));
controllers.add(new VibrateWhenRingPreferenceController(context));
// === Volumes ===
@@ -236,6 +237,16 @@ public class SoundSettings extends DashboardFragment {
return buildPreferenceControllers(context, null /* fragment */,
null /* callback */, null /* lifecycle */);
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
// Duplicate results
keys.add((new ZenModePreferenceController(context)).getPreferenceKey());
keys.add(ZenModeSettings.KEY_VISUAL_SETTINGS);
keys.add(KEY_CELL_BROADCAST_SETTINGS);
return keys;
}
};
// === Work Sound Settings ===

4
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -53,8 +53,10 @@ import java.util.Map;
import java.util.Map.Entry;
public class ZenModeSettings extends ZenModeSettingsBase {
public static final String KEY_VISUAL_SETTINGS = "visual_interruptions_settings";
private static final String KEY_PRIORITY_SETTINGS = "priority_settings";
private static final String KEY_VISUAL_SETTINGS = "visual_interruptions_settings";
private static final String KEY_AUTOMATIC_RULES = "automatic_rules";
static final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();