am 592a17aa: Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev

* commit '592a17aa3c1c88b576a1b342135fcf3f566bd9e4':
  Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS
This commit is contained in:
Fabrice Di Meglio
2014-07-21 18:31:39 +00:00
committed by Android Git Automerger

View File

@@ -81,6 +81,8 @@ import com.android.settings.deviceinfo.Memory;
import com.android.settings.deviceinfo.UsbSettings;
import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.OtherSoundSettings;
import com.android.settings.search.DynamicIndexableContentMonitor;
import com.android.settings.search.Index;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -278,6 +280,8 @@ public class SettingsActivity extends Activity
ChooseLockPattern.ChooseLockPatternFragment.class.getName(),
InstalledAppDetails.class.getName(),
BatterySaverSettings.class.getName(),
AppNotificationSettings.class.getName(),
OtherSoundSettings.class.getName()
};