am b9ea1310: am 7699cad0: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev

* commit 'b9ea1310441d8602b4a51e1c1746e88e45dbc745':
  Settings: Add widget entry point to magical entry points listing.
This commit is contained in:
John Spurlock
2015-06-19 16:15:25 +00:00
committed by Android Git Automerger

View File

@@ -102,6 +102,7 @@ import com.android.settings.notification.NotificationSettings;
import com.android.settings.notification.NotificationStation;
import com.android.settings.notification.OtherSoundSettings;
import com.android.settings.notification.ZenAccessSettings;
import com.android.settings.notification.ZenModeAutomationSettings;
import com.android.settings.notification.ZenModeEventRuleSettings;
import com.android.settings.notification.ZenModeExternalRuleSettings;
import com.android.settings.notification.ZenModePrioritySettings;
@@ -342,6 +343,7 @@ public class SettingsActivity extends Activity
ApnSettings.class.getName(),
WifiCallingSettings.class.getName(),
ZenModePrioritySettings.class.getName(),
ZenModeAutomationSettings.class.getName(),
ZenModeScheduleRuleSettings.class.getName(),
ZenModeEventRuleSettings.class.getName(),
ZenModeExternalRuleSettings.class.getName(),